svn commit: r1088222 - /axis/axis2/java/sandesha/branches/1_6/pom.xml

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 08:14:09 2011
New Revision: 1088222

URL: http://svn.apache.org/viewvc?rev=1088222&view=rev
Log:
Set the Axiom version to the same value as used by the Axis2 1.6 branch.

Modified:
axis/axis2/java/sandesha/branches/1_6/pom.xml

Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1088222&r1=1088221&r2=1088222&view=diff
==
--- axis/axis2/java/sandesha/branches/1_6/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/pom.xml Sun Apr  3 08:14:09 2011
@@ -438,7 +438,7 @@
 
 1.6.1-SNAPSHOT
 1.6.0-SNAPSHOT
-1.2.12-SNAPSHOT
+1.2.11
 2.0.4
 1.1.1
 3.8.2

svn commit: r1088239 - in /axis/axis2/java/core/trunk: ./ modules/distribution/ modules/samples/java_first_jaxws/ modules/samples/jaxws-addressbook/ modules/samples/jaxws-calculator/ modules/samples/j

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 10:04:02 2011
New Revision: 1088239

URL: http://svn.apache.org/viewvc?rev=1088239&view=rev
Log:
Fixed a couple of samples.

Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
axis/axis2/java/core/trunk/modules/samples/mtom/build.xml
axis/axis2/java/core/trunk/pom.xml

Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Apr  3 10:04:02 
2011
@@ -347,6 +347,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -365,7 +369,7 @@
 
 
${project.build.directory}/axis2-${project.version}/samples
 
-
java_first_jaxws/pom.xml
+*/pom.xml
 
 true
 

Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Sun Apr 
 3 10:04:02 2011
@@ -100,7 +100,7 @@
 
 
 maven-compiler-plugin
-true
+2.3.2
 
 1.5
 1.5
@@ -110,6 +110,7 @@
 
 org.apache.maven.plugins
 maven-war-plugin
+2.1.1
 
 
${basedir}/src/webapp
 
@@ -118,6 +119,7 @@
 
 maven-jar-plugin
+2.3.1
 
 
 
@@ -156,4 +158,14 @@
 
 
 
+
+
+apache.snapshots
+Apache Snapshot Repository
+http://repository.apache.org/snapshots
+
+false
+
+
+
 

Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml Sun 
Apr  3 10:04:02 2011
@@ -23,7 +23,7 @@
 org.apache.axis2.samples
 jaxws-addressbook
 jar
-SNAPSHOT
+1.7.0-SNAPSHOT
 JAXWS Addressbook Service
 
 src
@@ -36,6 +36,7 @@
 
 org.apache.maven.plugins
 maven-jar-plugin
+2.3.1
 
 
 generate-client-jar
@@ -55,6 +56,7 @@
 
 org.apache.maven.plugins
 maven-antrun-plugin
+1.3
 
 
 gen-sources
@@ -87,6 +89,7 @@
 
 org.codehaus.mojo
 build-helper-maven-plugin
+1.5
 
 
 add-sources
@@ -105,6 +108,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
+2.3.2
 
 1.5
 1.5
@@ -127,35 +131,17 @@
 
 org.apache.axis2
 axis2-jaxws
-SNAPSHOT
+1.7.0-SNAPSHOT
 
 
 
 
-apache-m2
-
http://people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-apache-

svn commit: r1088248 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 10:32:11 2011
New Revision: 1088248

URL: http://svn.apache.org/viewvc?rev=1088248&view=rev
Log:
Set up an endorsed directory so that the distribution works properly on Java 
1.6. Note that the Unix/Windows scripts already add that directory to the java 
command line. Therefore we only need to add the right JARs to that directory.

Modified:

axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml

Modified: 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1088248&r1=1088247&r2=1088248&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
 Sun Apr  3 10:32:11 2011
@@ -180,6 +180,16 @@
 
 
 
+
+false
+lib/endorsed
+
+javax.xml.bind:jaxb-api:jar
+
org.apache.geronimo.specs:geronimo-saaj_1.3_spec:jar
+
org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar
+
+
+
 false
 
 org.apache.axis2:axis2-webapp

svn commit: r1088249 - /axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 10:38:54 2011
New Revision: 1088249

URL: http://svn.apache.org/viewvc?rev=1088249&view=rev
Log:
Fixed another version number in the JAX-WS samples.

Modified:
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml

Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml?rev=1088249&r1=1088248&r2=1088249&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml Sun Apr  3 
10:38:54 2011
@@ -24,7 +24,7 @@
 org.apache.axis2.examples
 jaxws-samples
 JAXWS Samples - Echo, Ping, MTOM
-1.4
+1.7.0-SNAPSHOT

