Author: sagara
Date: Thu Jun 21 06:35:00 2012
New Revision: 1352425
URL: http://svn.apache.org/viewvc?rev=1352425&view=rev
Log:
AXIS2-5348 - Merged r1352413 to 1.5 branch.
Added:
axis/axis2/java/core/branches/1_5/modules/addressing/src/org/apache/axis2/handlers/addressing/Addressing.java
- copied unchanged from r1352423,
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/Addressing.java
Modified:
axis/axis2/java/core/branches/1_5/ (props changed)
axis/axis2/java/core/branches/1_5/modules/addressing/src/META-INF/module.xml
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/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:r1352423
Modified:
axis/axis2/java/core/branches/1_5/modules/addressing/src/META-INF/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/addressing/src/META-INF/module.xml?rev=1352425&r1=1352424&r2=1352425&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/addressing/src/META-INF/module.xml
(original)
+++
axis/axis2/java/core/branches/1_5/modules/addressing/src/META-INF/module.xml
Thu Jun 21 06:35:00 2012
@@ -17,7 +17,7 @@
~ under the License.
-->
-<module name="addressing">
+<module name="addressing"
class="org.apache.axis2.handlers.addressing.Addressing">
<Description>This is the WS-Addressing implementation on Axis2, supporting
the WS-Addressing 1.0 Recommendation, as well as the Submission version
(2004/08).</Description>
<InFlow>
<handler name="AddressingInHandler"
class="org.apache.axis2.handlers.addressing.AddressingInHandler">
@@ -50,4 +50,7 @@
</handler>
<!-- AddressingValidationHandler not present on the INfaultflow so
that we don't get faults bouncing around forever -->
</InFaultFlow>
+
+ <supported-policy-namespaces
namespaces="http://www.w3.org/2007/05/addressing/metadata"/>
+
</module>
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/distribution:r1352423
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:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/parent:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/servlet:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/pom.xml:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/src:r1352423
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/local:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:r1352423
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:r1352423
