From 0b6cbd821d7c573a00044ba19b9bb4c3e1151702 Mon Sep 17 00:00:00 2001
From: cvs2svn <admin@example.com>
Date: Fri, 10 Dec 2004 12:38:50 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create branch
 'glite- lb_branch_1_0_0_RC1'.

Sprout from glite-lb_branch_R_0_6_0 2004-11-16 05:01:25 UTC cvs2svn <admin@example.com> 'This commit was manufactured by cvs2svn to create branch 'glite-'
Cherrypick from master 2004-12-10 12:38:42 UTC Master Builder <glbuilder@cern.ch> 'Incremented build number [GLBUILDER]':
    org.glite.lb/build.xml
    org.glite.lb/project/dependencies.properties
    org.glite.lb/project/glite.lb.csf.xml
    org.glite.lb/project/version.properties
---
 org.glite.lb/build.xml                       | 27 +++++++++++++++--
 org.glite.lb/project/dependencies.properties |  7 +++--
 org.glite.lb/project/glite.lb.csf.xml        | 45 +++++++++++++++++++++-------
 org.glite.lb/project/version.properties      |  6 ++--
 4 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index 2445834..2ded065 100755
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,6 +20,12 @@
 
 	Revision history:
 	$Log$
+	Revision 1.27  2004/11/29 13:55:02  akrenek
+	added dependence on ws-interface
+	
+	Revision 1.26  2004/10/29 22:53:41  dimeglio
+	Use envset target
+	
 	Revision 1.25  2004/10/28 22:57:36  dimeglio
 	Quoted ant command line parameters
 	
@@ -274,6 +280,22 @@
 		</if>
 	</target>
 
+	<target name="ws-interface" unless="setenvonly" depends="envset">
+		<if>
+			<isset property="small.memory" />
+			<then>
+				<exec dir="${lb.subsystem.dir}.ws-interface" executable="${antExec}" failonerror="${failonerror}">
+					<arg line="${target} &quot;-Dsmall.memory=true&quot; &quot;-Dbootstrap=${bootstrap}&quot; &quot;-Dfailonerror=${failonerror}&quot; &quot;-Ddo.cvs.tag=${do.cvs.tag}&quot;"/>
+				</exec>
+			</then>
+			<else>
+				<ant dir="${lb.subsystem.dir}.ws-interface"
+                        	     target="${target}"
+                        	     inheritall="false" />
+			</else>
+		</if>
+	</target>
+
 	<target name="server-bones" unless="setenvonly" depends="envset">
 		<if>
 			<isset property="small.memory" />
@@ -322,7 +344,7 @@
 		</if>
 	</target>
 
-	<target name="server" unless="setenvonly" depends="envset, globus,expat,ares,mysql,gsoap,client-interface,common,logger">
+	<target name="server" unless="setenvonly" depends="envset, globus,expat,ares,mysql,gsoap,client-interface,ws-interface,common,logger">
 		<if>
 			<isset property="small.memory" />
 			<then>
@@ -356,7 +378,8 @@
 
 	<!-- Main proxy -->
 	<target name="buildmodules" depends="envset, 
-						 client-interface,
+					     client-interface,
+					     ws-interface,
 					     client,
 					     server-bones,
 					     common,
diff --git a/org.glite.lb/project/dependencies.properties b/org.glite.lb/project/dependencies.properties
index 5b6b47b..8757f10 100644
--- a/org.glite.lb/project/dependencies.properties
+++ b/org.glite.lb/project/dependencies.properties
@@ -2,11 +2,12 @@
 # System dependencies
 ###################################################################
 
-org.glite.version 						= HEAD
-org.glite.lb.version 					= HEAD
+org.glite.version 				= HEAD
+org.glite.lb.version 				= HEAD
 
 # Component dependencies tag = do not remove this line =
-org.glite.lb.client-interface.version 	= HEAD
+org.glite.lb.client-interface.version 		= HEAD
+org.glite.lb.ws-interface.version 		= HEAD
 org.glite.lb.common.version 			= HEAD
 org.glite.lb.client.version 			= HEAD
 org.glite.lb.server.version 			= HEAD
diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml
index bdd7d8f..d78376b 100644
--- a/org.glite.lb/project/glite.lb.csf.xml
+++ b/org.glite.lb/project/glite.lb.csf.xml
@@ -22,6 +22,15 @@
 
 	Revision history:
 	$Log$
+	Revision 1.10  2004/11/29 16:01:21  zsalvet
+	Evaluate component.{head,tag} conditions before use of get.* targets.
+	
+	Revision 1.9  2004/11/29 15:16:26  zsalvet
+	Add ws-interface to checkout/build machinery.
+	
+	Revision 1.8  2004/10/18 22:55:14  dimeglio
+	Added oscheck to various targets
+	
 	Revision 1.7  2004/10/15 12:30:01  akrenek
 	build with lb.sever-bones
 	
@@ -148,6 +157,10 @@
 			<equals arg1="${org.glite.lb.client-interface.version}" arg2="HEAD" />
 		</condition>
 
+		<condition property="ws-interface.head">
+			<equals arg1="${org.glite.lb.ws-interface.version}" arg2="HEAD" />
+		</condition>
+
 		<condition property="client.head">
 			<equals arg1="${org.glite.lb.client.version}" arg2="HEAD" />
 		</condition>
