Author: veithen
Date: Mon Dec 21 15:29:01 2015
New Revision: 1721193
URL: http://svn.apache.org/viewvc?rev=1721193&view=rev
Log:
TRANSPORTS-50: Merge rr1721157 to the 1.6 branch and fix version numbers.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/branches/1_6/modules/samples/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsClient/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsService/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/jmsService/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 15:29:01 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,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,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,163160
8,1649688,1677432,1683827,1683831,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,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721166
+/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,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,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,163160
8,1649688,1677432,1683827,1683831,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,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166
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=1721193&r1=1721192&r2=1721193&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
Mon Dec 21 15:29:01 2015
@@ -145,6 +145,7 @@
<include>quickstartxmlbeans/**/*</include>
<include>servicelifecycle/**/*</include>
<include>soapwithattachments/**/*</include>
+ <include>transport/**/*</include>
<include>userguide/**/*</include>
<include>version/**/*</include>
<include>wsdl/**/*</include>
Modified: axis/axis2/java/core/branches/1_6/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/pom.xml Mon Dec 21
15:29:01 2015
@@ -38,6 +38,8 @@
<module>jaxws-interop</module>
<module>jaxws-samples</module>
<module>jaxws-version</module>
+ <module>transport/https-sample</module>
+ <module>transport/jms-sample</module>
</modules>
<build>
<plugins>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsClient/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsClient/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsClient/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsClient/pom.xml
Mon Dec 21 15:29:01 2015
@@ -16,9 +16,9 @@
<parent>
<artifactId>https-sample</artifactId>
<groupId>org.apache.axis2.examples</groupId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.axis2.examples</groupId>
<artifactId>httpsClient</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</project>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsService/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsService/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsService/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/httpsService/pom.xml
Mon Dec 21 15:29:01 2015
@@ -16,17 +16,18 @@
<parent>
<artifactId>https-sample</artifactId>
<groupId>org.apache.axis2.examples</groupId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.axis2.examples</groupId>
<artifactId>httpsService</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
+ <version>1.5</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -55,6 +56,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
<configuration>
<webAppConfig>
<contextPath>/</contextPath>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/transport/https-sample/pom.xml
Mon Dec 21 15:29:01 2015
@@ -13,9 +13,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>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<artifactId>https-sample</artifactId>
- <version>1.6.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-HTTPS sample</name>
<build>
@@ -47,16 +51,6 @@
<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>
<modules>
<module>httpsService</module>
<module>httpsClient</module>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/jmsService/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/jmsService/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/jmsService/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/jmsService/pom.xml
Mon Dec 21 15:29:01 2015
@@ -4,11 +4,11 @@
<parent>
<artifactId>jms-sample</artifactId>
<groupId>org.apache.axis2.examples</groupId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.axis2.examples</groupId>
<artifactId>jmsService</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
<build>
<plugins>
<plugin>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/pom.xml?rev=1721193&r1=1721192&r2=1721193&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/transport/jms-sample/pom.xml
Mon Dec 21 15:29:01 2015
@@ -13,9 +13,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>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<artifactId>jms-sample</artifactId>
- <version>1.6.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-JMS sample</name>
<build>
@@ -47,16 +51,6 @@
<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>
<modules>
<module>jmsService</module>
</modules>
