From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 28 Nov 2005 10:39:08 +0000 (+0000)
Subject: merge bug #13928 fix on the pre_cares branch
X-Git-Tag: glite-lb_R_1_2_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4954a7df487bcf27445f53914be8707202e334d0;p=jra1mw.git

merge bug #13928 fix on the pre_cares branch
---

diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index c3ce642..4af3d8d 100755
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,8 +20,17 @@
 
 	Revision history:
 	$Log$
+	Revision 1.36.4.2  2005/11/24 12:59:36  akrenek
+	server depends on bones
+	
 	Revision 1.36.4.1  2005/11/24 12:32:02  akrenek
 	merged in "lbonly"
+
+	Revision 1.39  2005/11/27 21:51:18  eronchie
+	Applied fix for bug 13928
+	
+	Revision 1.38  2005/11/22 12:13:47  eronchie
+	Removed one utils
 	
 	Revision 1.37  2005/11/04 14:39:20  akrenek
 	merge in the "lbonly" hack
@@ -330,17 +339,17 @@
 		</if>
  	</target>
 
-	<target name="security.voms" unless="lbonly" depends="envset">
+	<target name="security.voms-api-c" unless="lbonly" depends="envset">
 		<if>
 			<isset property="small.memory"/>
 			<then>
 				<exec dir="${security.subsystem.dir}" executable="${antExec}" failonerror="${failonerror}">
-					<arg line="voms -Dtarget=${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
+					<arg line="voms-api-c -Dtarget=${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
 				</exec>
 			</then>
 			<else>
 				<ant dir="${security.subsystem.dir}"
-        				target="voms"
+        				target="voms-api-c"
         				inheritall="false" >
         				<property name="target" value="${target}"/>
 				</ant>
@@ -471,7 +480,7 @@
 		</if>
 	</target>
 
-	<target name="server" unless="setenvonly" depends="envset, globus, expat, ares, mysql, gsoap, security.voms, jp.primary, client-interface, ws-interface, common, server-bones">
+	<target name="server" unless="setenvonly" depends="envset, globus, expat, ares, mysql, gsoap, security.voms-api-c, jp.primary, client-interface, ws-interface, common, server-bones">
 		<if>
 			<isset property="small.memory" />
 			<then>
diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml
index 6d6e81f..23862ad 100644
--- a/org.glite.lb/project/glite.lb.csf.xml
+++ b/org.glite.lb/project/glite.lb.csf.xml
@@ -22,6 +22,12 @@
 
 	Revision history:
 	$Log$
+	Revision 1.13.2.1  2005/10/17 16:27:48  akrenek
+	merged in the duplicate utils targed patch
+	
+	Revision 1.15  2005/11/27 21:51:18  eronchie
+	Applied fix for bug 13928
+	
 	Revision 1.14  2005/10/15 20:14:55  jpospi
 	remove duplicate lb.utils section
 	
@@ -336,7 +342,7 @@
 	</target>
 
 	<!-- utils -->
- 	<target name="utils" depends="evaluate.cvs.tags, get.utils.head, get.utils.tag"/>
+ 	<target name="utils" depends="get.utils.head, get.utils.tag"/>
 	<target name="get.utils.head" if="utils.head">
 		<cvs-co package="org.glite.lb.utils" />
 	</target>