@@ -171,7 +184,7 @@
 		 ===================================================== -->
 		
 	<!-- Update main GLite module -->
- 	<target name="org.glite" depends="get.glite.head, get.glite.tag"/>
+ 	<target name="org.glite" depends="evaluate.cvs.tags, get.glite.head, get.glite.tag"/>
 	<target name="get.glite.head" if="glite.head">
 		<cvs-co package="org.glite" />
 	</target>
@@ -181,7 +194,7 @@
 	</target>
 
 	<!-- Update the current module -->
- 	<target name="org.glite.lb" depends="get.glite-lb.head, get.glite-lb.tag"/>
+ 	<target name="org.glite.lb" depends="evaluate.cvs.tags, get.glite-lb.head, get.glite-lb.tag"/>
 	<target name="get.glite-lb.head" if="glite-lb.head">
 		<cvs-co package="org.glite.lb" />
 		<fail>The org.glite and org.glite.lb modules have been updated, please rerun the configuration file</fail>
@@ -198,6 +211,7 @@
 	
 	<!-- All development tools -->
  	<target name="devtools" depends="oscheck,
+					evaluate.cvs.tags,
  					 				 junitcheck,
 					 				 junit,
  									 chkstyle,
@@ -212,17 +226,17 @@
 		 ===================================================== -->
 	
 	<!--  All external libraries -->
- 	<target name="external" depends="oscheck,globus"
+ 	<target name="external" depends="oscheck, evaluate.cvs.tags, globus"
  			description="Install external packages"/>
  	
 	<!-- =====================================================
-		 GLite Middleware R-GMA modules
+		 GLite Middleware LB modules
 		 ===================================================== -->
 
 	<!-- component targets tag = do not remove = -->
 	
 	<!-- common -->
- 	<target name="common" depends="get.common.head, get.common.tag"/>
+ 	<target name="common" depends="evaluate.cvs.tags, get.common.head, get.common.tag"/>
 	<target name="get.common.head" if="common.head">
 		<cvs-co package="org.glite.lb.common" />
 	</target>
@@ -232,7 +246,7 @@
 	</target>
 
 	<!-- server-bones -->
- 	<target name="server-bones" depends="get.server-bones.head, get.server-bones.tag"/>
+ 	<target name="server-bones" depends="evaluate.cvs.tags, get.server-bones.head, get.server-bones.tag"/>
 	<target name="get.server-bones.head" if="server-bones.head">
 		<cvs-co package="org.glite.lb.server-bones" />
 	</target>
@@ -242,7 +256,7 @@
 	</target>
 
 	<!-- client-interface -->
- 	<target name="client-interface" depends="get.client-interface.head, get.client-interface.tag"/>
+ 	<target name="client-interface" depends="evaluate.cvs.tags, get.client-interface.head, get.client-interface.tag"/>
 	<target name="get.client-interface.head" if="client-interface.head">
 		<cvs-co package="org.glite.lb.client-interface" />
 	</target>
@@ -251,8 +265,18 @@
 			tag="${org.glite.lb.client-interface.version}" />
 	</target>
 
+	<!-- WS interface -->
+ 	<target name="ws-interface" depends="evaluate.cvs.tags, get.ws-interface.head, get.ws-interface.tag"/>
+	<target name="get.ws-interface.head" if="ws-interface.head">
+		<cvs-co package="org.glite.lb.ws-interface" />
+	</target>
+	<target name="get.ws-interface.tag" unless="ws-interface.head">
+		<cvs-co package="org.glite.lb.ws-interface"
+			tag="${org.glite.lb.ws-interface.version}" />
+	</target>
+
 	<!-- client -->
- 	<target name="client" depends="get.client.head, get.client.tag"/>
+ 	<target name="client" depends="evaluate.cvs.tags, get.client.head, get.client.tag"/>
 	<target name="get.client.head" if="client.head">
 		<cvs-co package="org.glite.lb.client" />
 	</target>
@@ -262,7 +286,7 @@
 	</target>
 
 	<!-- server -->
- 	<target name="server" depends="get.server.head, get.server.tag"/>
+ 	<target name="server" depends="evaluate.cvs.tags, get.server.head, get.server.tag"/>
 	<target name="get.server.head" if="server.head">
 		<cvs-co package="org.glite.lb.server" />
 	</target>
@@ -272,7 +296,7 @@
 	</target>
 
 	<!-- logger -->
- 	<target name="logger" depends="get.logger.head, get.logger.tag"/>
+ 	<target name="logger" depends="evaluate.cvs.tags, get.logger.head, get.logger.tag"/>
 	<target name="get.logger.head" if="logger.head">
 		<cvs-co package="org.glite.lb.logger" />
 	</target>
@@ -283,6 +307,7 @@
 
 	<!-- All project modules -->
  	<target name="project" depends="client-interface,
+						ws-interface,
  						common,
  						server-bones,
  						client,
diff --git a/org.glite.lb/project/version.properties b/org.glite.lb/project/version.properties
index 45fd7bc..a999d55 100644
--- a/org.glite.lb/project/version.properties
+++ b/org.glite.lb/project/version.properties
@@ -1,4 +1,4 @@
-#Tue Nov 16 05:59:07 CET 2004
-module.version=0.2.0
-module.build=87
+#Fri Dec 10 13:30:32 CET 2004
+module.version=0.3.0
+module.build=113
 module.age=2
-- 
1.8.2.3