Changeset 3937


Ignore:
Timestamp:
Nov 8, 2007, 8:25:48 AM (14 years ago)
Author:
Nicklas Nordborg
Message:

References #492: Web services

  • Fixed warning message about log4j when creating wsdl files
  • Check if wsdl files need to be generated or not
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r3924 r3937  
    134134        <include name="**/*.jar"/>
    135135      </fileset>
     136      <pathelement location="config/local" />
     137      <pathelement location="config/dist" />
    136138    </classpath>
    137139  </taskdef>
     
    160162  <target
    161163    name="dist"
    162     depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,
    163           installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
     164    depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,webservices.wsdl,
     165      installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
    164166    description="Create everything needed for distribution"
    165167    >
     
    178180        <include name="sql/**/*" />
    179181        <include name="config/**/*" />
    180       </fileset>
    181       <fileset dir="${webservices.build}" description="Webservice WSDL files">
    182           <include name="wsdl/**/*"/>
     182        <include name="wsdl/**/*" />
    183183      </fileset>
    184184    </copy>
     
    250250  <target
    251251      name="webservices"
    252       depends="web,webservices.aar"
     252      depends="web,webservices.aar,webservices.wsdl"
    253253      description="Build webservices for local use"
    254254  />
     
    862862
    863863  <target
     864    name="check.wsdl"
     865    depends="webservices.init"
     866    >
     867    <uptodate
     868      property="nowsdl"
     869      >
     870      <srcfiles dir="${webservices.src}" includes="**/*.java" />
     871      <mapper type="merge" to="${webservices.wsdlpath}/SessionService.wsdl" />
     872    </uptodate>
     873    <condition property="wsdl.message"
     874      value="WSDL files are up to date; skipping"
     875      >
     876      <istrue value="${nowsdl}" />
     877    </condition>
     878    <condition property="wsdl.message"
     879      value="WSDL files may not be up to date; generating new"
     880      >
     881      <isfalse value="${nowsdl}" />
     882    </condition>
     883    <echo>${wsdl.message}</echo>
     884  </target>
     885 
     886  <target
    864887    name="webservices.compile"
    865888    depends="webservices.init,core.compile"
     
    879902    </javac>
    880903   
    881     <!-- Create WSDL files for services -->
     904    <copy todir="${webservices.build}"
     905      description="Resource files needed by the webservices; excludes documentation and source files"
     906      includeEmptyDirs="false"
     907      >
     908      <fileset dir="${webservices.src}/server">
     909        <include name="**/*" />
     910        <exclude name="**/*.java" />
     911        <exclude name="**/doc-files/" />
     912        <exclude name="**/package.html" />
     913      </fileset>
     914    </copy>   
     915  </target>
     916 
     917  <target
     918    name="webservices.wsdl"
     919    description="Generate WSDL files for webservices"
     920    depends="check.wsdl,webservices.compile"
     921    unless="nowsdl"
     922    >
    882923    <webservices.wsdl serviceClassName="ArrayDesignService"/>
    883924    <webservices.wsdl serviceClassName="BioAssaySetService"/>
     
    886927    <webservices.wsdl serviceClassName="RawBioAssayService"/>
    887928    <webservices.wsdl serviceClassName="SessionService"/>
    888    
    889     <copy todir="${webservices.build}"
    890       description="Resource files needed by the webservices; excludes documentation and source files"
    891       includeEmptyDirs="false"
    892       >
    893       <fileset dir="${webservices.src}/server">
    894         <include name="**/*" />
    895         <exclude name="**/*.java" />
    896         <exclude name="**/doc-files/" />
    897         <exclude name="**/package.html" />
    898       </fileset>
    899     </copy>   
    900929  </target>
    901930 
Note: See TracChangeset for help on using the changeset viewer.