Changeset 3944
- Timestamp:
- 27/05/08 10:44:51 (13 years ago)
- Location:
- TI01-discovery/trunk/ws-Discovery2
- Files:
-
- 2 added
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
TI01-discovery/trunk/ws-Discovery2/readme.txt
r3941 r3944 3 3 4 4 NB, completing the build here assumes you have both apache axis2 and ant installed. The AXIS2_HOME environment variable 5 should be set to point to the top level directory of the axis2 install. 5 should be set to point to the top level directory of the axis2 install. If you are deploying locally to tomcat, you need 6 to set CATALINA_HOME to the home dir of the tomcat install. Also, you may need to copy jdom.jar into your java jre/ext/lib dir 7 to get the compile working. 6 8 7 The build file, \srcgen\buildDiscovery.xml, now includes targets to run the WSDL2Java code generation. Running the build 9 The build file, \srcgen\buildDiscovery.xml, now includes targets to run the WSDL2Java code generation and do all the setting up 10 described in the original instructions below. Options for building include: 8 11 with no parameters, e.g.: 9 12 10 ant -f buildClient.xml 13 ant -f buildClient.xml jar.client - build the test client jar 14 ant -f buildClient.xml jar.server - build the server service jar 15 ant -f buildClient.xml deploy.client - build the service jar and deploy it to a local tomcat install 16 ant -f buildClient.xml deploy.client - build the service jar and deploy it to a local tomcat install + restart tomcat 17 ant -f buildClient.xml - defaults to building the service jar 11 18 12 will now build both the server and client archives and make the necessary changes to the files outlined below. NB, to get 13 the DiscoveryService.wsdl file to be generated properly, you will likely have to temporarily rename the jsr file, as mentioned 14 below. 19 NB, to get the DiscoveryService.wsdl file to be generated properly, you will likely have to temporarily rename the jsr 20 file, as mentioned below. Also note that the WSDL2JAVA operation generates its own unique version of xmlbeans which is then 21 referenced by the generated code - as such you should be careful not to mix the xmlbeans code generated between doing client 22 and service jar builds. 15 23 16 24 Original, detailed instructions, are as follows (but you shouldn't have to use them!): -
TI01-discovery/trunk/ws-Discovery2/src/ndg/testclient/discovery/DiscoveryServiceClient.java
r3940 r3944 1 package ndg. services.discovery;1 package ndg.testclient.discovery; 2 2 3 3 import discoveryserviceapi.*; … … 34 34 public class DiscoveryServiceClient 35 35 { 36 private static final String USAGE_STRING = "Usage : DiscoveryServiceClient string|helpers <term>"; 37 36 38 public static void main(String[] args) 37 39 { 38 40 System.out.println("My DiscoveryService client"); 41 42 if (args.length == 0) 43 { 44 System.out.println(USAGE_STRING); 45 return; 46 } 39 47 40 48 try 41 49 { 42 DiscoveryServiceClient client = new DiscoveryServiceClient("http:// glue.badc.rl.ac.uk/axis2/services/DiscoveryService");50 DiscoveryServiceClient client = new DiscoveryServiceClient("http://localhost/axis2/services/DiscoveryService"); 43 51 44 52 // Method 1: request documents passed as strings 45 53 if ( args[0].equals("string") ) 46 54 { 47 System.out.println( "Trying a doSearch..." );48 55 String doSearchResult = client.doSearch( 49 56 "<m:doSearch xmlns:m=\"urn:DiscoveryServiceAPI\"><m:term>*neodc*</m:term><m:termType>fullText</m:termType></m:doSearch>" … … 115 122 else 116 123 { 117 System.out.println( "Usage : DiscoveryServiceClient string|helpers <term>");124 System.out.println(USAGE_STRING); 118 125 } 119 120 121 122 123 124 126 } 125 127 catch (Exception e) … … 138 140 public DiscoveryServiceClient(String uri) throws org.apache.axis2.AxisFault 139 141 { 142 System.out.println("Initialising connection to endpoint: " + uri); 140 143 _service = new DiscoveryServiceStub(null,uri); 141 144 } … … 150 153 ) throws java.rmi.RemoteException, org.apache.xmlbeans.XmlException 151 154 { 155 System.out.println( "Trying a doSearch..." ); 152 156 discoveryserviceapi.DoSearchDocument reqDoc= discoveryserviceapi.DoSearchDocument.Factory.parse( reqDocAsString ); 157 System.out.println("Got reqDoc: " + reqDoc.toString()); 153 158 discoveryserviceapi.DoSearchReturnDocument resDoc= _service.doSearch( reqDoc ); 159 System.out.println("Got resDoc: " + resDoc.toString()); 154 160 return resDoc.toString(); 155 161 } -
TI01-discovery/trunk/ws-Discovery2/srcgen/buildDiscovery.xml
r3939 r3944 10 10 <property name="test" value="${build.base.dir}/test"/> 11 11 <property name="build" value="${build.base.dir}/build"/> 12 <property name="jar.server" value="${build}/lib/${name}.aar"/> 12 13 <property name="build.src" value="${build}/src"/> 13 14 <property name="build.classes" value="${build}/classes"/> … … 17 18 <property name="jars.ok" value=""/> 18 19 <property name="src.nongen" value="../src"/> 20 <property name="src.nongen.server" value="../src/ndg/services"/> 21 <property name="src.nongen.client" value="../src/ndg/testclient"/> 19 22 <property name="res.nongen" value="../resources"/> 20 23 <property name="stubfile" value="${build.base.dir}/src/ndg/clients/discovery/DiscoveryServiceStub.java"/> 21 24 <property name="skeletonfile" value="${build.base.dir}/src/ndg/services/discovery/DiscoveryServiceSkeleton.java"/> 25 <property name="tomcat.deploy.dir" value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services/"/> 26 22 27 <path id="axis2.class.path"> 23 28 <pathelement path="${java.class.path}"/> … … 28 33 <fileset dir="${resources}"> 29 34 <include name="*.jar"/> 30 <!--<include name="xmlrpc-1.2-patched.jar"/>31 <include name="jdom.jar"/>32 <include name="jaxen-core.jar"/>33 <include name="jaxen-jdom.jar"/>34 <include name="saxpath.jar"/>-->35 35 </fileset> 36 36 </path> 37 <target name="init"> 37 38 <target name="init" depends="clean"> 38 39 <mkdir dir="${build}"/> 39 40 <mkdir dir="${build.classes}"/> … … 43 44 </target> 44 45 45 <target name="wsdl2java.client" depends=" pre.compile.test">46 <target name="wsdl2java.client" depends="init"> 46 47 <echo message="Generating client side stubs from WSDL"/> 47 48 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> … … 58 59 </target> 59 60 60 <target name="wsdl2java.server" depends=" pre.compile.test">61 <target name="wsdl2java.server" depends="init"> 61 62 <echo message="Generating server side stubs from WSDL"/> 62 63 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> … … 100 101 </target> 101 102 102 <target name=" generate.wsdl.stubs" depends="wsdl2java.client,fixchunking,wsdl2java.server"/>103 104 <target name="compile.src" depends=" pre.compile.test,generate.wsdl.stubs,copygen,copynongen" if="jars.ok">103 <target name="compile.src.server" depends="wsdl2java.server,pre.compile.test,copygen,copynongen.server,compile.src"/> 104 <target name="compile.src.client" depends="wsdl2java.client,fixchunking,pre.compile.test,copygen,copynongen.client,compile.src"/> 105 <target name="compile.src" depends="" if="jars.ok"> 105 106 <javac debug="on" destdir="${build.classes}" srcdir="${build.src}"> 106 107 <classpath location="${lib}/${xbeans.packaged.jar.name}"/> … … 109 110 <delete dir="${build.src}"/> 110 111 </target> 111 <target name="compile.test" depends="compile.src " if="jars.ok">112 <target name="compile.test" depends="compile.src.client" if="jars.ok"> 112 113 <javac debug="on" destdir="${build.classes}"> 113 114 <src path="${test}"/> … … 119 120 <echo message="The class path is not set right! Please make sure the following classes are in the classpath 1. XmlBeans 2. Stax 3. Axis2 "/> 120 121 </target> 121 <target name="jar.all" depends="jar.server , jar.client"/>122 <target name="jar.server" depends="compile.src ,echo.classpath.problem" if="jars.ok">122 <target name="jar.all" depends="jar.server"/> 123 <target name="jar.server" depends="compile.src.server,echo.classpath.problem" if="jars.ok"> 123 124 <copy toDir="${build.classes}/META-INF"> 124 125 <fileset dir="${resources}"> … … 157 158 <mkdir dir="${build}/repo/"/> 158 159 <mkdir dir="${build}/repo/services"/> 159 <copy file="${ build}/lib/${name}.aar" toDir="${build}/repo/services/"/>160 <copy file="${jar.server}" toDir="${build}/repo/services/"/> 160 161 </target> 161 162 <target depends="make.repo" name="start.server" if="jars.ok"> … … 187 188 <delete dir="${src}"/> 188 189 </target> 189 <target name="javadoc" depends="compile.src " description="Create Javadoc API documentation">190 <target name="javadoc" depends="compile.src.server" description="Create Javadoc API documentation"> 190 191 <mkdir dir="${build}/docs/api"/> 191 192 <mkdir dir="${build}/docs/api/resources"/> … … 201 202 <echo message="JAVA_HOME = ${env.JAVA_HOME}"/> 202 203 <echo message="AXIS_CLASSPATH = ${axis2.class.path}"/> 203 <java classname="ndg. services.discovery.DiscoveryServiceClient" fork="true">204 <java classname="ndg.testclient.discovery.DiscoveryServiceClient" fork="true"> 204 205 <!-- <arg value="${build}/repo"/> --> 205 206 <classpath refid="axis2.class.path"/> 206 207 <classpath location="${lib}/${name}-test-client.jar"/> 208 <sysproperty key="verbose" value="true"/> 209 <arg value="string"/> 210 </java> 211 </target> 212 <target depends="" name="test.client" if="jars.ok"> 213 <echo message="JAVA_HOME = ${env.JAVA_HOME}"/> 214 <java classname="ndg.testclient.discovery.DiscoveryServiceClient" fork="true"> 215 <!-- <arg value="${build}/repo"/> --> 216 <classpath refid="axis2.class.path"/> 217 <classpath location="${lib}/${name}-test-client.jar"/> 218 <sysproperty key="verbose" value="true"/> 219 <arg value="string"/> 207 220 </java> 208 221 </target> … … 210 223 <!-- Copy auto-generated src to source tree --> 211 224 <!-- NB. Overwrites even if files in toDir are newer --> 212 <copy toDir="${build.src}" overwrite="true" verbose="true">225 <copy toDir="${build.src}" overwrite="true"> 213 226 <fileset dir="${src}"> 214 227 <include name="**/*.java"/> … … 217 230 </copy> 218 231 </target> 219 <target name="copynongen ">232 <target name="copynongen.server" depends="copy.resource"> 220 233 <!-- Copy non-auto-generated src to source tree --> 221 234 <!-- NB. Overwrites even if files in toDir are newer --> 222 235 <copy toDir="${build.src}" overwrite="true" verbose="true"> 223 <fileset dir="${src.nongen }">236 <fileset dir="${src.nongen.server}"> 224 237 <include name="**/*.java"/> 225 238 <include name="**/*.html"/> 226 239 </fileset> 227 240 </copy> 241 </target> 242 <target name="copy.resource"> 228 243 <copy toDir="${resources}" overwrite="true" verbose="true"> 229 244 <fileset dir="${res.nongen}"> … … 233 248 </fileset> 234 249 </copy> 235 </target> 250 </target> 251 252 <target name="copynongen.client" depends="copy.resource"> 253 <!-- Copy non-auto-generated src to source tree --> 254 <!-- NB. Overwrites even if files in toDir are newer --> 255 <copy toDir="${build.src}" overwrite="true" verbose="true"> 256 <fileset dir="${src.nongen.client}"> 257 <include name="**/*.java"/> 258 <include name="**/*.html"/> 259 </fileset> 260 </copy> 261 <copy toDir="${resources}" overwrite="true" verbose="true"> 262 <fileset dir="${res.nongen}"> 263 <!-- <include name="**/*.xq"/> --> 264 <!-- <include name="**/*.properties"/> --> 265 <include name="**/*.jar"/> 266 </fileset> 267 </copy> 268 </target> 236 269 <target name="fixchunking"> 237 270 <echo message="Changing content of ${stubfile} to switch off http tranfer chunking"/> … … 240 273 replace="_serviceClient = new org.apache.axis2.client.ServiceClient(configurationContext,_service);_serviceClient.getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, false);"/> 241 274 </target> 275 276 <target name="deploy.server" depends="jar.server"> 277 <copy file="${jar.server}" toDir="${tomcat.deploy.dir}" overwrite="true" verbose="true" /> 278 </target> 279 280 <target name="reload" depends="deploy.server, tomcat-start" /> 281 282 <target name="tomcat-start" depends="tomcat-stop"> 283 <java jar="${env.CATALINA_HOME}/bin/bootstrap.jar" fork="true"> 284 <jvmarg value="-Dcatalina.home=${env.CATALINA_HOME}"/> 285 </java> 286 </target> 287 288 <target name="tomcat-stop"> 289 <java jar="${env.CATALINA_HOME}/bin/bootstrap.jar" fork="true"> 290 <jvmarg value="-Dcatalina.home=${env.CATALINA_HOME}"/> 291 <arg line="stop"/> 292 </java> 293 </target> 294 242 295 </project>
Note: See TracChangeset
for help on using the changeset viewer.