Author: veithen
Date: Sat May 28 14:35:13 2011
New Revision: 1128652
URL: http://svn.apache.org/viewvc?rev=1128652&view=rev
Log:
Merged r1128645 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/all/ (props changed)
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/
(props changed)
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/
(props changed)
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/
(props changed)
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/ (props
changed)
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/ (props
changed)
axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/ (props
changed)
axis/axis2/java/core/branches/1_6/modules/testutils/ (props changed)
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 28 14:35:13 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103760,1128580,1128618
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103760,1128580,1128618,1128645
Propchange: axis/axis2/java/core/branches/1_6/modules/all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -0,0 +1 @@
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -1 +1,2 @@
*.iml
+target
Propchange: axis/axis2/java/core/branches/1_6/modules/testutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 28 14:35:13 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
