svn commit: r1350570 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: addressing/ client/ description/ engine/ util/ wsdl/util/

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 11:01:15 2012
New Revision: 1350570

URL: http://svn.apache.org/viewvc?rev=1350570&view=rev
Log:
AXIS2-5315 - More code cleanups, removed another set of deprecated methods. 

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java

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

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

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

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/engine/AxisConfiguration.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java

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

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
 Fri Jun 15 11:01:15 2012
@@ -377,138 +377,7 @@ public class EndpointReference implement
 }
 
 return buffer.toString();
-}
-
-/**
- * @param eprOMElement
- * @deprecated use {@link EndpointReferenceHelper#fromOM(OMElement)} 
instead.
- */
-public void fromOM(OMElement eprOMElement) {
-OMElement addressElement = eprOMElement.getFirstChildWithName(new 
QName("Address"));
-setAddress(addressElement.getText());
-Iterator allAddrAttributes = addressElement.getAllAttributes();
-if (addressAttributes == null) {
-addressAttributes = new ArrayList();
-}
-
-while (allAddrAttributes.hasNext()) {
-OMAttribute attribute = (OMAttribute) allAddrAttributes.next();
-addressAttributes.add(attribute);
-}
-
-
-OMElement refParamElement = eprOMElement
-.getFirstChildWithName(new 
QName(AddressingConstants.EPR_REFERENCE_PARAMETERS));
-
-if (refParamElement != null) {
-Iterator refParams = refParamElement.getChildElements();
-while (refParams.hasNext()) {
-OMElement omElement = (OMElement) refParams.next();
-addReferenceParameter(omElement);
-}
-}
-
-
-OMElement metaDataElement = eprOMElement
-.getFirstChildWithName(new 
QName(AddressingConstants.Final.WSA_METADATA));
-if (metaDataElement != null) {
-Iterator children = metaDataElement.getChildren();
-while (children.hasNext()) {
-OMNode omNode = (OMNode) children.next();
-addMetaData(omNode);
-}
-}
-
-setName(eprOMElement.getLocalName());
-
-Iterator allAttributes = eprOMElement.getAllAttributes();
-if (attributes == null) {
-attributes = new ArrayList();
-}
-
-while (allAttributes.hasNext()) {
-OMAttribute attribute = (OMAttribute) allAttributes.next();
-attributes.add(attribute);
-}
-
-Iterator childElements = eprOMElement.getChildElements();
-while (childElements.hasNext()) {
-OMElement eprChildElement = (OMElement) childElements.next();
-String localName = eprChildElement.getLocalName();
-if (!localName.equals("Address") &&
-
!localName.equals(AddressingConstants.EPR_REFERENCE_PARAMETERS) &&
-!localName.equals(AddressingConstants.Final.WSA_METADATA)) 
{
-addExtensibleElement(eprChildElement);
-}
-}
-}
-
-/**
- * @param nsurl
- * @param localName
- * @param prefix
- * @throws AxisFault
- * @deprecated use {@link EndpointReferenceHelper#toOM(EndpointReference, 
QName, String)} instead.
- */
-public OMElement toOM(String nsurl, String localName, String pref

svn commit: r1350571 - in /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main: java/org/apache/rahas/TestClient.java resources/ping/src/org/apache/axis2/security/InteropScenarioClient.

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 11:03:40 2012
New Revision: 1350571

URL: http://svn.apache.org/viewvc?rev=1350571&view=rev
Log:
AXIS2-5315 - Changes according to R1350570.

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java

axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java?rev=1350571&r1=1350570&r2=1350571&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
 Fri Jun 15 11:03:40 2012
@@ -100,8 +100,8 @@ public abstract class TestClient extends
 configContext.setProperty(WSSHandlerConstants.INFLOW_SECURITY, 
clientInflowConfiguration.getProperty());
 }
 
