Changeset 4142


Ignore:
Timestamp:
27/08/08 17:06:08 (11 years ago)
Author:
cbyrom
Message:

Update Discovery service documentation + restructure packages, creating
common package to store Utilities class + fix build to work with the
new structure.

Location:
TI01-discovery/branches/ws-Discovery2-upgrade
Files:
2 added
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TI01-discovery/branches/ws-Discovery2-upgrade/readme.txt

    r3983 r4142  
    1212with no parameters, e.g.: 
    1313 
    14 ant -f buildClient.xml jar.client - build the test client jar 
    15 ant -f buildClient.xml jar.server - build the server service jar 
    16 ant -f buildClient.xml deploy.client - build the service jar and deploy it to a local tomcat install 
    17 ant -f buildClient.xml deploy.client - build the service jar and deploy it to a local tomcat install + restart tomcat 
    18 ant -f buildClient.xml generatestubs - generate both client and server side stubs - and generate the XBeans jar using the client-side stubs 
    19 ant -f buildClient.xml - defaults to building the service jar 
     14ant -f buildDiscovery.xml jar.client - build the test client jar 
     15ant -f buildDiscovery.xml run.client - build the test client jar and then run it 
     16ant -f buildDiscovery.xml jar.server - build the server service jar 
     17ant -f buildDiscovery.xml deploy.server - build the service jar and deploy it to a local tomcat install 
     18ant -f buildDiscovery.xml reload - build the service jar and deploy it to a local tomcat install + restart tomcat 
     19ant -f buildDiscovery.xml generatestubs - generate both client and server side stubs - and generate the XBeans jar using the client-side stubs 
     20ant -f buildDiscovery.xml - defaults to building the service jar 
    2021 
    2122NB, to get the DiscoveryService.wsdl file to be generated properly, you may have to temporarily rename the jsr  
     
    2324referenced by the generated code - as such you should be careful not to mix the xmlbeans code generated between doing client 
    2425and service jar builds. 
     26 
     27To quickly get things up and running, try the following: 
     281. ant -f buildDiscovery.xml reload 
     292. If this completes successfully, run the test client: 
     30ant -f buildDiscovery.xml run.client 
     313. For a fuller check, run the various unit test cases - which can be done from 
     32eclipse following the instructions below. 
     33 
    2534 
    2635Eclipse set up 
     
    100109 
    1011103) Use ant to run client 
    102 ant -buildfile buildClient.xml run.client 
     111ant -buildfile buildDiscovery.xml run.client 
    103112 
    104113Server Side: 
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/common/discovery/Utilities.java

    r3965 r4142  
    1 package ndg.services.discovery; 
     1package ndg.common.discovery; 
    22 
    33public class Utilities  
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/DiscoveryServiceSkeleton.java

    r3979 r4142  
    88import java.util.Vector; 
    99import java.util.logging.Logger; 
     10 
     11import ndg.common.discovery.Utilities; 
    1012 
    1113import discoveryserviceapi.DoSearchDocument; 
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/SearchAgent.java

    r3980 r4142  
    1010import java.util.Calendar;  // needed because xmlbeans uses this for xsd:date 
    1111import java.util.logging.Logger; 
     12 
     13import ndg.common.discovery.Utilities; 
    1214 
    1315/** 
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/testclient/discovery/DiscoveryServiceClient.java

    r3981 r4142  
    1111 
    1212import ndg.clients.discovery.*; 
    13 import ndg.services.discovery.Utilities; 
     13import ndg.common.discovery.Utilities; 
    1414 
    1515/** 
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/unittests/ndg/testclient/discovery/DiscoveryServiceClientTest.java

    r3990 r4142  
    1010 
    1111import junit.framework.Assert; 
     12import ndg.common.discovery.Utilities; 
    1213import ndg.services.discovery.DiscoveryServiceSkeleton; 
    13 import ndg.services.discovery.Utilities; 
    1414import ndg.testclient.discovery.DiscoveryServiceClient; 
    1515 
  • TI01-discovery/branches/ws-Discovery2-upgrade/srcgen

    • Property svn:ignore set to
      build
      resources
      src
      test
      build.xml
  • TI01-discovery/branches/ws-Discovery2-upgrade/srcgen/buildDiscovery.xml

    r3962 r4142  
    1818        <property name="jars.ok" value=""/> 
    1919        <property name="src.nongen" value="../src"/> 
     20        <property name="src.common" value="../src/ndg/common"/> 
    2021        <property name="src.nongen.server" value="../src/ndg/services"/> 
    2122        <property name="src.nongen.client" value="../src/ndg/testclient"/> 
     
    230231                </copy> 
    231232    </target> 
    232     <target name="copynongen.server" depends="copy.resource"> 
     233    <target name="copynongen.server" depends="copy.resource, copy.common"> 
    233234                <!-- Copy non-auto-generated src to source tree --> 
    234235                <!-- NB. Overwrites even if files in toDir are newer --> 
     
    240241                </copy> 
    241242   </target> 
     243         
    242244        <target name="copy.resource"> 
    243245                <copy toDir="${resources}" overwrite="true" verbose="true"> 
     
    250252        </target> 
    251253 
    252         <target name="copynongen.client" depends="copy.resource"> 
     254        <target name="copy.common"> 
     255                <copy toDir="${build.src}" overwrite="true" verbose="true"> 
     256                        <fileset dir="${src.common}"> 
     257                                <include name="**/*.java"/> 
     258                                <include name="**/*.html"/> 
     259                        </fileset> 
     260                </copy> 
     261        </target> 
     262 
     263        <target name="copynongen.client" depends="copy.resource, copy.common"> 
    253264                <!-- Copy non-auto-generated src to source tree --> 
    254265                <!-- NB. Overwrites even if files in toDir are newer --> 
     
    259270                        </fileset> 
    260271                </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> 
    269    <target name="fixchunking"> 
     272        </target> 
     273 
     274        <target name="fixchunking"> 
    270275                <echo message="Changing content of ${stubfile} to switch off http tranfer chunking"/>  
    271276                <replaceregexp file="${stubfile}" 
Note: See TracChangeset for help on using the changeset viewer.