ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r683272 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Date Wed, 06 Aug 2008 14:19:08 GMT
Author: nandana
Date: Wed Aug  6 07:19:07 2008
New Revision: 683272

URL: http://svn.apache.org/viewvc?rev=683272&view=rev
Log:
AXIS2-3907 fixing in the trunk

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=683272&r1=683271&r2=683272&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Wed Aug  6 07:19:07 2008
@@ -1291,7 +1291,7 @@
             axisOperation.setPolicyInclude(policyInclude);
         }
 
-        copyExtensibleElements(wsdl4jOperation.getExtensibilityElements(), dif,
+        copyExtensionAttributes(wsdl4jOperation.getExtensionAttributes(), 
                                axisOperation, PORT_TYPE_OPERATION);
 
         Input wsdl4jInputMessage = wsdl4jOperation.getInput();
@@ -1303,8 +1303,8 @@
                 Message message = wsdl4jInputMessage.getMessage();
                 if (null != message) {
                     inMessage.setName(message.getQName().getLocalPart());
-                    copyExtensibleElements(message.getExtensibilityElements(),
-                                           dif, inMessage, PORT_TYPE_OPERATION_INPUT);
+                    copyExtensionAttributes(wsdl4jInputMessage.getExtensionAttributes(),
+                                           inMessage, PORT_TYPE_OPERATION_INPUT);
 
                 }
                 // Check if the action is already set as we don't want to
@@ -1335,8 +1335,8 @@
                 if (null != message) {
 
                     outMessage.setName(message.getQName().getLocalPart());
-                    copyExtensibleElements(message.getExtensibilityElements(),
-                                           dif, outMessage, PORT_TYPE_OPERATION_OUTPUT);
+                    copyExtensionAttributes(wsdl4jInputMessage.getExtensionAttributes(),
+                                           outMessage, PORT_TYPE_OPERATION_OUTPUT);
 
                     // wsdl:portType -> wsdl:operation -> wsdl:output
                 }
@@ -1367,8 +1367,8 @@
                 if (null != message) {
 
                     inMessage.setName(message.getQName().getLocalPart());
-                    copyExtensibleElements(message.getExtensibilityElements(),
-                                           dif, inMessage, PORT_TYPE_OPERATION_OUTPUT);
+                    copyExtensionAttributes(wsdl4jInputMessage.getExtensionAttributes(),
+                                           inMessage, PORT_TYPE_OPERATION_OUTPUT);
 
                 }
                 // Check if the action is already set as we don't want to
@@ -1393,8 +1393,8 @@
                 if (null != message) {
 
                     outMessage.setName(message.getQName().getLocalPart());
-                    copyExtensibleElements(message.getExtensibilityElements(),
-                                           dif, outMessage, PORT_TYPE_OPERATION_INPUT);
+                    copyExtensionAttributes(wsdl4jInputMessage.getExtensionAttributes(),
+                                           outMessage, PORT_TYPE_OPERATION_INPUT);
 
                     // wsdl:portType -> wsdl:operation -> wsdl:output
                 }
@@ -2767,10 +2767,18 @@
 						ref = new PolicyReference();
 						ref.setURI(uris[i]);
 
-						if (PORT_TYPE.equals(origin)) {
-							PolicySubject subject = description
-									.getPolicySubject();
-							subject.attachPolicyReference(ref);
+						if (PORT_TYPE.equals(origin)
+						        || PORT_TYPE_OPERATION.equals(origin)
+						        || PORT_TYPE_OPERATION_INPUT.equals(origin) 
+						        || PORT_TYPE_OPERATION_OUTPUT.equals(origin)) {
+                      
+						    if (description != null) {
+						        PolicySubject subject = description.getPolicySubject();
+                             
+						        if (subject != null) {
+						            subject.attachPolicyReference(ref);
+						        }
+						    }
 						}
 					}
 				}



Mime
View raw message