You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/11/19 10:34:13 UTC
svn commit: r596232 - in /webservices/axis2/trunk/java/modules:
distribution/ documentation/ integration/ parent/ scripting/
tool/axis2-eclipse-codegen-plugin/ tool/axis2-idea-plugin/
tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/mav...
Author: amilas
Date: Mon Nov 19 01:34:11 2007
New Revision: 596232
URL: http://svn.apache.org/viewvc?rev=596232&view=rev
Log:
applied the patch for Axis2-3312
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/documentation/pom.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/scripting/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Mon Nov 19 01:34:11 2007
@@ -186,8 +186,8 @@
<artifactId>woden-impl-dom</artifactId>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
Modified: webservices/axis2/trunk/java/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/pom.xml Mon Nov 19 01:34:11 2007
@@ -180,8 +180,8 @@
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Mon Nov 19 01:34:11 2007
@@ -279,8 +279,8 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Mon Nov 19 01:34:11 2007
@@ -137,7 +137,7 @@
<woden.version>1.0-incubating-SNAPSHOT</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xalan.version>2.7.0</xalan.version>
- <xbean.version>2.2.0</xbean.version>
+ <xmlbeans.version>2.3.0</xmlbeans.version>
<xerces.version>2.8.1</xerces.version>
<xml_apis.version>1.3.03</xml_apis.version>
<xmlschema.version>SNAPSHOT</xmlschema.version>
@@ -757,9 +757,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xbean.version}</version>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
Modified: webservices/axis2/trunk/java/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/scripting/pom.xml Mon Nov 19 01:34:11 2007
@@ -40,8 +40,8 @@
<artifactId>js</artifactId>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>bsf</groupId>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml Mon Nov 19 01:34:11 2007
@@ -61,7 +61,7 @@
<filter token="neethi.version" value="${neethi.version}" />
<filter token="stax.api.version" value="${stax.api.version}" />
<filter token="stax.impl.version" value="${stax.impl.version}" />
- <filter token="xbean.version" value="${xbean.version}" />
+ <filter token="xmlbeans.version" value="${xmlbeans.version}" />
<filter token="XmlSchema.version" value="${XmlSchema.version}" />
<filter token="log4j.version" value="${log4j.version}" />
<filter token="wsdl4j.version" value="${wsdl4j.version}" />
@@ -86,7 +86,7 @@
<include name="stax-api-${stax.api.version}.jar" />
<include name="wsdl4j-${wsdl4j.version}.jar" />
<include name="wstx-${stax.impl.version}.jar" />
- <include name="xbean-${xbean.version}.jar" />
+ <include name="xmlbeans-${xmlbeans.version}.jar" />
<include name="XmlSchema-${XmlSchema.version}.jar" />
<include name="woden-${woden.version}.jar" />
<include name="commons-httpclient-${commons.httpclient.version}.jar" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Mon Nov 19 01:34:11 2007
@@ -95,10 +95,10 @@
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${artifactId}-${xbean.version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifactId}-${xmlbeans.version}.${extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>xmlbeans:xbean:jar</include>
+ <include>org.apache.xmlbeans:xmlbeans:jar</include>
</includes>
</dependencySet>
<dependencySet>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Mon Nov 19 01:34:11 2007
@@ -200,9 +200,9 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xbean.version}</version>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -345,7 +345,7 @@
<filter token="neethi.version" value="${neethi.version}" />
<filter token="stax.api.version" value="${stax.api.version}" />
<filter token="stax.impl.version" value="${stax.impl.version}" />
- <filter token="xbean.version" value="${xbean.version}" />
+ <filter token="xmlbeans.version" value="${xmlbeans.version}" />
<filter token="xmlschema.version" value="${xmlschema.version}" />
<filter token="log4j.version" value="${log4j.version}" />
<filter token="wsdl4j.version" value="${wsdl4j.version}" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml Mon Nov 19 01:34:11 2007
@@ -42,7 +42,7 @@
<include>org.codehaus.woodstox:wstx-asl:jar</include>
<include>org.apache.neethi:neethi:jar</include>
<include>stax:stax-api:jar</include>
- <include>xmlbeans:xbean:jar</include>
+ <include>org.apache.xmlbeans:xmlbeans:jar</include>
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>log4j:log4j:jar</include>
<include>org.apache.woden:woden:jar</include>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml Mon Nov 19 01:34:11 2007
@@ -102,8 +102,8 @@
<artifactId>ant</artifactId>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Mon Nov 19 01:34:11 2007
@@ -307,10 +307,10 @@
new InheritedArtifact("org.apache.axis2", "axis2-adb")
};
- private static final InheritedArtifact[] xbeanArtifacts =
+ private static final InheritedArtifact[] xmlbeansArtifacts =
{
new InheritedArtifact("org.apache.axis2", "axis2-xmlbeans"),
- new InheritedArtifact("xmlbeans", "xbean")
+ new InheritedArtifact("org.apache.xmlbeans", "xmlbeans")
};
/** Fills the option map. This map is passed onto the code generation API to generate the code. */
@@ -676,7 +676,7 @@
if ("adb".equals(databindingName)) {
list.addAll(Arrays.asList(adbArtifacts));
} else if ("xmlbeans".equals(databindingName)) {
- list.addAll(Arrays.asList(xbeanArtifacts));
+ list.addAll(Arrays.asList(xmlbeansArtifacts));
}
return (InheritedArtifact[])list.toArray(new InheritedArtifact[ list.size() ]);
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties Mon Nov 19 01:34:11 2007
@@ -38,7 +38,7 @@
lib/stax-api-@stax.api.version@.jar,\
lib/wsdl4j-@wsdl4j.version@.jar,\
lib/wstx-@stax.impl.version@.jar,\
- lib/xbean-@xbean.version@.jar,\
+ lib/xmlbeans-@xmlbeans.version@.jar,\
lib/XmlSchema-@xmlschema.version@.jar,\
lib/woden-@woden.version@.jar,\
lib/commons-httpclient-@commons.httpclient.version@.jar,\
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Mon Nov 19 01:34:11 2007
@@ -68,7 +68,7 @@
<library name="lib/wstx-asl-@stax.impl.version@.jar">
<export name="*"/>
</library>
- <library name="lib/xbean-@xbean.version@.jar">
+ <library name="lib/xmlbeans-@xmlbeans.version@.jar">
<export name="*"/>
</library>
<library name="lib/XmlSchema-@xmlschema.version@.jar">
Modified: webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/pom.xml?rev=596232&r1=596231&r2=596232&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/pom.xml Mon Nov 19 01:34:11 2007
@@ -35,8 +35,8 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org