You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/12/23 22:53:44 UTC
svn commit: r1819188 - in /axis/axis2/java/core/trunk: ./ apidocs/
modules/distribution/ modules/jaxbri-codegen/ modules/jaxbri/
modules/tool/axis2-eclipse-codegen-plugin/
modules/tool/axis2-wsdl2code-maven-plugin/ modules/webapp/
modules/webapp/script...
Author: veithen
Date: Sat Dec 23 22:53:43 2017
New Revision: 1819188
URL: http://svn.apache.org/viewvc?rev=1819188&view=rev
Log:
Cleanly separate data binding support classes from code generation logic.
Added:
axis/axis2/java/core/trunk/modules/jaxbri-codegen/
- copied from r1819187, axis/axis2/java/core/trunk/modules/jaxbri/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/ (with props)
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/pom.xml
- copied, changed from r1818897, axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/apache/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/apache/axis2/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/apache/axis2/xmlbeans/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
- copied unchanged from r1819187, axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/java/org/apache/axis2/xmlbeans/XSDConfig.java
- copied unchanged from r1819187, axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XSDConfig.java
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/apache/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/apache/axis2/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/apache/axis2/xmlbeans/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/apache/axis2/xmlbeans/template/
axis/axis2/java/core/trunk/modules/xmlbeans-codegen/src/main/resources/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
- copied unchanged from r1819187, axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Removed:
axis/axis2/java/core/trunk/modules/jaxbri/
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XSDConfig.java
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/
Modified:
axis/axis2/java/core/trunk/apidocs/pom.xml
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml
axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml
axis/axis2/java/core/trunk/pom.xml
axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md
Modified: axis/axis2/java/core/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/apidocs/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/core/trunk/apidocs/pom.xml Sat Dec 23 22:53:43 2017
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sat Dec 23 22:53:43 2017
@@ -99,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml Sat Dec 23 22:53:43 2017
@@ -27,7 +27,7 @@
<version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<name>Apache Axis2 - JAXB-RI Data Binding</name>
<description>JAXB-RI data binding support for Axis2</description>
<dependencies>
@@ -71,9 +71,9 @@
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jaxbri</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jaxbri</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jaxbri-codegen</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jaxbri-codegen</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri-codegen</url>
</scm>
<build>
<plugins>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sat Dec 23 22:53:43 2017
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
+ <artifactId>axis2-xmlbeans-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat Dec 23 22:53:43 2017
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
+ <artifactId>axis2-xmlbeans-codegen</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -129,7 +129,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sat Dec 23 22:53:43 2017
@@ -190,6 +190,12 @@
</exclusions>
</dependency>
<dependency>
+ <!-- codegen is required for Rampart because of AXIS2-4265 -->
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<version>${project.version}</version>
Modified: axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml Sat Dec 23 22:53:43 2017
@@ -76,7 +76,6 @@
<exclude name="**servlet**" />
<exclude name="axis2-ant-plugin-*.jar" />
<exclude name="axis2-*-codegen-*.jar"/>
- <exclude name="axis2-jaxbri-*.jar"/>
<exclude name="axis2-java2wsdl-*.jar"/>
<!-- codegen is required for Rampart because of AXIS2-4265 -->
<!-- exclude name="axis2-codegen*.jar"/ -->
Propchange: axis/axis2/java/core/trunk/modules/xmlbeans-codegen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 23 22:53:43 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Copied: axis/axis2/java/core/trunk/modules/xmlbeans-codegen/pom.xml (from r1818897, axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans-codegen/pom.xml?p2=axis/axis2/java/core/trunk/modules/xmlbeans-codegen/pom.xml&p1=axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml&r1=1818897&r2=1819188&rev=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/xmlbeans-codegen/pom.xml Sat Dec 23 22:53:43 2017
@@ -27,9 +27,9 @@
<version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axis2-xmlbeans</artifactId>
- <name>Apache Axis2 - XMLBeans Data Binding</name>
- <description>XMLBeans data binding support for Axis2</description>
+ <artifactId>axis2-xmlbeans-codegen</artifactId>
+ <name>Apache Axis2 - XMLBeans Codegen</name>
+ <description>XMLBeans code generator support for Axis2</description>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -40,48 +40,14 @@
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/xmlbeans</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/xmlbeans</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/xmlbeans-codegen</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/xmlbeans-codegen</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans-codegen</url>
</scm>
<build>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <testResources>
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>test-resources</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -98,45 +64,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <excludes>
- <exclude>**/*Util.java</exclude>
- <exclude>**/*Constants.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>gen-cp</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="cp" refid="maven.runtime.classpath" />
- <echo message="${cp}" file="target/cp.txt" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <!--<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-antlr</artifactId>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlrall</artifactId>
- </dependency>-->
- </dependencies>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml Sat Dec 23 22:53:43 2017
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
+ <artifactId>axis2-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -41,6 +41,12 @@
<artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans-codegen</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sat Dec 23 22:53:43 2017
@@ -77,8 +77,9 @@
<module>modules/tool/archetype/quickstart-webapp</module>
<module>modules/webapp</module>
<module>modules/xmlbeans</module>
+ <module>modules/xmlbeans-codegen</module>
<module>modules/scripting</module>
- <module>modules/jaxbri</module>
+ <module>modules/jaxbri-codegen</module>
<module>modules/metadata</module>
<module>modules/saaj</module>
<module>modules/jaxws</module>
Modified: axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md?rev=1819188&r1=1819187&r2=1819188&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md (original)
+++ axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md Sat Dec 23 22:53:43 2017
@@ -9,3 +9,13 @@ Apache Axis2 1.8.0 Release Note
* The HTTPClient 4.x based transport has been upgraded to use the APIs supported
by the latest HTTPClient version.
+
+* To improve dependency management, the data binding JARs have been split to
+ separate the code required at build time from the code required at runtime:
+ * `axis2-jibx` has been split into `axis2-jibx` and `axis2-jibx-codegen`.
+ * `axis2-xmlbeans` has been split into `axis2-xmlbeans` and
+ `axis2-xmlbeans-codegen`.
+ * `axis2-jaxbri` has been renamed to `axis2-jaxbri` (The JAXB-RI data
+ binding doesn't require any additional classes at runtime).
+ * There are no changes for ADB because the code was already split in
+ previous Axis2 versions.