-serviceClient.engageModule(new QName("addressing"));
-serviceClient.engageModule(new QName("rampart"));
+serviceClient.engageModule("addressing");
+serviceClient.engageModule("rampart");
 
 serviceClient.setOptions(options);
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java?rev=1350571&r1=1350570&r2=1350571&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java
 Fri Jun 15 11:03:40 2012
@@ -69,8 +69,7 @@ public class InteropScenarioClient {
 stub._getServiceClient().getOptions().setProperty(
 Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
 stub._getServiceClient().getOptions().setSoapVersionURI(soapNsURI);
-stub._getServiceClient().engageModule(
-new javax.xml.namespace.QName("rampart"));
+stub._getServiceClient().engageModule("rampart");
 
 PingResponseDocument pingResDoc = stub.ping(pingDoc);
 
@@ -101,8 +100,7 @@ public class InteropScenarioClient {
 stub._getServiceClient().getOptions().setProperty(
 Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
 // Engage the security module
-stub._getServiceClient().engageModule(
-new javax.xml.namespace.QName("rampart"));
+stub._getServiceClient().engageModule("rampart");
 
 if (outflowConfig != null) {
 stub._getServiceClient().getServiceContext().setProperty(
@@ -145,8 +143,7 @@ public class InteropScenarioClient {
 stub._getServiceClient().getOptions().setProperty(
 Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
 // Engage the security module
-stub._getServiceClient().engageModule(
-new javax.xml.namespace.QName("rampart"));
+stub._getServiceClient().engageModule("rampart");
 
 if (outflowConfig != null) {
 stub._getServiceClient().getServiceContext().setProperty(

svn commit: r1350573 - /axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 11:04:38 2012
New Revision: 1350573

URL: http://svn.apache.org/viewvc?rev=1350573&view=rev
Log:
AXIS2-5315 - Changes according to R1350570.

Modified:

axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java

Modified: 
axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java?rev=1350573&r1=1350572&r2=1350573&view=diff
==
--- 
axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
 (original)
+++ 
axis/axis2/java/sandesha/trunk/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
 Fri Jun 15 11:04:38 2012
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.Properties;
 
-import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -161,7 +160,7 @@ public class Scenario_4_1 {
 setUpOptions(serviceClient.getOptions());
 
 //engage Rampart
-serviceClient.engageModule(new QName("rampart"));
+serviceClient.engageModule("rampart");
 
Ping ping = new Ping ();
ping.setText("ping1");

svn commit: r1350578 - in /axis/axis2/java/core/trunk/modules: integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/mtom/ jaxws-mar/src/org/apache/axis2/jaxws/module/ transport/

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 11:18:46 2012
New Revision: 1350578

URL: http://svn.apache.org/viewvc?rev=1350578&view=rev
Log:
AXIS2-5315 - More code cleanups, removed another set of deprecated methods.

Modified:

axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java

axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java

axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java

axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java

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

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
 Fri Jun 15 11:18:46 2012
@@ -39,7 +39,6 @@ public class SOAPversionTest extends Loc
 ServiceClient serviceClient = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
 serviceClient.getOptions().setSoapVersionURI(
 SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-serviceClient.setCachingOperationContext(true);
 serviceClient.sendReceive(TestingUtils.createDummyOMElement());
 SOAPEnvelope result = 
serviceClient.getLastOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
 
@@ -51,8 +50,7 @@ public class SOAPversionTest extends Loc
 public void testSOAP12() throws AxisFault {
 ServiceClient serviceClient = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
 serviceClient.getOptions().setSoapVersionURI(
-   SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-serviceClient.setCachingOperationContext(true);
+   SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);   
 serviceClient.sendReceive(TestingUtils.createDummyOMElement());
 SOAPEnvelope result = 
serviceClient.getLastOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
 

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
 Fri Jun 15 11:18:46 2012
@@ -37,8 +37,7 @@ public class UsingTransportTest extends 
 
 public void testSOAPVersioning() throws Exception{
ServiceClient sender = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
-   
sender.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-   sender.setCachingOperationContext(true);
+   
sender.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
OMElement response = 
sender.sendReceive(TestingUtils.createDummyOMElement());
TestingUtils.compareWithCreatedOMElement(response);
SOAPEnvelope result =

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
 Fri Jun 15 11:18:46 2012
@@ -207,7 +207,7 @@ public class EchoRawMTOMTest extends Uti
 
TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), 
null);
 
 ServiceClient sender = new ServiceClient(configContext, null);
-sender.engageModule(new QName("addressing"));
+sender.engageModule("addressing");
 options.setAction(Constants.AXIS2_NAMESPACE_URI + "/" + 
operationName.getLocalPart());
 sender.setOptions(options);
 options.setUseSeparateListener(true);

Modified: 
axis/axis2/java/core/trunk/modu

svn commit: r1350592 - /axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 12:04:10 2012
New Revision: 1350592

URL: http://svn.apache.org/viewvc?rev=1350592&view=rev
Log:
RAMPART-375 - Improved Ant script to download xercesImpl-2.9.1.jar and set it 
as jvmarg to fulfill endorsed requirements. 

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml?rev=1350592&r1=1350591&r2=1350592&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml Fri 
Jun 15 12:04:10 2012
@@ -23,6 +23,7 @@



+



@@ -124,6 +125,12 @@
 
 
 
+
+   
+http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar";
+ dest="${endorsed.dir}/xercesImpl-2.9.1.jar" verbose="true"/>
+
+
 


@@ -178,6 +185,7 @@
 
 
 
+
 
 
   
@@ -233,6 +241,7 @@
 
 
 
+

svn commit: r1350593 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-samples/policy/build.xml

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 12:09:32 2012
New Revision: 1350593

URL: http://svn.apache.org/viewvc?rev=1350593&view=rev
Log:
RAMPART-375 - Merged r1350592 to 1.6 branch. 

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml

Propchange: axis/axis2/java/rampart/branches/1_6/
--
  Merged /axis/axis2/java/rampart/trunk:r1350592

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1350593&r1=1350592&r2=1350593&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml 
(original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml 
Fri Jun 15 12:09:32 2012
@@ -23,6 +23,7 @@



+



@@ -124,6 +125,12 @@
 
 
 
+
+   
+http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar";
+ dest="${endorsed.dir}/xercesImpl-2.9.1.jar" verbose="true"/>
+
+
 


@@ -178,6 +185,7 @@
 
 
 
+
 
 
   
@@ -233,6 +241,7 @@
 
 
 
+

svn commit: r1350594 - in /axis/axis2/java/rampart/branches/1_5: ./ modules/rampart-samples/policy/build.xml

2012-06-15 Thread sagara 
Author: sagara
Date: Fri Jun 15 12:11:02 2012
New Revision: 1350594

URL: http://svn.apache.org/viewvc?rev=1350594&view=rev
Log:
RAMPART-375 - Merged r1350592 to 1.5 branch.

Modified:
axis/axis2/java/rampart/branches/1_5/   (props changed)

axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/build.xml

Propchange: axis/axis2/java/rampart/branches/1_5/
--
svn:mergeinfo = /axis/axis2/java/rampart/trunk:1350592

Modified: 
axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/build.xml?rev=1350594&r1=1350593&r2=1350594&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/build.xml 
(original)
+++ 
axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/build.xml 
Fri Jun 15 12:11:02 2012
@@ -23,6 +23,7 @@



+



@@ -119,6 +120,12 @@
 
 
 
+
+   
+http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar";
+ dest="${endorsed.dir}/xercesImpl-2.9.1.jar" verbose="true"/>
+
+
 


@@ -174,6 +181,7 @@
 
 
 
+
 
 
   
@@ -230,6 +238,7 @@
 
 
 
+