You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2007/03/22 12:05:21 UTC

svn commit: r521208 - in /webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general: adbAntBuildTemplate.xsl jaxbriAntBuildTemplate.xsl jaxmeAntBuildTemplate.xsl jibxAntBuildTemplate.xsl xmlbeansAntBuildTemplate.xsl

Author: amilas
Date: Thu Mar 22 04:05:19 2007
New Revision: 521208

URL: http://svn.apache.org/viewvc?view=rev&rev=521208
Log:
Applied the patch for AXIS2-2344

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl?view=diff&rev=521208&r1=521207&r2=521208
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl Thu Mar 22 04:05:19 2007
@@ -190,7 +190,7 @@
 
 
 
-            <target depends="jar.server" name="make.repo" if="jars.ok">
+            <target name="make.repo" depends="jar.server" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -202,7 +202,7 @@
                     <xsl:attribute name="toDir">${build}/repo/services/</xsl:attribute>
                 </copy>
             </target>
-            <target depends="make.repo" name="start.server" if="jars.ok">
+            <target name="start.server" depends="make.repo" if="jars.ok">
                 <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
                     <arg>
                         <xsl:attribute name="value">${build}/repo</xsl:attribute>
@@ -212,7 +212,7 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="compile.test">
+            <target name="run.test" depends="compile.test" if="jars.ok">
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl?view=diff&rev=521208&r1=521207&r2=521208
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl Thu Mar 22 04:05:19 2007
@@ -172,9 +172,7 @@
                 </jar>
             </target>
 
-
-
-            <target  name="jar.client" if="jars.ok">
+            <target name="jar.client" if="jars.ok">
                 <!--set the correct depends target-->
                 <xsl:choose>
                     <xsl:when test="@testOmit">
@@ -185,7 +183,6 @@
                     </xsl:otherwise>
                 </xsl:choose>
 
-
                 <jar>
                     <xsl:attribute name="destfile">${lib}/${name}-test-client.jar</xsl:attribute>
                     <fileset>
@@ -199,12 +196,7 @@
                 </jar>
             </target>
 
-
-
-
-
-
-            <target depends="jar.server" name="make.repo" if="jars.ok">
+            <target name="make.repo" depends="jar.server" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -216,7 +208,7 @@
                     <xsl:attribute name="toDir">${build}/repo/services/</xsl:attribute>
                 </copy>
             </target>
-            <target depends="make.repo" name="start.server" if="jars.ok">
+            <target name="start.server" depends="make.repo" if="jars.ok">
                 <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
                     <arg>
                         <xsl:attribute name="value">${build}/repo</xsl:attribute>
@@ -226,7 +218,7 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="jar.client">
+            <target name="run.test" depends="jar.client" if="jars.ok">
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl?view=diff&rev=521208&r1=521207&r2=521208
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl Thu Mar 22 04:05:19 2007
@@ -181,7 +181,7 @@
                     </fileset>
                 </jar>
             </target>
-            <target depends="compile.test" name="jar.client" if="jars.ok">
+            <target name="jar.client" depends="compile.test" if="jars.ok">
                 <jar>
                     <xsl:attribute name="destfile">${lib}/${name}-test-client.jar</xsl:attribute>
                     <fileset>
@@ -199,7 +199,7 @@
                     </fileset>
                 </jar>
             </target>
-            <target depends="jar.server" name="make.repo" if="jars.ok">
+            <target name="make.repo" depends="jar.server" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -211,7 +211,7 @@
                     <xsl:attribute name="toDir">${build}/repo/services/</xsl:attribute>
                 </copy>
             </target>
-            <target depends="make.repo" name="start.server" if="jars.ok">
+            <target name="start.server" depends="make.repo" if="jars.ok">
                 <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
                     <arg>
                         <xsl:attribute name="value">${build}/repo</xsl:attribute>
@@ -221,7 +221,7 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="jar.client">
+            <target name="run.test" depends="jar.client" if="jars.ok">
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl?view=diff&rev=521208&r1=521207&r2=521208
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl Thu Mar 22 04:05:19 2007
@@ -189,10 +189,7 @@
                 </jar>
             </target>
 
-
-
-
-            <target depends="jar.server" name="make.repo" if="jars.ok">
+            <target name="make.repo" depends="jar.server" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -204,7 +201,7 @@
                     <xsl:attribute name="toDir">${build}/repo/services/</xsl:attribute>
                 </copy>
             </target>
-            <target depends="make.repo" name="start.server" if="jars.ok">
+            <target name="start.server" depends="make.repo" if="jars.ok">
                 <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
                     <arg>
                         <xsl:attribute name="value">${build}/repo</xsl:attribute>
@@ -214,7 +211,7 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="compile.test">
+            <target name="run.test" depends="compile.test" if="jars.ok">
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?view=diff&rev=521208&r1=521207&r2=521208
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl Thu Mar 22 04:05:19 2007
@@ -194,9 +194,7 @@
                 </jar>
             </target>
 
-
-
-            <target  name="jar.client" if="jars.ok">
+            <target name="jar.client" if="jars.ok">
                 <!--set the correct depends target-->
                 <xsl:choose>
                     <xsl:when test="@testOmit">
@@ -207,7 +205,6 @@
                     </xsl:otherwise>
                 </xsl:choose>
 
-
                 <jar>
                     <xsl:attribute name="destfile">${lib}/${name}-test-client.jar</xsl:attribute>
                     <fileset>
@@ -227,12 +224,7 @@
                 </jar>
             </target>
 
-
-
-
-
-
-            <target depends="jar.server" name="make.repo" if="jars.ok">
+            <target name="make.repo" depends="jar.server" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -244,7 +236,7 @@
                     <xsl:attribute name="toDir">${build}/repo/services/</xsl:attribute>
                 </copy>
             </target>
-            <target depends="make.repo" name="start.server" if="jars.ok">
+            <target name="start.server" depends="make.repo" if="jars.ok">
                 <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
                     <arg>
                         <xsl:attribute name="value">${build}/repo</xsl:attribute>
@@ -254,7 +246,7 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="jar.client">
+            <target name="run.test" depends="jar.client" if="jars.ok">
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org