svn commit: r1352812 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: context/ description/ util/

2012-06-22 Thread sagara 
Author: sagara
Date: Fri Jun 22 09:04:38 2012
New Revision: 1352812

URL: http://svn.apache.org/viewvc?rev=1352812&view=rev
Log:
AXIS2-5334 - Removed some deprecated method on PolicyInclude.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisMessage.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1352812&r1=1352811&r2=1352812&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 Fri Jun 22 09:04:38 2012
@@ -76,6 +76,7 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -1627,7 +1628,7 @@ public class MessageContext extends Abst
return axisMessage.getEffectivePolicy();
 } else {
 if (axisService != null){
-List policyList = new 
ArrayList();
+Collection policyList = new 
ArrayList();
 
policyList.addAll(axisService.getPolicySubject().getAttachedPolicyComponents());
 AxisConfiguration axisConfiguration = 
axisService.getAxisConfiguration();
 
policyList.addAll(axisConfiguration.getPolicySubject().getAttachedPolicyComponents());

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?rev=1352812&r1=1352811&r2=1352812&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
 Fri Jun 22 09:04:38 2012
@@ -20,6 +20,7 @@
 package org.apache.axis2.description;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -242,7 +243,7 @@ public class AxisBinding extends AxisDes
 }
 
 public Policy getEffectivePolicy() {
-ArrayList policyList = new 
ArrayList();
+Collection policyList = new 
ArrayList();
 policyList.addAll(getPolicySubject().getAttachedPolicyComponents());
  
 // AxisEndpoint

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?rev=1352812&r1=1352811&r2=1352812&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
 Fri Jun 22 09:04:38 2012
@@ -30,8 +30,10 @@ import org.apache.axis2.util.WSDL20Util;
 import org.apache.axis2.util.WSDLSerializationUtil;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyComponent;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -232,7 +234,7 @@ public class AxisBindingMessage extends 
 
public Policy calculateEffectivePolicy() {
PolicySubject policySubject = null;
-   ArrayList policyList = new ArrayList();
+   Collection policyList = new 
ArrayList();
 
// AxisBindingMessage
policySubject = getPolicySubject();

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
UR

svn commit: r1352814 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java

2012-06-22 Thread sagara 
Author: sagara
Date: Fri Jun 22 09:07:19 2012
New Revision: 1352814

URL: http://svn.apache.org/viewvc?rev=1352814&view=rev
Log:
AXIS2-5334 - required changes for r1352812.

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1352814&r1=1352813&r2=1352814&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 Fri Jun 22 09:07:19 2012
@@ -58,6 +58,7 @@ import org.apache.ws.security.util.WSSec
 import org.w3c.dom.Document;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 public class RampartMessageData {
@@ -237,7 +238,7 @@ public class RampartMessageData {
 } catch (NullPointerException e) {
 //TODO remove this once AXIS2-4114 is fixed
 if (axisService != null) {
-List policyList = new 
ArrayList();
+Collection policyList = new 
ArrayList();
 
policyList.addAll(axisService.getPolicySubject().getAttachedPolicyComponents());
 AxisConfiguration axisConfiguration = 
axisService.getAxisConfiguration();
 
policyList.addAll(axisConfiguration.getPolicySubject().getAttachedPolicyComponents());

svn commit: r1352843 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/description/ transport/http/src/org/apache/axis2/transport/http/

2012-06-22 Thread sagara 
Author: sagara
Date: Fri Jun 22 11:02:40 2012
New Revision: 1352843

URL: http://svn.apache.org/viewvc?rev=1352843&view=rev
Log:
* Axis2 should not use Woden internal classes. 
 * Further clean up on policy usage. 

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=1352843&r1=1352842&r2=1352843&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
 Fri Jun 22 11:02:40 2012
@@ -25,20 +25,18 @@ import org.apache.axiom.soap.SOAP12Const
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.namespace.Constants;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.*;
+import org.apache.axis2.wsdl.HTTPHeaderMessage;
+import org.apache.axis2.wsdl.SOAPHeaderMessage;
+import org.apache.axis2.wsdl.SOAPModuleMessage;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.WSDLUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.woden.WSDLException;
+import org.apache.woden.WSDLFactory;
 import org.apache.woden.WSDLReader;
 import org.apache.woden.WSDLSource;
 import org.apache.woden.XMLElement;
-import org.apache.woden.internal.DOMWSDLFactory;
-import org.apache.woden.internal.wsdl20.BindingFaultImpl;
-import org.apache.woden.internal.wsdl20.BindingOperationImpl;
-import 
org.apache.woden.internal.wsdl20.extensions.InterfaceOperationExtensionsImpl;
-import 
org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPHeaderImpl;
-import 
org.apache.woden.internal.wsdl20.extensions.soap.SOAPBindingExtensionsImpl;
 import org.apache.woden.resolver.URIResolver;
 import org.apache.woden.schema.Schema;
 import org.apache.woden.types.NamespaceDeclaration;
@@ -58,11 +56,14 @@ import org.apache.woden.wsdl20.Interface
 import org.apache.woden.wsdl20.InterfaceOperation;
 import org.apache.woden.wsdl20.Service;
 import org.apache.woden.wsdl20.enumeration.MessageLabel;
+import org.apache.woden.wsdl20.extensions.InterfaceOperationExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions;
 import org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions;
 import 
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions;
 import org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions;
 import org.apache.woden.wsdl20.extensions.http.HTTPEndpointExtensions;
 import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
+import org.apache.woden.wsdl20.extensions.http.HTTPHeaderElement;
 import org.apache.woden.wsdl20.extensions.http.HTTPLocation;
 import org.apache.woden.wsdl20.extensions.rpc.Argument;
 import org.apache.woden.wsdl20.extensions.rpc.RPCInterfaceOperationExtensions;
@@ -74,6 +75,8 @@ import org.apache.woden.wsdl20.extension
 import org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions;
 import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
 import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+import org.apache.woden.wsdl20.xml.BindingFaultElement;
+import org.apache.woden.wsdl20.xml.BindingOperationElement;
 import org.apache.woden.wsdl20.xml.DescriptionElement;
 import org.apache.woden.wsdl20.xml.DocumentableElement;
 import org.apache.woden.wsdl20.xml.DocumentationElement;
@@ -118,7 +121,7 @@ public class WSDL20ToAxisServiceBuilder 
 
 private NamespaceDeclaration[] namespacemap;
 
-private List operationNames = new ArrayList();
+private List operationNames = new ArrayList();
 
 private NamespaceMap stringBasedNamespaceMap;
 
@@ -351,7 +354,7 @@ public class WSDL20ToAxisServiceBuilder 
 if 
(WSDL2Constants.URI_WSDL2_SOAP.equals(binding.getType().toString())) {
 SOAPBindingExtensions soapBindingExtensions;
 try {
-soapBindingExtensions = (SOAPBindingExtensionsImpl) 
binding
+soapBindingExtensions = (SOAPBindingExtensions) binding
 .getComponentExtensionContext(
 new 
URI(WSDL2Constants.URI_WSDL2_SOAP));
 } catch (URISynta