Changeset 3846


Ignore:
Timestamp:
Oct 16, 2007, 4:52:43 PM (15 years ago)
Author:
Martin Svensson
Message:

References #492 Copying webservices into trunk

Location:
trunk
Files:
15 added
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r3838 r3846  
    4545    jobagent:     Build jobagent for local use
    4646    migrate:      Build migration tool for local use
     47    webservices:  Build webservices for local use
    4748    test:         Build test programs
    4849    web:          Build web client application for local use
     
    131132      <fileset dir="www/WEB-INF/lib" defaultexcludes="no" />
    132133      <fileset dir="www/WEB-INF/classes" defaultexcludes="no" />
     134      <fileset dir="www/WEB-INF/conf" defaultexcludes="no" />
     135      <fileset dir="www/WEB-INF/services" defaultexcludes="no" />
    133136      <fileset dir="www/WEB-INF" includes="web.xml" defaultexcludes="no" />
    134137      <fileset dir="doc/api" defaultexcludes="no" />
     
    141144  <target
    142145    name="dist"
    143     depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,installprg.jar,
    144       jobagent.jar,migrate.jar,exampleplugins.jar,copy.config,copy.jar,doc,doc.dist"
     146    depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,
     147          installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
    145148    description="Create everything needed for distribution"
    146149    >
     
    177180  <target
    178181    name="dev"
    179     depends="dev.init,core,coreplugins,web,installprg,jobagent,migrate,test"
     182    depends="dev.init,core,coreplugins,web,webservices,installprg,jobagent,migrate,test"
    180183    description="Create a runnable local installation"
    181184  />
     
    225228    >
    226229  </target>
     230 
     231  <target
     232      name="webservices"
     233      depends="web,webservices.aar"
     234      description="Build webservices for local use"
     235  />
    227236 
    228237  <target
     
    318327    description="Copies configuration files to the appropriate folder"
    319328    >
     329    <mkdir dir="${config}/../conf" />
     330    <!--<move file="${config}/axis2.xml" todir="${config}/../conf" /> -->
    320331  </target>
    321332   
     
    360371    <copy todir="${jar}" description="3rd-party JAR files">
    361372      <fileset dir="${lib}/dist">
     373        <include name="**/*" />
     374      </fileset>
     375      <fileset dir="${lib}/webservices">
    362376        <include name="**/*" />
    363377      </fileset>
     
    639653  <target
    640654    name="test.init"
    641     depends="core.init,coreplugins.init,jobagent.init"
     655    depends="core.init,coreplugins.init,jobagent.init,webservices.init"
    642656    >
    643657    <property name="test.src" location="${src}/test"
     
    646660      description="Location of compiled files" />
    647661    <path id="test.classpath" description="Class path for compiling">
    648       <path refid="core.classpath"/>
     662      <path refid="webservices.classpath"/>
    649663      <pathelement location="${core.build}" />
    650664      <pathelement location="${coreplugins.build}" />
    651665      <pathelement location="${jobagent.build}" />
     666      <pathelement location="${webservices.build}" />
    652667    </path>
    653668  </target>
     
    655670  <target
    656671    name="test.compile"
    657     depends="test.init,core.compile,coreplugins.compile,jobagent.compile"
     672    depends="test.init,core.compile,coreplugins.compile,jobagent.compile,webservices.compile"
    658673    description="Compile the test programs"
    659674    >
     
    805820    </javac>
    806821  </target>
     822 
     823  <!-- webservices targets -->
     824  <target
     825    name="webservices.init"
     826    depends="core.init"
     827    >
     828    <property name="webservices.src" location="${src}/webservices"
     829      description="Location of source files" />
     830    <property name="webservices.build" location="${build}/webservices"
     831      description="Location of compiled files" />
     832    <path id="webservices.classpath" description="Class path for compiling webservices">
     833      <path refid="core.classpath"/>
     834      <pathelement location="${core.build}"/>
     835      <pathelement location="${coreplugins.build}"/>
     836      <fileset dir="${lib}/webservices">
     837        <include name="**/*.jar"/>
     838      </fileset>
     839    </path>
     840  </target>
     841
     842  <target
     843    name="webservices.compile"
     844    depends="webservices.init,core.compile"
     845    description="Compile the core web services"
     846    >
     847    <mkdir dir="${webservices.build}" />
     848    <javac
     849      destdir="${webservices.build}"
     850      classpathref="webservices.classpath"
     851      encoding="ISO-8859-1"
     852      debug="true"
     853      deprecation="true"
     854      >
     855      <src path="${webservices.src}/server" />
     856      <src path="${webservices.src}/client/java" />
     857      <compilerarg value="${javac.arg}" />
     858    </javac>
     859    <copy todir="${webservices.build}"
     860      description="Resource files needed by the webservices; excludes documentation and source files"
     861      includeEmptyDirs="false"
     862      >
     863      <fileset dir="${webservices.src}/server">
     864        <include name="**/*" />
     865        <exclude name="**/*.java" />
     866        <exclude name="**/doc-files/" />
     867        <exclude name="**/package.html" />
     868      </fileset>
     869    </copy>
     870  </target>
     871 
     872  <target
     873    name="webservices.aar"
     874    depends="webservices.compile"
     875    description="Create the core webservices aar file: core.aar"
     876    >
     877    <mkdir dir="${config}/../services" />
     878    <jar
     879      basedir="${webservices.build}"
     880      jarfile="${config}/../services/core.aar"
     881    />
     882  </target>
     883 
    807884 
    808885  <!-- installprg targets -->
  • trunk/config/dist/web.xml

    r3675 r3846  
    127127  </servlet-mapping>
    128128
     129  <!-- Axis2 servlets for web services -->
     130  <servlet>
     131    <servlet-name>AxisServlet</servlet-name>
     132    <display-name>Apache-Axis Servlet</display-name>
     133    <servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
     134    <load-on-startup>1</load-on-startup>
     135  </servlet>
     136  <servlet>
     137    <servlet-name>AxisRESTServlet</servlet-name>
     138    <display-name>Apache-Axis Servlet (REST)</display-name>
     139    <servlet-class>org.apache.axis2.transport.http.AxisRESTServlet</servlet-class>
     140  </servlet>
     141  <servlet-mapping>
     142    <servlet-name>AxisRESTServlet</servlet-name>
     143    <url-pattern>/rest/*</url-pattern>
     144  </servlet-mapping>
     145  <servlet-mapping>
     146    <servlet-name>AxisServlet</servlet-name>
     147    <url-pattern>/services/*</url-pattern>
     148  </servlet-mapping>
     149 
    129150  <!-- The MevExport servlet used to download bioassay data to Mev -->
    130151  <servlet>
  • trunk/doc/3rd-party-components.txt

    r3838 r3846  
    275275Files    : bzip2.jar
    276276
    277 
    278 
     277Axis2
     278-----
     279A core engine for webservices from Apache.
     280
     281More info : http://ws.apache.org/axis2/
     282Version   : 1.3
     283License   :
     284Files     : Everything in the /lib/webservices directory
  • trunk/src/core/net/sf/basedb/core/Application.java

    r3820 r3846  
    635635 
    636636  /**
     637    Gets the maximum number of minutes before an active session
     638    is logged out.
     639      @return An integer with number of minutes
     640      @since 2.5
     641   */
     642  public static int sessionCacheTimeout()
     643  {
     644    return sessionCacheTimeout;
     645  }
     646 
     647  /**
    637648    Checks if the server has configured a secondary storage or not.
    638649   
  • trunk/src/core/net/sf/basedb/core/query/Hql.java

    r3820 r3846  
    426426  }
    427427 
    428  
     428  /**
     429    @since 2.5
     430   */
     431  public static Restriction restriction(String restrictionString, String prefix)
     432  {   
     433    if (restrictionString == null) throw new InvalidUseOfNullException("restrictionString");
     434    if (restrictionString.length() == 0) throw new InvalidDataException("Restriction string can not be empty.");
     435    return new HqlExpression(restrictionString, prefix);
     436  }
     437 
     438  /**
     439    @since 2.5
     440   */
     441  public static Expression expression(String exprString, String prefix)
     442  {
     443    if (exprString == null) throw new InvalidUseOfNullException("exprString");
     444    if (exprString.length() == 0) throw new InvalidDataException("Expression string can not be empty");
     445    return new HqlExpression(exprString, prefix);
     446  }
    429447}
  • trunk/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java

    r3775 r3846  
    270270  }
    271271 
    272   private void exportBaseFileMatrix(BioAssaySet bas, OutputStream os, Map<String, String> parameters,
     272  public void exportBaseFileMatrix(BioAssaySet bas, OutputStream os, Map<String, String> parameters,
    273273    List<String> reporterFields, List<String> spotFields, boolean mergeReporters)
    274274    throws IOException, SQLException
     
    399399  }
    400400 
    401   private void exportBaseFileSerial(BioAssaySet bas, OutputStream os, Map<String, String> parameters,
     401  public void exportBaseFileSerial(BioAssaySet bas, OutputStream os, Map<String, String> parameters,
    402402    List<String> reporterFields, List<String> spotFields, boolean mergeReporters)
    403403    throws IOException, SQLException
  • trunk/src/test/TestUtil.java

    r3679 r3846  
    136136    return password;
    137137  }
     138 
     139  public static String getClient()
     140  {
     141    return client;
     142  }
    138143
    139144  public static void begin()
  • trunk/src/test/set_classpath.bat

    r3725 r3846  
    8181SET CP=%CP%;../../lib/dist/jcommon-1.0.6.jar
    8282
     83REM Axis
     84SET CP=%CP%;../../lib/webservices/activation-1.1.jar
     85SET CP=%CP%;../../lib/webservices/annogen-0.1.0.jar
     86SET CP=%CP%;../../lib/webservices/axiom-api-1.2.5.jar
     87SET CP=%CP%;../../lib/webservices/axiom-dom-1.2.5.jar
     88SET CP=%CP%;../../lib/webservices/axiom-impl-1.2.5.jar
     89SET CP=%CP%;../../lib/webservices/axis2-adb-1.3.jar
     90SET CP=%CP%;../../lib/webservices/axis2-java2wsdl-1.3.jar
     91SET CP=%CP%;../../lib/webservices/axis2-kernel-1.3.jar
     92SET CP=%CP%;../../lib/webservices/backport-util-concurrent-2.2.jar
     93SET CP=%CP%;../../lib/webservices/commons-codec-1.3.jar
     94SET CP=%CP%;../../lib/webservices/commons-httpclient-3.0.1.jar
     95SET CP=%CP%;../../lib/webservices/mail-1.4.jar
     96SET CP=%CP%;../../lib/webservices/neethi-2.0.2.jar
     97SET CP=%CP%;../../lib/webservices/stax-api-1.0.1.jar
     98SET CP=%CP%;../../lib/webservices/wsdl4j-1.6.2.jar
     99SET CP=%CP%;../../lib/webservices/wstx-asl-3.2.1.jar
     100SET CP=%CP%;../../lib/webservices/XmlSchema-1.3.2.jar
     101
    83102REM Affymetrix Fusion SDK
    84103SET CP=%CP%;../../lib/dist/AffxFusion.jar
  • trunk/src/test/set_classpath.sh

    r3725 r3846  
    2222
    2323LIB=../../lib/dist
     24WS_LIB=../../lib/webservices
    2425
    2526# Set up the classpath
     
    3839CP=$CP:../plugins/core
    3940CP=$CP:../clients/jobagent
     41CP=$CP:../webservices
    4042
    4143# Hibernate
     
    8284CP=$CP:$LIB/jcommon-1.0.6.jar
    8385
     86# Axis
     87CP=$CP:$WS_LIB/axis2-kernel-1.3.jar
     88CP=$CP:$WS_LIB/axis2-adb-1.3.jar
     89CP=$CP:$WS_LIB/axiom-api-1.2.5.jar
     90CP=$CP:$WS_LIB/axiom-dom-1.2.5.jar
     91CP=$CP:$WS_LIB/axiom-impl-1.2.5.jar
     92CP=$CP:$WS_LIB/stax-api-1.0.1.jar
     93CP=$CP:$WS_LIB/wstx-asl-3.2.1.jar
     94CP=$CP:$WS_LIB/wsdl4j-1.6.2.jar
     95CP=$CP:$WS_LIB/XmlSchema-1.3.2.jar
     96CP=$CP:$WS_LIB/mail-1.4.jar
     97CP=$CP:$WS_LIB/commons-httpclient-3.0.1.jar
     98CP=$CP:$WS_LIB/commons-codec-1.3.jar
     99CP=$CP:$WS_LIB/activation-1.1.jar
     100CP=$CP:$WS_LIB/backport-util-concurrent-2.2.jar
     101CP=$CP:$WS_LIB/annogen-0.1.0.jar
     102CP=$CP:$WS_LIB/axis2-java2wsdl-1.3.jar
     103CP=$CP:$WS_LIB/neethi-2.0.2.jar
     104
    84105# Affymetrix Fusion SDK
    85106CP=$CP:$LIB/AffxFusion.jar
Note: See TracChangeset for help on using the changeset viewer.