svn commit: r1220888 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: description/WSDL11ToAxisServiceBuilder.java namespace/Constants.java wsdl/WSDLConstants.java

[ruchithf]

Author: ruchithf
Date: Mon Dec 19 18:39:05 2011
New Revision: 1220888

URL: http://svn.apache.org/viewvc?rev=1220888&view=rev
Log:
WS-Policy 1.5 namespace URI added. Without this codegen fails with wsdl with 
WS-Policy v1.5


Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 Mon Dec 19 18:39:05 2011
@@ -3114,7 +3114,8 @@ public class WSDL11ToAxisServiceBuilder 
 
             if (extElement instanceof UnknownExtensibilityElement) {
                 unknown = (UnknownExtensibilityElement) extElement;
-                if 
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())) {
+                if 
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())
+                               || 
WSDLConstants.WSDL11Constants.POLICY_15.equals(unknown.getElementType())) {
 
                     policy = (Policy) 
PolicyUtil.getPolicyComponent(unknown.getElement());
                     String key;

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 Mon Dec 19 18:39:05 2011
@@ -112,6 +112,9 @@ public class Constants {
 
     public static final String URI_POLICY =
             "http://schemas.xmlsoap.org/ws/2004/09/policy";;
+    public static final String URI_POLICY_15 =
+        "http://www.w3.org/ns/ws-policy";;
+
     public static final String FORMAT_BINDING = 
"http://schemas.xmlsoap.org/wsdl/formatbinding/";;
     public static final String JAVA_NS = 
"http://schemas.xmlsoap.org/wsdl/java/";;
     /**

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 Mon Dec 19 18:39:05 2011
@@ -128,6 +128,8 @@ public interface WSDLConstants {
                 Constants.URI_WSDL12_SOAP, "binding");
         QName POLICY = new QName(
                 Constants.URI_POLICY, "Policy");
+        QName POLICY_15 = new QName(
+                Constants.URI_POLICY_15, "Policy");
         QName POLICY_REFERENCE = new QName(
                 Constants.URI_POLICY, "PolicyReference");
     }