From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Tue, 2 Jun 2009 17:04:20 +0000 (+0000)
Subject: build with axis
X-Git-Tag: gridsite-core_R_1_7_1~34
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4b6fdb79740dc4ec99cb6994629dd39fdb9693fb;p=jra1mw.git

build with axis
---

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 410e1df..69de860 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -12,8 +12,8 @@ all compile:
 	JAVA_HOME=${jdk_prefix} \
 	${ant_prefix}/bin/ant -Dno.deps=yes -DstageDir=${stagedir} \
 		-Dreference.jobid-api-java.jar=${stagedir}/share/java/jobid-api-java.jar \
-		-Dfile.reference.cog-certmanagement.jar=${certmanagement_jar} \
-		-Dfile.reference.cog-jglobus.jar=${jglobus_jar}
+		-Dreference.trustmanager.jar=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar \
+		-Daxis.classpath=`ls ${axis_prefix}/lib/*.jar | tr '\012' :` 
 	cd src_c && make PREFIX=${PREFIX}
 
 examples: ${EXAMPLES}
diff --git a/org.glite.lb.client-java/build.xml b/org.glite.lb.client-java/build.xml
index cca66fc..84da105 100755
--- a/org.glite.lb.client-java/build.xml
+++ b/org.glite.lb.client-java/build.xml
@@ -6,11 +6,16 @@
     <description>Builds, tests, and runs the project lb-client-java.</description>
     <import file="nbproject/build-impl.xml"/>
 
-		<target name="-pre-compile">
-			<exec executable="${stageDir}/sbin/glite-lb-at3">
-				<arg line="project/genEventTypes.pl src/org/glite/lb"/>
-			</exec>
-		</target>
+
+	<target name="-pre-compile">
+		<exec executable="${stageDir}/sbin/glite-lb-at3">
+			<arg line="project/genEventTypes.pl src/org/glite/lb"/>
+		</exec>
+		<java fork="true" dir="." classname="org.apache.axis.wsdl.WSDL2Java">
+			<arg value="${stageDir}/interface/LB.wsdl"/>
+			<classpath path="${axis.classpath}"/>
+		</java>
+	</target>
     <!--
 
     There exist several targets which are by default empty and which can be 
diff --git a/org.glite.lb.client-java/nbproject/project.properties b/org.glite.lb.client-java/nbproject/project.properties
index 63edd9f..feaebae 100755
--- a/org.glite.lb.client-java/nbproject/project.properties
+++ b/org.glite.lb.client-java/nbproject/project.properties
@@ -21,9 +21,9 @@ excludes=
 includes=**
 jar.compress=false
 javac.classpath=\
+    ${axis.classpath}:\
     ${reference.jobid-api-java.jar}:\
-    ${file.reference.cog-certmanagement.jar}:\
-    ${file.reference.cog-jglobus.jar} 
+    ${reference.trustmanager.jar}:\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false