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/13 12:22:30 UTC
svn commit: r1730182 - in /axis/axis2/java/core/branches/1_7: ./ apidocs/
modules/distribution/ modules/samples/ modules/samples/java_first_jaxws/
modules/samples/jaxws-addressbook/ modules/samples/jaxws-calculator/
modules/samples/jaxws-interop/ modul...
Author: veithen
Date: Sat Feb 13 11:22:30 2016
New Revision: 1730182
URL: http://svn.apache.org/viewvc?rev=1730182&view=rev
Log:
Merge r1730095 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/apidocs/ (props changed)
axis/axis2/java/core/branches/1_7/modules/distribution/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/java_first_jaxws/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/jaxws-addressbook/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/jaxws-calculator/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/jaxws-interop/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/jaxws-samples/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/jaxws-version/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/httpsClient/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/httpsService/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/transport/jms-sample/ (props changed)
axis/axis2/java/core/branches/1_7/modules/samples/transport/jms-sample/jmsService/ (props changed)
axis/axis2/java/core/branches/1_7/modules/tool/archetype/quickstart/ (props changed)
axis/axis2/java/core/branches/1_7/modules/tool/archetype/quickstart-webapp/ (props changed)
axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/ (props changed)
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 13 11:22:30 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
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095
Propchange: axis/axis2/java/core/branches/1_7/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1 +1,3 @@
+.project
+.settings
target
Propchange: axis/axis2/java/core/branches/1_7/modules/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,3 +1,5 @@
+.project
+.settings
*.iml
*.iws
*.ipr
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,4 @@
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/java_first_jaxws/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/jaxws-addressbook/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/jaxws-calculator/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/jaxws-interop/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/jaxws-samples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/jaxws-version/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
*.iml
target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/httpsClient/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/transport/https-sample/httpsService/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/transport/jms-sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/samples/transport/jms-sample/jmsService/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/tool/archetype/quickstart/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/tool/archetype/quickstart-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Propchange: axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 13 11:22:30 2016
@@ -1 +1,4 @@
+.classpath
+.project
+.settings
target