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 2016/02/15 00:16:35 UTC
svn commit: r1730426 - in /axis/axis2/java/core/branches/1_7: ./
modules/adb-tests/pom.xml
modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl
modules/adb-tests/src/test/xslt/
Author: veithen
Date: Sun Feb 14 23:16:35 2016
New Revision: 1730426
URL: http://svn.apache.org/viewvc?rev=1730426&view=rev
Log:
AXIS2-5741: Merge r1730369 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
- copied from r1730369, axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl
- copied unchanged from r1730369, axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/xslt/
- copied from r1730369, axis/axis2/java/core/trunk/modules/adb-tests/src/test/xslt/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 23:16:35 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369
Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml?rev=1730426&r1=1730425&r2=1730426&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml Sun Feb 14 23:16:35 2016
@@ -78,15 +78,58 @@
<version>${project.version}</version>
<executions>
<execution>
+ <id>wsdl2code-mtom</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wsdl2code</goal>
</goals>
<configuration>
<wsdlFile>src/test/wsdl/MTOMService.wsdl</wsdlFile>
- <databindingName>adb</databindingName>
<syncMode>sync</syncMode>
<packageName>org.apache.axis2.databinding.mtom.client</packageName>
+ <outputDirectory>${project.build.directory}/wsdl2code/mtom</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>wsdl2code-axis2-5741</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5741.wsdl</wsdlFile>
+ <packageName>org.apache.axis2.databinding.axis2_5741.service</packageName>
+ <generateServerSide>true</generateServerSide>
+ <generateServicesXml>true</generateServicesXml>
+ <outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5741</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <databindingName>adb</databindingName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${project.build.directory}/wsdl2code/AXIS2-5741/resources</dir>
+ <includes>
+ <include>services.xml</include>
+ </includes>
+ <stylesheet>src/test/xslt/AXIS2-5741.xsl</stylesheet>
+ <outputDir>${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF</outputDir>
+ </transformationSet>
+ </transformationSets>
</configuration>
</execution>
</executions>
@@ -97,6 +140,7 @@
<version>2.4.1</version>
<executions>
<execution>
+ <id>wsimport-mtom</id>
<goals>
<goal>wsimport-test</goal>
</goals>
@@ -107,6 +151,18 @@
<packageName>org.apache.axis2.databinding.mtom.service</packageName>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-axis2-5741</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+ <wsdlFile>${basedir}/src/test/wsdl/AXIS2-5741.wsdl</wsdlFile>
+ </wsdlFiles>
+ <packageName>org.apache.axis2.databinding.axis2_5741.client</packageName>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -127,7 +183,8 @@
</goals>
<configuration>
<sources>
- <source>${project.build.directory}/generated-sources/axis2/wsdl2code/src</source>
+ <source>${project.build.directory}/wsdl2code/mtom/src</source>
+ <source>${project.build.directory}/wsdl2code/AXIS2-5741/src</source>
</sources>
</configuration>
</execution>