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/07/02 12:06:40 UTC
svn commit: r1800557 - in /axis/axis2/java/core/trunk: ./ modules/codegen/
modules/distribution/ modules/jibx-codegen/ modules/jibx-codegen/src/
modules/jibx-codegen/src/main/ modules/jibx-codegen/src/main/java/
modules/jibx-codegen/src/main/java/org/ ...
Author: veithen
Date: Sun Jul 2 12:06:40 2017
New Revision: 1800557
URL: http://svn.apache.org/viewvc?rev=1800557&view=rev
Log:
AXIS2-5857: Split the codegen part of axis2-jibx into a separate module for easier dependency management.
Added:
axis/axis2/java/core/trunk/modules/jibx-codegen/ (with props)
axis/axis2/java/core/trunk/modules/jibx-codegen/pom.xml
- copied, changed from r1800554, axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/jibx-codegen/src/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/org/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/org/apache/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/org/apache/axis2/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
- copied unchanged from r1800556, axis/axis2/java/core/trunk/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
axis/axis2/java/core/trunk/modules/jibx-codegen/src/main/resources/
- copied from r1800556, axis/axis2/java/core/trunk/modules/jibx/src/main/resources/
Removed:
axis/axis2/java/core/trunk/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/
Modified:
axis/axis2/java/core/trunk/modules/codegen/pom.xml
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1800557&r1=1800556&r2=1800557&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Jul 2 12:06:40 2017
@@ -239,7 +239,7 @@
</includes>
</resource>
<resource>
- <directory>../jibx/src</directory>
+ <directory>../jibx-codegen/src</directory>
<includes>
<include>**/*.xsl</include>
</includes>
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=1800557&r1=1800556&r2=1800557&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Jul 2 12:06:40 2017
@@ -74,6 +74,11 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jibx-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-json</artifactId>
<version>${project.version}</version>
</dependency>
Propchange: axis/axis2/java/core/trunk/modules/jibx-codegen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 2 12:06:40 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Copied: axis/axis2/java/core/trunk/modules/jibx-codegen/pom.xml (from r1800554, axis/axis2/java/core/trunk/modules/jibx/pom.xml)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx-codegen/pom.xml?p2=axis/axis2/java/core/trunk/modules/jibx-codegen/pom.xml&p1=axis/axis2/java/core/trunk/modules/jibx/pom.xml&r1=1800554&r2=1800557&rev=1800557&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx-codegen/pom.xml Sun Jul 2 12:06:40 2017
@@ -27,29 +27,12 @@
<version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axis2-jibx</artifactId>
- <name>Apache Axis2 - JiBX Data Binding</name>
- <description>JiBX data binding support for Axis2</description>
+ <artifactId>axis2-jibx-codegen</artifactId>
+ <name>Apache Axis2 - JiBX Codegen</name>
+ <description>JiBX code generator support for Axis2</description>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-http</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${project.version}</version>
</dependency>
@@ -57,27 +40,12 @@
<groupId>org.jibx</groupId>
<artifactId>jibx-bind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-run</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-testutils</artifactId>
- <version>${project.version}</version>
- <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/jibx</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jibx</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jibx-codegen</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jibx-codegen</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx-codegen</url>
</scm>
<build>
<plugins>
@@ -95,123 +63,6 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>wsdl2java</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks unless="maven.test.skip">
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-unwrapped -d jibx -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client" />
- </java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-unwrapped -d jibx -ss -ssi -sd -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service" />
- </java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-wrapped -d jibx -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client" />
- </java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-wrapped -d jibx -ss -ssi -sd -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service" />
- </java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/customer-echo.wsdl -o ${project.build.directory}/gen/customer-echo -d jibx -Ebindingfile src/test/binding/customer-binding.xml --noBuildXML -ns2p http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer" />
- </java>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>compile</id>
- <phase>test-compile</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <java classname="org.jibx.binding.Compile" fork="true">
- <classpath refid="maven.runtime.classpath" />
- <classpath location="target/test-classes" />
- <!-- arg value="-v" /-->
- <arg value="src/test/binding/customer-binding.xml" />
- <arg value="src/test/binding/library-binding.xml" />
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/gen/library-unwrapped/src</source>
- <source>${project.build.directory}/gen/library-wrapped/src</source>
- <source>${project.build.directory}/gen/customer-echo/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>library-unwrapped-repo</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/gen/library-unwrapped/resources</directory>
- <targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>library-wrapped-repo</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/gen/library-wrapped/resources</directory>
- <targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=1800557&r1=1800556&r2=1800557&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Sun Jul 2 12:06:40 2017
@@ -50,12 +50,9 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
+ <artifactId>axis2-jibx-codegen</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-bind</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
@@ -137,7 +134,7 @@
<configuration>
<tasks unless="maven.test.skip">
<java classname="org.jibx.binding.Compile" fork="true">
- <classpath refid="maven.runtime.classpath" />
+ <classpath refid="maven.test.classpath" />
<classpath location="target/test-classes" />
<!-- arg value="-v" /-->
<arg value="src/test/binding/customer-binding.xml" />
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=1800557&r1=1800556&r2=1800557&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 Sun Jul 2 12:06:40 2017
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jibx</artifactId>
+ <artifactId>axis2-jibx-codegen</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1800557&r1=1800556&r2=1800557&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Jul 2 12:06:40 2017
@@ -49,6 +49,7 @@
<module>modules/integration</module>
<module>modules/java2wsdl</module>
<module>modules/jibx</module>
+ <module>modules/jibx-codegen</module>
<module>modules/json</module>
<module>modules/kernel</module>
<module>modules/mex</module>