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:27:07 UTC
svn commit: r1730429 - in /axis/axis2/java/core/branches/1_6: ./
modules/adb-tests/
modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
modules/adb-tests/src/test/wsdl/ modules/adb-tests/src/test/xslt/
Author: veithen
Date: Sun Feb 14 23:27:07 2016
New Revision: 1730429
URL: http://svn.apache.org/viewvc?rev=1730429&view=rev
Log:
AXIS2-5741: Merge r1730369 and r1730427 to the 1.6 branch and enable the unit test (The regression is in 1.7.0).
Added:
axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
- copied from r1730426, axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/
axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl
- copied unchanged from r1730426, axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl
axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/xslt/
- copied from r1730426, axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/xslt/
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 23:27:07 2016
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/branches/1_7:1730395
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222165,1222169,1222510,1225017,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1302297,1305728,1307410,1326968,1327005,1328228,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,160884
3,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,1683831,1686090,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1703463,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247,1721276-1721286,1721403,1721427,1721472-1721473,1721477,1721524,1721793,1721799,1721849,1721855-1721856,1721908,1721986,1721992,1722000,1722672,1723771,1725624,1730095,1730180
+/axis/axis2/java/core/branches/1_7:1730395,1730426,1730428
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222165,1222169,1222510,1225017,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1302297,1305728,1307410,1326968,1327005,1328228,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,160884
3,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,1683831,1686090,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1703463,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247,1721276-1721286,1721403,1721427,1721472-1721473,1721477,1721524,1721793,1721799,1721849,1721855-1721856,1721908,1721986,1721992,1722000,1722672,1723771,1725624,1730095,1730180,1730369,1730427
Modified: axis/axis2/java/core/branches/1_6/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-tests/pom.xml?rev=1730429&r1=1730428&r2=1730429&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-tests/pom.xml Sun Feb 14 23:27:07 2016
@@ -79,15 +79,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>
@@ -98,6 +141,7 @@
<version>2.4.1</version>
<executions>
<execution>
+ <id>wsimport-mtom</id>
<goals>
<goal>wsimport-test</goal>
</goals>
@@ -108,6 +152,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>
@@ -128,7 +184,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>
Modified: axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java?rev=1730429&r1=1730426&r2=1730429&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java Sun Feb 14 23:27:07 2016
@@ -28,12 +28,10 @@ import org.apache.axis2.context.Configur
import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService;
import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService_Service;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.junit.Ignore;
import org.junit.Test;
public class ServiceTest {
@Test
- @Ignore("AXIS2-5741")
public void test() throws Exception {
int port = PortAllocator.allocatePort();
ConfigurationContext configurationContext =
@@ -45,7 +43,7 @@ public class ServiceTest {
((BindingProvider)client).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port + "/axis2/services/FiverxLinkService");
- assertThat(client.ladeRzVersion("test")).isEqualTo("test response");
+ assertThat(client.ladeRzVersion("test")).isEqualTo("test result");
} finally {
server.stop();
}