Changeset 3494

Timestamp:

03/05/12 10:06:29

Author:

douglm

Message:

Another try to avoid Windows build errors

Files:

• trunk/build/buildTools/wsimport.xml (modified) (2 diffs)
• trunk/build/buildTools/xjc.xml (modified) (2 diffs)

trunk/build/buildTools/wsimport.xml

@@ -73 +73 @@
-          <getJar name="jaxws-rt" version="2.2" /> 
-          -->
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-          <property name="wsimport.lib" 
-                    location="${org.bedework.temp.dir}/wsimportlib${org.bedework.wsimport.tstamp}" />
-          <mkdir dir="${org.bedework.temp.dir}" />
-          <!--<delete dir="${wsimport.lib}" />-->
-          <mkdir dir="${wsimport.lib}" />
-          
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="jaxws-tools" version="2.1.4" /> 
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="jaxb-xjc" version="2.1.7" /> 
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="jaxb-impl" version="2.1.8" /> 
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="jaxws-rt" version="2.1.4" /> 
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="streambuffer" version="1.0" /> 
-          <getJar lib="${wsimport.lib}"
-                  libcache="${org.bedework.libcache.dir}"
-                  name="stax-ex" version="2.2.1" /> 
-      
-          <path id="wsimport.classpath">
-            <fileset dir="${ant.home}/lib">
@@ -140 +144 @@
-               way to suppress generation -->
-          <property name="wsimport.dest" 
-${org.bedework.wsimport.tstamp}
+
-          <mkdir dir="${wsimport.dest}" />
-    

trunk/build/buildTools/xjc.xml

@@ -72 +72 @@
-          <getJar name="jaxws-rt" version="2.2" /> 
-          -->
-          <var name="org.bedework.xjc.tstamp" unset="true" />
-          <tstamp>
-            <format property="org.bedework.xjc.tstamp" pattern="yyyyMMddhhmmss"/>
-          </tstamp>
-
-          <property name="xjc.lib" 
-
-
-
-
+
+
+
+
+
+
+
+
+
-          
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-          <path id="xjc.classpath">
@@ -139 +141 @@
-               way to suppress generation -->
-          <property name="xjc.dest" 
-${org.bedework.xjc.tstamp}
+
-          <mkdir dir="${xjc.dest}" />
-