axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r366974 - in /webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general: adbAntBuildTemplate.xsl xmlbeansAntBuildTemplate.xsl
Date Sun, 08 Jan 2006 02:29:41 GMT
Author: dims
Date: Sat Jan  7 18:29:39 2006
New Revision: 366974

URL: http://svn.apache.org/viewcvs?rev=366974&view=rev
Log:
build separate jar for client/test. pick jars from maven repo. allow external overrides to
the environment variable

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/xmlbeansAntBuildTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl?rev=366974&r1=366973&r2=366974&view=diff
==============================================================================
--- 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
Sat Jan  7 18:29:39 2006
@@ -9,7 +9,7 @@
             <xsl:comment>Auto generated ant build file</xsl:comment>
             <property environment="env"/>
             <property name="axis2.home">
-                <xsl:attribute name="value"></xsl:attribute>
+                <xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
             </property>
             <property name="name">
                 <xsl:attribute name="value">myservice</xsl:attribute>
@@ -37,15 +37,15 @@
 
             <path id="axis2.class.path">
                 <fileset>
-                    <xsl:attribute name="dir">${env.AXIS2_HOME}</xsl:attribute>
+                    <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
                     <include>
                         <xsl:attribute name="name">lib/*.jar</xsl:attribute>
                     </include>
                 </fileset>
                 <fileset>
-                    <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
+                    <xsl:attribute name="dir">${user.home}</xsl:attribute>
                     <include>
-                        <xsl:attribute name="name">lib/*.jar</xsl:attribute>
+                        <xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
                     </include>
                 </fileset>
                 <pathelement>
@@ -122,7 +122,9 @@
                                3. Axis2
                 "></echo>
             </target>
-            <target name="jar.all" depends="compile.all,echo.classpath.problem">
+            <target name="jar.all" depends="jar.server, jar.client">
+            </target>
+            <target name="jar.server" depends="compile.all,echo.classpath.problem">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
                 <copy>
                     <xsl:attribute name="toDir">${classes}/META-INF</xsl:attribute>
@@ -140,7 +142,24 @@
                     </fileset>
                 </jar>
             </target>
-            <target depends="jar.all" name="make.repo" 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>
+                        <xsl:attribute name="dir">${classes}</xsl:attribute>
+                        <exclude><xsl:attribute name="name">**/META-INF/*.*</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/lib/*.*</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*MessageReceiver.class</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*Skeleton.class</xsl:attribute></exclude>
+                    </fileset>
+                    <fileset>
+                        <xsl:attribute name="dir">${resources}</xsl:attribute>
+                        <exclude><xsl:attribute name="name">**/*.wsdl</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*.xml</xsl:attribute></exclude>
+                    </fileset>
+                </jar>
+            </target>
+            <target depends="jar.server" name="make.repo" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -166,7 +185,7 @@
                 <property name="axis2.class.path" refid="axis2.class.path"/>
                 <path id="test.class.path">
                     <pathelement>
-                        <xsl:attribute name="location">${classes}</xsl:attribute>
+                        <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>
                     </pathelement>
                     <pathelement>
                         <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?rev=366974&r1=366973&r2=366974&view=diff
==============================================================================
--- 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
Sat Jan  7 18:29:39 2006
@@ -7,7 +7,7 @@
             <xsl:comment>Auto generated ant build file</xsl:comment>
             <property environment="env"/>
             <property name="axis2.home">
-                <xsl:attribute name="value"></xsl:attribute>
+                <xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
             </property>
             <property name="name">
                 <xsl:attribute name="value">myservice</xsl:attribute>
@@ -37,15 +37,21 @@
 
             <path id="axis2.class.path">
                 <fileset>
-                    <xsl:attribute name="dir">${env.AXIS2_HOME}</xsl:attribute>
+                    <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
                     <include>
                         <xsl:attribute name="name">lib/*.jar</xsl:attribute>
                     </include>
                 </fileset>
                 <fileset>
-                    <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
+                    <xsl:attribute name="dir">${user.home}</xsl:attribute>
                     <include>
-                        <xsl:attribute name="name">lib/*.jar</xsl:attribute>
+                        <xsl:attribute name="name">.maven/repository/xmlbeans/jars/*.jar</xsl:attribute>
+                    </include>
+                    <include>
+                        <xsl:attribute name="name">.maven/repository/stax/jars/*.jar</xsl:attribute>
+                    </include>
+                    <include>
+                        <xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
                     </include>
                 </fileset>
                 <pathelement>
@@ -141,7 +147,9 @@
                                3. Axis2
                 "></echo>
             </target>
-            <target name="jar.all" depends="compile.all,echo.classpath.problem">
+            <target name="jar.all" depends="jar.server, jar.client">
+            </target>
+            <target name="jar.server" depends="compile.all,echo.classpath.problem">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
                 <copy>
                     <xsl:attribute name="toDir">${classes}/META-INF</xsl:attribute>
@@ -164,7 +172,24 @@
                     </fileset>
                 </jar>
             </target>
-            <target depends="jar.all" name="make.repo" if="jars.ok">
+            <target depends="compile.test" name="jar.client" if="jars.ok">
+                <jar>
+                    <xsl:attribute name="destfile">${lib}/${name}-test-client.jar</xsl:attribute>
+                    <fileset>
+                        <xsl:attribute name="dir">${classes}</xsl:attribute>
+                        <exclude><xsl:attribute name="name">**/META-INF/*.*</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/lib/*.*</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*MessageReceiver.class</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*Skeleton.class</xsl:attribute></exclude>
+                    </fileset>
+                    <fileset>
+                        <xsl:attribute name="dir">${resources}</xsl:attribute>
+                        <exclude><xsl:attribute name="name">**/*.wsdl</xsl:attribute></exclude>
+                        <exclude><xsl:attribute name="name">**/*.xml</xsl:attribute></exclude>
+                    </fileset>
+                </jar>
+            </target>
+            <target depends="jar.server" name="make.repo" if="jars.ok">
                 <mkdir>
                     <xsl:attribute name="dir">${build}/repo/</xsl:attribute>
                 </mkdir>
@@ -186,14 +211,11 @@
                     </classpath>
                 </java>
             </target>
-            <target if="jars.ok" name="run.test" depends="compile.test">
+            <target if="jars.ok" name="run.test" depends="jar.client">
                 <property name="axis2.class.path" refid="axis2.class.path"/>
                 <path id="test.class.path">
                     <pathelement>
-                        <xsl:attribute name="location">${classes}</xsl:attribute>
-                    </pathelement>
-                    <pathelement>
-                        <xsl:attribute name="location">${lib}\${xbeans.packaged.jar.name}</xsl:attribute>
+                        <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>
                     </pathelement>
                     <pathelement>
                         <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>



Mime
View raw message