svn commit: r1331978 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java modules/saaj/
Author: veithen Date: Sun Apr 29 19:14:12 2012 New Revision: 1331978 URL: http://svn.apache.org/viewvc?rev=1331978&view=rev Log: Merged r1331616 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed) Propchange: axis/axis2/java/core/branches/1_6/ -- Merged /axis/axis2/java/core/trunk:r1331616 Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1331978&r1=1331977&r2=1331978&view=diff == --- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original) +++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Sun Apr 29 19:14:12 2012 @@ -570,13 +570,13 @@ public class MessageContextBuilder { log.debug("prefix = "+prefix); } String uri = faultCodeQName.getNamespaceURI(); -// Get the specified prefix and uri -prefix = prefix == null ? "" : prefix; +// Get the specified uri uri = uri == null || "" .equals(uri) ? fault.getNamespace().getNamespaceURI() : uri; // Make sure the prefix and uri are declared on the fault, and -// get the resulting prefix. -prefix = fault.declareNamespace(uri, prefix).getPrefix(); +// get the resulting prefix. If no prefix is defined, let declareNamespace +// generate one. +prefix = fault.declareNamespace(uri, prefix.length() == 0 ? null : prefix).getPrefix(); soapFaultCode = prefix + ":" + faultCodeQName.getLocalPart(); if(log.isDebugEnabled()){ log.debug("Altered soapFaultCode ="+soapFaultCode); Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ -- Merged /axis/axis2/java/core/trunk/modules/saaj:r1331616
svn commit: r1331986 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/src/org/apache/axis2/util/ modules/kernel
Author: veithen Date: Sun Apr 29 20:13:24 2012 New Revision: 1331986 URL: http://svn.apache.org/viewvc?rev=1331986&view=rev Log: Merged r1331616 to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/1_5/ -- Merged /axis/axis2/java/core/trunk:r1331616 Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/ -- Merged /axis/axis2/java/core/trunk/modules/distribution:r1331616 Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- Merged /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1331616 Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1331986&r1=1331985&r2=1331986&view=diff == --- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original) +++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Sun Apr 29 20:13:24 2012 @@ -482,13 +482,13 @@ public class MessageContextBuilder { if (faultCodeQName.getLocalPart().indexOf(":") == -1) { String prefix = faultCodeQName.getPrefix(); String uri = faultCodeQName.getNamespaceURI(); -// Get the specified prefix and uri -prefix = prefix == null ? "" : prefix; +// Get the specified uri uri = uri == null || "" .equals(uri) ? fault.getNamespace().getNamespaceURI() : uri; // Make sure the prefix and uri are declared on the fault, and -// get the resulting prefix. -prefix = fault.declareNamespace(uri, prefix).getPrefix(); +// get the resulting prefix. If no prefix is defined, let declareNamespace +// generate one. +prefix = fault.declareNamespace(uri, prefix.length() == 0 ? null : prefix).getPrefix(); soapFaultCode = prefix + ":" + faultCodeQName.getLocalPart(); } else { soapFaultCode = faultCodeQName.getLocalPart(); Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util
svn commit: r1332064 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/ramp
Author: sagara Date: Mon Apr 30 06:15:29 2012 New Revision: 1332064 URL: http://svn.apache.org/viewvc?rev=1332064&view=rev Log: Rollback SCM changes due to Sandesha2 1.6.2 release vote failure. Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml axis/axis2/java/sandesha/branches/1_6/pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml Mon Apr 30 06:15:29 2012 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml Mon Apr 30 06:15:29 2012 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml Mon Apr 30 06:15:29 2012 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml Mon Apr 30 06:15:29 2012 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml Mon Apr 30 06:15:29 2012 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml Mon Apr 30 06:15:29 2012 @@ -22,7 +22,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.3-SNAPSHOT +1.6.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml?rev=1332064&r1=1332063&r2=1332064&view=diff
svn commit: r1332065 - /axis/axis2/java/sandesha/tags/v1.6.2/
Author: sagara Date: Mon Apr 30 06:16:29 2012 New Revision: 1332065 URL: http://svn.apache.org/viewvc?rev=1332065&view=rev Log: Rollback SCM changes due to Sandesha2 1.6.2 release vote failure. Removed: axis/axis2/java/sandesha/tags/v1.6.2/
svn commit: r1332067 - /axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml
Author: sagara Date: Mon Apr 30 06:28:38 2012 New Revision: 1332067 URL: http://svn.apache.org/viewvc?rev=1332067&view=rev Log: Fixed SANDESHA2-212. Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml?rev=1332067&r1=1332066&r2=1332067&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/src.xml Mon Apr 30 06:28:38 2012 @@ -31,7 +31,7 @@ config/**/* modules/**/* -xdocs/**/* +src/**/* **/pom.xml
svn commit: r1332068 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/distribution/src/main/assembly/src.xml
Author: sagara Date: Mon Apr 30 06:31:08 2012 New Revision: 1332068 URL: http://svn.apache.org/viewvc?rev=1332068&view=rev Log: Merged r1332067 to the 1.6 branch. Modified: axis/axis2/java/sandesha/branches/1_6/ (props changed) axis/axis2/java/sandesha/branches/1_6/modules/distribution/src/main/assembly/src.xml Propchange: axis/axis2/java/sandesha/branches/1_6/ -- Merged /axis/axis2/java/sandesha/trunk:r1332067 Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/src/main/assembly/src.xml?rev=1332068&r1=1332067&r2=1332068&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/distribution/src/main/assembly/src.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/src/main/assembly/src.xml Mon Apr 30 06:31:08 2012 @@ -31,7 +31,7 @@ config/**/* modules/**/* -xdocs/**/* +src/**/* **/pom.xml
svn commit: r1332073 - /axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm
Author: sagara Date: Mon Apr 30 06:35:23 2012 New Revision: 1332073 URL: http://svn.apache.org/viewvc?rev=1332073&view=rev Log: Updated site for 1.6.2 release. Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm?rev=1332073&r1=1332072&r2=1332073&view=diff == --- axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm (original) +++ axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm Mon Apr 30 06:35:23 2012 @@ -36,7 +36,7 @@ the binary distribution and the source d Description Compatible Axis2 version - 1.6.2Release + 1.6.2Release Source Distribution zip | http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-src.zip.md5";>MD5 | @@ -47,7 +47,7 @@ the binary distribution and the source d http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-bin.zip.md5";>MD5 | http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-bin.zip.asc";>PGP -26 - Apr - 2012 +30 - Apr - 2012 1.6.2 Release (Mirrored) 1.6.2
svn commit: r1332074 - in /axis/axis2/java/sandesha/branches/1_6: ./ src/site/xdoc/download.xml.vm
Author: sagara Date: Mon Apr 30 06:36:50 2012 New Revision: 1332074 URL: http://svn.apache.org/viewvc?rev=1332074&view=rev Log: Merged r1332073 to the 1.6 branch. Modified: axis/axis2/java/sandesha/branches/1_6/ (props changed) axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm Propchange: axis/axis2/java/sandesha/branches/1_6/ -- Merged /axis/axis2/java/sandesha/trunk:r1332073 Modified: axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm?rev=1332074&r1=1332073&r2=1332074&view=diff == --- axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm (original) +++ axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm Mon Apr 30 06:36:50 2012 @@ -36,7 +36,7 @@ the binary distribution and the source d Description Compatible Axis2 version - 1.6.2Release + 1.6.2Release Source Distribution zip | http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-src.zip.md5";>MD5 | @@ -47,7 +47,7 @@ the binary distribution and the source d http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-bin.zip.md5";>MD5 | http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.2/sandesha2-1.6.2-bin.zip.asc";>PGP -26 - Apr - 2012 +30 - Apr - 2012 1.6.2 Release (Mirrored) 1.6.2