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 2015/12/19 18:24:38 UTC
svn commit: r1720948 - in /axis/axis2/java/core/branches/1_6: ./
modules/distribution/ modules/distribution/src/main/assembly/
modules/samples/ modules/samples/java_first_jaxws/
modules/samples/jaxws-addressbook/ modules/samples/jaxws-calculator/ modul...
Author: veithen
Date: Sat Dec 19 17:24:38 2015
New Revision: 1720948
URL: http://svn.apache.org/viewvc?rev=1720948&view=rev
Log:
Merged r1720279 to the 1.6 branch.
Added:
axis/axis2/java/core/branches/1_6/modules/samples/pom.xml
- copied unchanged from r1720279, axis/axis2/java/core/trunk/modules/samples/pom.xml
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/branches/1_6/modules/samples/ (props changed)
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml
axis/axis2/java/core/branches/1_6/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 17:24:38 2015
@@ -1 +1 @@
-/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,1222510,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,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316
+/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,1222510,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,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279
Modified: axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml Sat Dec 19 17:24:38 2015
@@ -424,7 +424,7 @@
<configuration>
<projectsDirectory>${project.build.directory}/axis2-${project.version}/samples</projectsDirectory>
<pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
+ <pomInclude>pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
</configuration>
Modified: axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml Sat Dec 19 17:24:38 2015
@@ -124,6 +124,7 @@
<directory>../../modules/samples</directory>
<outputDirectory>samples</outputDirectory>
<includes>
+ <include>pom.xml</include>
<include>databinding/**/*</include>
<include>faulthandling/**/*</include>
<include>jaxws-calculator/**/*</include>
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 19 17:24:38 2015
@@ -1 +1,2 @@
*.iml
+target
Modified: axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,10 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>java_first_jaxws</artifactId>
<name>JAXWS - Starting from Java Example</name>
- <version>1.6.4-SNAPSHOT</version>
<packaging>war</packaging>
<inceptionYear>2004</inceptionYear>
@@ -156,14 +159,4 @@
</testResource>
</testResources>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,10 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-addressbook</artifactId>
<packaging>jar</packaging>
- <version>1.6.4-SNAPSHOT</version>
<name>JAXWS Addressbook Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -132,14 +135,4 @@
<version>1.6.4-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,10 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-calculator</artifactId>
<packaging>jar</packaging>
- <version>1.6.4-SNAPSHOT</version>
<name>JAXWS Calculator Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -80,14 +83,4 @@
<version>1.6.4-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,10 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-interop</artifactId>
<packaging>jar</packaging>
- <version>1.6.4-SNAPSHOT</version>
<name>JAXWS Interop Sample</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -61,14 +64,4 @@
<version>1.6.4-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,10 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-samples</artifactId>
<name>JAXWS Samples - Echo, Ping, MTOM</name>
- <version>1.6.4-SNAPSHOT</version>
<packaging>war</packaging>
<dependencies>
<dependency>
@@ -169,14 +172,4 @@
</testResource>
</testResources>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml Sat Dec 19 17:24:38 2015
@@ -19,9 +19,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-version</artifactId>
- <version>1.6.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Axis2 -JAXWS Version Service</name>
<build>
@@ -49,14 +52,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1720948&r1=1720947&r2=1720948&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Sat Dec 19 17:24:38 2015
@@ -90,31 +90,12 @@
<module>modules/transport/testkit</module>
<module>modules/transport/udp</module>
<module>modules/transport/xmpp</module>
+ <module>modules/distribution</module>
+ <module>modules/samples</module>
</modules>
<profiles>
<profile>
- <!-- This profile needs to be activated when doing the release:prepare
- (by adding -Peverything) to make sure that the release plugin updates
- the version numbers of all relevant submodules. It must contain
- all modules not built by default, i.e. the set of modules used
- by this profile must be the union of the module sets of all
- other profiles. -->
- <id>everything</id>
- <modules>
- <module>modules/distribution</module>
- <module>modules/samples/java_first_jaxws</module>
- <module>modules/samples/jaxws-addressbook</module>
- <module>modules/samples/jaxws-calculator</module>
- <module>modules/samples/jaxws-interop</module>
- <module>modules/samples/jaxws-samples</module>
- <module>modules/samples/jaxws-version</module>
- </modules>
- </profile>
- <profile>
<id>apache-release</id>
- <modules>
- <module>modules/distribution</module>
- </modules>
<build>
<plugins>
<plugin>