Changeset 3937 for trunk/build.xml

Timestamp:

Nov 8, 2007, 8:25:48 AM (15 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:

• trunk/build.xml (modified) (7 diffs)

trunk/build.xml

@@ -134 +134 @@
         <include name="**/*.jar"/>
       </fileset>
+      <pathelement location="config/local" />
+      <pathelement location="config/dist" />
     </classpath>
   </taskdef>
@@ -160 +162 @@
   <target
     name="dist"
-    depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,
-          installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
+    depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,webservices.wsdl,
+      installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
     description="Create everything needed for distribution"
     >
@@ -178 +180 @@
         <include name="sql/**/*" />
         <include name="config/**/*" />
-      </fileset>
-      <fileset dir="${webservices.build}" description="Webservice WSDL files">
-          <include name="wsdl/**/*"/>
+        <include name="wsdl/**/*" />
       </fileset>
     </copy>
@@ -250 +250 @@
   <target
       name="webservices"
-      depends="web,webservices.aar"
+      depends="web,webservices.aar,webservices.wsdl"
       description="Build webservices for local use"
   />
@@ -862 +862 @@
 
   <target
+    name="check.wsdl"
+    depends="webservices.init"
+    >
+    <uptodate
+      property="nowsdl"
+      >
+      <srcfiles dir="${webservices.src}" includes="**/*.java" />
+      <mapper type="merge" to="${webservices.wsdlpath}/SessionService.wsdl" />
+    </uptodate>
+    <condition property="wsdl.message" 
+      value="WSDL files are up to date; skipping" 
+      >
+      <istrue value="${nowsdl}" />
+    </condition>
+    <condition property="wsdl.message" 
+      value="WSDL files may not be up to date; generating new" 
+      >
+      <isfalse value="${nowsdl}" />
+    </condition>
+    <echo>${wsdl.message}</echo>
+  </target> 
+  
+  <target
     name="webservices.compile"
     depends="webservices.init,core.compile"
@@ -879 +902 @@
     </javac>
     
-    <!-- Create WSDL files for services -->
+    <copy todir="${webservices.build}" 
+      description="Resource files needed by the webservices; excludes documentation and source files"
+      includeEmptyDirs="false"
+      >
+      <fileset dir="${webservices.src}/server">
+        <include name="**/*" />
+        <exclude name="**/*.java" />
+        <exclude name="**/doc-files/" />
+        <exclude name="**/package.html" />
+      </fileset>
+    </copy>   
+  </target>
+  
+  <target 
+    name="webservices.wsdl"
+    description="Generate WSDL files for webservices"
+    depends="check.wsdl,webservices.compile"
+    unless="nowsdl"
+    >
     <webservices.wsdl serviceClassName="ArrayDesignService"/>
     <webservices.wsdl serviceClassName="BioAssaySetService"/>
@@ -886 +927 @@
     <webservices.wsdl serviceClassName="RawBioAssayService"/>
     <webservices.wsdl serviceClassName="SessionService"/>
-    
-    <copy todir="${webservices.build}" 
-      description="Resource files needed by the webservices; excludes documentation and source files"
-      includeEmptyDirs="false"
-      >
-      <fileset dir="${webservices.src}/server">
-        <include name="**/*" />
-        <exclude name="**/*.java" />
-        <exclude name="**/doc-files/" />
-        <exclude name="**/package.html" />
-      </fileset>
-    </copy>   
   </target>