svn commit: r1088251 - /axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 10:54:32 2011
New Revision: 1088251

URL: http://svn.apache.org/viewvc?rev=1088251&view=rev
Log:
jaxws-samples is meant to build a WAR, so changed the packaging type to war 
(otherwise it will build a JAR that is not deployable). Also changed the POM to 
use maven-dependency-plugin to copy the modules.

Modified:
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml

Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml?rev=1088251&r1=1088250&r2=1088251&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml Sun Apr  3 
10:54:32 2011
@@ -25,7 +25,7 @@
 jaxws-samples
 JAXWS Samples - Echo, Ping, MTOM
 1.7.0-SNAPSHOT
-
+war
 
 
 javax.servlet
@@ -112,6 +112,23 @@
 
 
 
+maven-dependency-plugin
+2.2
+
+
+copy-modules
+prepare-package
+
+copy-dependencies
+
+
+
${project.build.directory}/modules
+mar
+
+
+
+
+
 org.apache.maven.plugins
 maven-war-plugin
 2.1.1
@@ -123,8 +140,7 @@
 
 
 
-
-
${basedir}/../../repository/modules/
+
${project.build.directory}/modules/
 WEB-INF/lib
 
 addressing*.mar

svn commit: r1088268 - /axis/axis2/java/core/trunk/modules/samples/mtom/build.xml

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 12:36:27 2011
New Revision: 1088268

URL: http://svn.apache.org/viewvc?rev=1088268&view=rev
Log:
Fixed a build failure on Sun (non OSX) JDKs.

Modified:
axis/axis2/java/core/trunk/modules/samples/mtom/build.xml

Modified: axis/axis2/java/core/trunk/modules/samples/mtom/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/mtom/build.xml?rev=1088268&r1=1088267&r2=1088268&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/mtom/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/mtom/build.xml Sun Apr  3 
12:36:27 2011
@@ -86,7 +86,7 @@
 


-   
+

svn commit: r1088345 [2/2] - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/htt

2011-04-03 Thread veithen 
Propchange: 
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr  3 17:32:51 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,
 
1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,
 
1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268
 
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318

Modified: axis/axis2/java/core/branches/1_5/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/pom.xml?rev=1088345&r1=1088344&r2=1088345&view=diff
==
--- axis/axis2/java/core/branches/1_5/pom.xml (original)
+++ axis/axis2/java/core/branches/1_5/pom.xml Sun Apr  3 17:32:51 2011
@@ -95,6 +95,11 @@
 
 modules/distribution
 modules/samples/java_first_jaxws
+modules/samples/jaxws-addressbook
+modules/samples/jaxws-calculator
+modules/samples/jaxws-interop
+modules/samples/jaxws-samples
+modules/samples/jaxws-version

svn commit: r1088350 - in /axis/axis2/java/core/branches/1_6: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/samples/java_first_jaxws/ modules/samples/jaxws-addressbook/ modu

2011-04-03 Thread veithen 
Author: veithen
Date: Sun Apr  3 17:48:22 2011
New Revision: 1088350

URL: http://svn.apache.org/viewvc?rev=1088350&view=rev
Log:
Merged r1088239,1088248,1088249,1088251,1088268 to the 1.6 branch, but with 
s/1.7.0-SNAPSHOT/1.6.1-SNAPSHOT/.

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/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/modules/samples/mtom/build.xml
axis/axis2/java/core/branches/1_6/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr  3 17:48:22 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
+/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

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=1088350&r1=1088349&r2=1088350&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 Sun Apr  3 
17:48:22 2011
@@ -347,6 +347,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -365,7 +369,7 @@
 
 
${project.build.directory}/axis2-${project.version}/samples
 
-
java_first_jaxws/pom.xml
+*/pom.xml
 
 true
 

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=1088350&r1=1088349&r2=1088350&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
 Sun Apr  3 17:48:22 2011
@@ -180,6 +180,16 @@
 
 
 
+
+false
+lib/endorsed
+
+javax.xml.bind:jaxb-api:jar
+
org.apache.geronimo.specs:geronimo-saaj_1.3_spec:jar
+
org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar
+
+
+
 false
 
 org.apache.axis2:axis2-webapp

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=1088350&r1=1088349&r2=1088350&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 
Sun Apr  3 17:48:22 2011
@@ -100,7 +100,7 @@
 
 
 maven-compiler-plugin
-true
+2.3.2
 
 1.5
 1.5
@@ -110,6 +110,7 @@
 
 org.apache.maven.plugins
 maven-war-plugin
+2.1.1
 
 
${basedir}/src/webapp
 
@@ -118,6 +119,7 @@
 
 maven-jar-plugin
+2.3.1