axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r367860 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/template/general/ integration/ tool/src/org/apache/axis2/tool/codegen/eclipse/ui/ tool/src/org/apache/axis2/tool/codegen/eclipse/util/
Date Wed, 11 Jan 2006 01:05:22 GMT
Author: dims
Date: Tue Jan 10 17:05:15 2006
New Revision: 367860

URL: http://svn.apache.org/viewcvs?rev=367860&view=rev
Log:
fix last minute breakage...

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
    webservices/axis2/trunk/java/modules/integration/maven.xml
    webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
    webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java

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=367860&r1=367859&r2=367860&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
Tue Jan 10 17:05:15 2006
@@ -11,7 +11,7 @@
             <property name="axis2.home">
                 <xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
             </property>
-            <property name="axis2.class.path">
+            <property name="maven.class.path">
                 <xsl:attribute name="value"></xsl:attribute>
             </property>
             <property name="name">
@@ -43,7 +43,7 @@
                     <xsl:attribute name="path">${java.class.path}</xsl:attribute>
                 </pathelement>
                 <pathelement>
-                    <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
+                    <xsl:attribute name="path">${maven.class.path}</xsl:attribute>
                 </pathelement>
                 <fileset>
                     <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
@@ -182,14 +182,13 @@
                 </java>
             </target>
             <target if="jars.ok" name="run.test" depends="compile.test">
-                <property name="axis2.class.path" refid="axis2.class.path"/>
                 <path id="test.class.path">
                     <pathelement>
                         <xsl:attribute name="location">${lib}/${name}-test-client.jar</xsl:attribute>
                     </pathelement>
-                    <pathelement>
-                        <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
-                    </pathelement>
+                    <path>
+                        <xsl:attribute name="refid">axis2.class.path</xsl:attribute>
+                    </path>
                 </path>
                 <mkdir>
                     <xsl:attribute name="dir">${build}/test-reports/</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=367860&r1=367859&r2=367860&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
Tue Jan 10 17:05:15 2006
@@ -9,7 +9,7 @@
             <property name="axis2.home">
                 <xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
             </property>
-            <property name="axis2.class.path">
+            <property name="maven.class.path">
                 <xsl:attribute name="value"></xsl:attribute>
             </property>
             <property name="name">
@@ -43,7 +43,7 @@
                     <xsl:attribute name="path">${java.class.path}</xsl:attribute>
                 </pathelement>
                 <pathelement>
-                    <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
+                    <xsl:attribute name="path">${maven.class.path}</xsl:attribute>
                 </pathelement>
                 <fileset>
                     <xsl:attribute name="dir">${axis2.home}</xsl:attribute>
@@ -206,14 +206,13 @@
                 </java>
             </target>
             <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">${lib}/${name}-test-client.jar</xsl:attribute>
                     </pathelement>
-                    <pathelement>
-                        <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
-                    </pathelement>
+                    <path>
+                        <xsl:attribute name="refid">axis2.class.path</xsl:attribute>
+                    </path>
                 </path>
                 <mkdir>
                     <xsl:attribute name="dir">${build}/test-reports/</xsl:attribute>

Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367860&r1=367859&r2=367860&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Tue Jan 10 17:05:15 2006
@@ -18,7 +18,7 @@
 
     <preGoal name="test:compile">
 		<!-- Set a property that can be picked up from the ant build.xml's -->
-        <ant:property name="axis2.class.path" refid="maven.dependency.classpath"/>
+        <ant:property name="maven.class.path" refid="maven.dependency.classpath"/>
 
 		<!-- copy the mars so that they are available on the test classpath -->
         <copy file="../addressing/target/addressing.mar"

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java?rev=367860&r1=367859&r2=367860&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
(original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
Tue Jan 10 17:05:15 2006
@@ -373,6 +373,7 @@
    private void fillDatabinderCombo()
    {
 
+      databindingTypeCombo.add(DATA_BINDING_XMLBEANS);
       databindingTypeCombo.add(DATA_BINDING_ADB);
       databindingTypeCombo.add(DATA_BINDING_NONE);
       

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java?rev=367860&r1=367859&r2=367860&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
Tue Jan 10 17:05:15 2006
@@ -22,6 +22,7 @@
     
     public static final String DATA_BINDING_NONE = "none" ;
     public static final String DATA_BINDING_ADB = "adb" ;
+    public static final String DATA_BINDING_XMLBEANS = "xmlbeans" ;
     
     
 



Mime
View raw message