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

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

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

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

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

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 lin

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

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

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

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-d

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

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/sampl

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

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/axi

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

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