You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/07/26 13:18:43 UTC
svn commit: r425704 - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/reader/
addressing/src/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/rpc/receivers/
core/src/org/apache/axis2/context/ core/...
Author: chinthaka
Date: Wed Jul 26 04:18:39 2006
New Revision: 425704
URL: http://svn.apache.org/viewvc?rev=425704&view=rev
Log:
- Fixing the build break.
- Using the new getNamespaceURI method instead of the deprecated getName() method of OMNamespace
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPComparator.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/RequestCounterMessageReceiver.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Wed Jul 26 04:18:39 2006
@@ -752,7 +752,7 @@
OMNamespace namespace = OMAttrib.getNamespace();
if (namespace != null) {
addToNsMap(namespace.getPrefix(),
- namespace.getName());
+ namespace.getNamespaceURI());
}
} else if (attribName instanceof OMAttribKey) {
//this is definitely the OMAttribute case
@@ -760,7 +760,7 @@
OMNamespace namespace = OMAttrib.getNamespace();
if (namespace != null) {
addToNsMap(namespace.getPrefix(),
- namespace.getName());
+ namespace.getNamespaceURI());
}
} else if (attribName instanceof String) {
//ignore this case - Nothing to do
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Wed Jul 26 04:18:39 2006
@@ -406,7 +406,7 @@
* @return false - if one can add new headers, true - if one should not touch them.
*/
private boolean isAddressingHeaderAlreadyAvailable(String name, SOAPEnvelope envelope, OMNamespace addressingNamespaceObject, boolean replaceHeaders) {
- OMElement addressingHeader = envelope.getHeader().getFirstChildWithName(new QName(addressingNamespaceObject.getName(), name, addressingNamespaceObject.getPrefix()));
+ OMElement addressingHeader = envelope.getHeader().getFirstChildWithName(new QName(addressingNamespaceObject.getNamespaceURI(), name, addressingNamespaceObject.getPrefix()));
if (addressingHeader != null && replaceHeaders) {
addressingHeader.detach();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java Wed Jul 26 04:18:39 2006
@@ -69,10 +69,10 @@
messageNameSpace = elementQName.getNamespaceURI();
OMNamespace namespace = methodElement.getNamespace();
if (messageNameSpace != null) {
- if (namespace == null || !messageNameSpace.equals(namespace.getName())) {
+ if (namespace == null || !messageNameSpace.equals(namespace.getNamespaceURI())) {
throw new AxisFault("namespace mismatch require " +
messageNameSpace +
- " found " + methodElement.getNamespace().getName());
+ " found " + methodElement.getNamespace().getNamespaceURI());
}
} else if (namespace != null) {
throw new AxisFault("namespace mismatch. Axis Oepration expects non-namespace " +
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java Wed Jul 26 04:18:39 2006
@@ -98,10 +98,10 @@
messageNameSpace = elementQName.getNamespaceURI();
OMNamespace namespace = methodElement.getNamespace();
if (messageNameSpace != null) {
- if (namespace == null || !messageNameSpace.equals(namespace.getName())) {
+ if (namespace == null || !messageNameSpace.equals(namespace.getNamespaceURI())) {
throw new AxisFault("namespace mismatch require " +
messageNameSpace +
- " found " + methodElement.getNamespace().getName());
+ " found " + methodElement.getNamespace().getNamespaceURI());
}
} else if (namespace != null) {
throw new AxisFault("namespace mismatch. Axis Oepration expects non-namespace " +
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Wed Jul 26 04:18:39 2006
@@ -102,10 +102,10 @@
messageNameSpace = elementQName.getNamespaceURI();
OMNamespace namespace = methodElement.getNamespace();
if (messageNameSpace != null) {
- if (namespace == null || !messageNameSpace.equals(namespace.getName())) {
+ if (namespace == null || !messageNameSpace.equals(namespace.getNamespaceURI())) {
throw new AxisFault("namespace mismatch require " +
messageNameSpace +
- " found " + methodElement.getNamespace().getName());
+ " found " + methodElement.getNamespace().getNamespaceURI());
}
} else if (namespace != null) {
throw new AxisFault("namespace mismatch. Axis Oepration expects non-namespace " +
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java Wed Jul 26 04:18:39 2006
@@ -50,7 +50,7 @@
method.getName() + "Response", ns);
OMElement resWrapper;
if (qualified) {
- resWrapper = fac.createOMElement(RETURN_WRAPPER, ns.getName(),
+ resWrapper = fac.createOMElement(RETURN_WRAPPER, ns.getNamespaceURI(),
ns.getPrefix());
} else {
resWrapper = fac.createOMElement(RETURN_WRAPPER, null);
@@ -74,7 +74,7 @@
// Java Beans
QName returnWrapper;
if (qualified) {
- returnWrapper = new QName(ns.getName(), RETURN_WRAPPER, ns.getPrefix());
+ returnWrapper = new QName(ns.getNamespaceURI(), RETURN_WRAPPER, ns.getPrefix());
} else {
returnWrapper = new QName(RETURN_WRAPPER);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Wed Jul 26 04:18:39 2006
@@ -25,7 +25,15 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -678,7 +686,7 @@
public void setEnvelope(SOAPEnvelope envelope) throws AxisFault {
this.envelope = envelope;
- String soapNamespaceURI = envelope.getNamespace().getName();
+ String soapNamespaceURI = envelope.getNamespace().getNamespaceURI();
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI
.equals(soapNamespaceURI)) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Wed Jul 26 04:18:39 2006
@@ -21,10 +21,22 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.*;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.deployment.DeploymentEngine;
+import org.apache.axis2.deployment.DeploymentErrorMsgs;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.DescriptionBuilder;
+import org.apache.axis2.deployment.ModuleBuilder;
+import org.apache.axis2.deployment.ServiceBuilder;
+import org.apache.axis2.deployment.ServiceGroupBuilder;
import org.apache.axis2.deployment.resolver.AARBasedWSDLLocator;
import org.apache.axis2.deployment.resolver.AARFileBasedURIResolver;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDL20ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDLToAxisServiceBuilder;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.namespace.Constants;
@@ -34,7 +46,13 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.zip.ZipEntry;
@@ -228,12 +246,12 @@
OMNamespace documentElementNS = new StAXOMBuilder(in).getDocumentElement().getNamespace();
if (documentElementNS != null) {
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
- if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName())) {
+ if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())) {
// we have a WSDL 2.0 document here.
wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(new FileInputStream(file1), null, null);
} else if (Constants.NS_URI_WSDL11.
- equals(documentElementNS.getName())) {
+ equals(documentElementNS.getNamespaceURI())) {
wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(new FileInputStream(file1), null, null);
} else {
new DeploymentException(Messages.getMessage("invalidWSDLFound"));
@@ -286,12 +304,12 @@
OMNamespace documentElementNS = new StAXOMBuilder(in).getDocumentElement().getNamespace();
if (documentElementNS != null) {
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
- if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName())) {
+ if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())) {
// we have a WSDL 2.0 document here.
wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);
wsdlToAxisServiceBuilder.setBaseUri(entryName);
} else if (Constants.NS_URI_WSDL11.
- equals(documentElementNS.getName())) {
+ equals(documentElementNS.getNamespaceURI())) {
wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);
} else {
new DeploymentException(Messages.getMessage("invalidWSDLFound"));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Wed Jul 26 04:18:39 2006
@@ -355,7 +355,7 @@
SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(
responseMessageContext, msgctx.getEnvelope().getNamespace()
- .getName());
+ .getNamespaceURI());
if (resenvelope != null) {
responseMessageContext.setEnvelope(resenvelope);
engine = new AxisEngine(msgctx.getConfigurationContext());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Wed Jul 26 04:18:39 2006
@@ -81,7 +81,7 @@
if (inStream != null) {
envelope = TransportUtils.createSOAPMessage(
responseMessageContext, msgctx.getEnvelope().getNamespace()
- .getName());
+ .getNamespaceURI());
}
}
if (envelope != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Wed Jul 26 04:18:39 2006
@@ -35,9 +35,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.AddressingConstants.Final;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.addressing.AddressingConstants.Final;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
@@ -52,8 +52,6 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -694,7 +692,7 @@
}
private String getSenderFaultCode(OMNamespace soapNamespace) {
- return SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespace.getName())
+ return SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespace.getNamespaceURI())
? SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":"
+ SOAP12Constants.FAULT_CODE_SENDER
: SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":"
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Wed Jul 26 04:18:39 2006
@@ -74,7 +74,7 @@
OMNamespace ns = bodyFirstChild.getNamespace();
if (ns != null) {
- String filePart = ns.getName();
+ String filePart = ns.getNamespaceURI();
log.debug(
"Checking for Service using SOAP message body's first child's namespace : "
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Wed Jul 26 04:18:39 2006
@@ -80,7 +80,7 @@
}
public SOAPFactory getSOAPFactory(MessageContext msgContext) throws AxisFault {
- String nsURI = msgContext.getEnvelope().getNamespace().getName();
+ String nsURI = msgContext.getEnvelope().getNamespace().getNamespaceURI();
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
return OMAbstractFactory.getSOAP12Factory();
} else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Wed Jul 26 04:18:39 2006
@@ -23,7 +23,11 @@
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.*;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
@@ -263,7 +267,7 @@
String faultCode;
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- envelope.getNamespace().getName())) {
+ envelope.getNamespace().getNamespaceURI())) {
faultCode = SOAP12Constants.FAULT_CODE_SENDER;
} else {
faultCode = SOAP11Constants.FAULT_CODE_SENDER;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Wed Jul 26 04:18:39 2006
@@ -18,8 +18,8 @@
package org.apache.axis2.transport.jms;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.impl.builder.StAXBuilder;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -45,7 +45,6 @@
import javax.jms.TextMessage;
import javax.xml.namespace.QName;
import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
@@ -138,7 +137,7 @@
String faultCode;
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- envelope.getNamespace().getName())) {
+ envelope.getNamespace().getNamespaceURI())) {
faultCode = SOAP12Constants.FAULT_CODE_SENDER;
} else {
faultCode = SOAP11Constants.FAULT_CODE_SENDER;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java Wed Jul 26 04:18:39 2006
@@ -45,8 +45,8 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
-import java.util.StringTokenizer;
import java.util.List;
+import java.util.StringTokenizer;
public class JMSUtils {
@@ -359,7 +359,7 @@
if (envelope.getNamespace() != null &&
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.
- equals(envelope.getNamespace().getName())) {
+ equals(envelope.getNamespace().getNamespaceURI())) {
faultCode = SOAP12Constants.FAULT_CODE_SENDER;
} else {
faultCode = SOAP11Constants.FAULT_CODE_SENDER;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java Wed Jul 26 04:18:39 2006
@@ -126,7 +126,7 @@
if (elt != null) {
OMNamespace namespace = elt.getNamespace();
if (namespace != null) {
- return ignorableNamespaceList.contains(namespace.getName());
+ return ignorableNamespaceList.contains(namespace.getNamespaceURI());
} else {
return false;
}
@@ -225,7 +225,7 @@
} else if (one == null && two != null) {
return false;
}
- if (!one.getName().equals(two.getName())) {
+ if (!one.getNamespaceURI().equals(two.getNamespaceURI())) {
return false;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPComparator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPComparator.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPComparator.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPComparator.java Wed Jul 26 04:18:39 2006
@@ -30,7 +30,7 @@
public boolean compare(SOAPEnvelope expectedEnvelope, SOAPEnvelope ReplyEnvelope) throws XMLComparisonException {
- if (expectedEnvelope.getNamespace().getName().equals(ReplyEnvelope.getNamespace().getName())) {
+ if (expectedEnvelope.getNamespace().getNamespaceURI().equals(ReplyEnvelope.getNamespace().getNamespaceURI())) {
//a!=null && b==null
if ((expectedEnvelope.getHeader() != null && ReplyEnvelope.getHeader() != null) ||
(expectedEnvelope.getHeader() == null && ReplyEnvelope.getHeader() == null)) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java Wed Jul 26 04:18:39 2006
@@ -16,7 +16,6 @@
package org.apache.axis2.engine;
-import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
@@ -29,7 +28,6 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -41,6 +39,7 @@
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
@@ -91,7 +90,7 @@
SOAPEnvelope result = opClinet.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
assertEquals("SOAP Version received is not compatible",
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- result.getNamespace().getName());
+ result.getNamespace().getNamespaceURI());
}
public void testSOAP12() throws AxisFault {
@@ -113,7 +112,7 @@
SOAPEnvelope result = opClinet.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
assertEquals("SOAP Version received is not compatible",
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- result.getNamespace().getName());
+ result.getNamespace().getNamespaceURI());
}
private MessageContext prepareTheSOAPEnvelope(OMElement toSend, Options options) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/RequestCounterMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/RequestCounterMessageReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/RequestCounterMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/RequestCounterMessageReceiver.java Wed Jul 26 04:18:39 2006
@@ -38,7 +38,7 @@
SOAPFactory factory;
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(inMessage.getEnvelope().getNamespace().getName())) {
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(inMessage.getEnvelope().getNamespace().getNamespaceURI())) {
factory = OMAbstractFactory.getSOAP12Factory();
} else {
factory = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java Wed Jul 26 04:18:39 2006
@@ -25,12 +25,12 @@
public class EchoService {
public OMElement mtomSample(OMElement element) throws Exception {
if (element.getLocalName().equalsIgnoreCase("Data")
- && element.getNamespace().getName().equalsIgnoreCase(
+ && element.getNamespace().getNamespaceURI().equalsIgnoreCase(
"http://example.org/mtom/data")) {
OMText binaryNode = (OMText)element.getFirstOMChild();
binaryNode.setOptimize(!binaryNode.isOptimized());
}
- else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getName().equalsIgnoreCase("http://example.org/mtom/data")) {
+ else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getNamespaceURI().equalsIgnoreCase("http://example.org/mtom/data")) {
Iterator childrenIterator = element.getChildren();
while (childrenIterator.hasNext()) {
OMElement dataElement = (OMElement) childrenIterator.next();
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java Wed Jul 26 04:18:39 2006
@@ -247,7 +247,7 @@
* @throws TrustException
*/
public static String findKeyType(OMElement rst) throws TrustException {
- OMElement keyTypeElem = rst.getFirstChildWithName(new QName(rst.getNamespace().getName(), RahasConstants.KEY_TYPE_LN));
+ OMElement keyTypeElem = rst.getFirstChildWithName(new QName(rst.getNamespace().getNamespaceURI(), RahasConstants.KEY_TYPE_LN));
if(keyTypeElem != null) {
String text = keyTypeElem.getText();
if(text != null && !"".equals(text.trim())) {
@@ -264,7 +264,7 @@
* @throws TrustException
*/
public static int findKeySize(OMElement rst) throws TrustException {
- OMElement keySizeElem = rst.getFirstChildWithName(new QName(rst.getNamespace().getName(), RahasConstants.KEY_SIZE_LN));
+ OMElement keySizeElem = rst.getFirstChildWithName(new QName(rst.getNamespace().getNamespaceURI(), RahasConstants.KEY_SIZE_LN));
if(keySizeElem != null) {
String text = keySizeElem.getText();
if(text != null && !"".equals(text.trim())) {
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java Wed Jul 26 04:18:39 2006
@@ -50,7 +50,6 @@
import org.w3c.dom.Node;
import javax.xml.namespace.QName;
-
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
@@ -149,7 +148,7 @@
DocumentBuilderFactoryImpl.setDOOMRequired(true);
SOAPEnvelope env = TrustUtil.createSOAPEnvelope(inMsgCtx.getEnvelope()
- .getNamespace().getName());
+ .getNamespace().getNamespaceURI());
Crypto crypto = CryptoFactory.getInstance(config.cryptoPropFile,
inMsgCtx.getAxisService().getClassLoader());
@@ -202,7 +201,7 @@
OMElement rstrElem = null;
- int version = TrustUtil.getWSTVersion(request.getNamespace().getName());
+ int version = TrustUtil.getWSTVersion(request.getNamespace().getNamespaceURI());
if(RahasConstants.VERSION_05_02 == version) {
rstrElem = TrustUtil
@@ -443,7 +442,7 @@
*/
public String getResponseAction(OMElement request, MessageContext inMsgCtx)
throws TrustException {
- if(RahasConstants.WST_NS_05_02.equals(request.getNamespace().getName())) {
+ if(RahasConstants.WST_NS_05_02.equals(request.getNamespace().getNamespaceURI())) {
return RahasConstants.V_05_02.RSTR_ACTON_ISSUE;
} else {
return RahasConstants.V_05_12.RSTR_ACTON_ISSUE;
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java Wed Jul 26 04:18:39 2006
@@ -128,7 +128,7 @@
}
//Get WST Version
- int wstVersion = TrustUtil.getWSTVersion(request.getNamespace().getName());
+ int wstVersion = TrustUtil.getWSTVersion(request.getNamespace().getNamespaceURI());
parseEntropyInfo(inMsgCtx.getEnvelope(), config);
@@ -172,7 +172,7 @@
private SOAPEnvelope doBinarySecret(SCTIssuerConfig config, MessageContext msgCtx, int wstVersion) throws TrustException {
SOAPEnvelope env = TrustUtil.createSOAPEnvelope(msgCtx.getEnvelope()
- .getNamespace().getName());
+ .getNamespace().getNamespaceURI());
//Get the document
Document doc = ((Element)env).getOwnerDocument();
@@ -223,7 +223,7 @@
MessageContext msgCtx, X509Certificate cert, int wstVersion) throws TrustException {
SOAPEnvelope env = TrustUtil.createSOAPEnvelope(msgCtx.getEnvelope()
- .getNamespace().getName());
+ .getNamespace().getNamespaceURI());
//Get the document
Document doc = ((Element)env).getOwnerDocument();
@@ -293,7 +293,7 @@
}
public String getResponseAction(OMElement request, MessageContext inMsgCtx) throws TrustException {
- if(RahasConstants.WST_NS_05_02.equals(request.getNamespace().getName())) {
+ if(RahasConstants.WST_NS_05_02.equals(request.getNamespace().getNamespaceURI())) {
return RahasConstants.V_05_02.RSTR_ACTON_SCT;
} else {
return RahasConstants.V_05_12.RSTR_ACTON_SCT;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java Wed Jul 26 04:18:39 2006
@@ -17,12 +17,12 @@
package org.apache.axis2.saaj.util;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -47,7 +47,7 @@
//Check the namespace and find SOAP version and factory
String nsURI;
SOAPFactory factory;
- if (env.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ if (env.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
nsURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
factory = DOOMAbstractFactory.getSOAP11Factory();
} else {
@@ -76,7 +76,7 @@
//Check the namespace and find SOAP version and factory
String nsURI;
SOAPFactory factory;
- if (env.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ if (env.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
nsURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
factory = DOOMAbstractFactory.getSOAP11Factory();
} else {
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java Wed Jul 26 04:18:39 2006
@@ -24,12 +24,12 @@
public class interopService {
public OMElement mtomSample(OMElement element) throws Exception {
if (element.getLocalName().equalsIgnoreCase("Data")
- && element.getNamespace().getName().equalsIgnoreCase(
+ && element.getNamespace().getNamespaceURI().equalsIgnoreCase(
"http://example.org/mtom/data")) {
OMText binaryNode = (OMText)element.getFirstOMChild();
binaryNode.setOptimize(!binaryNode.isOptimized());
}
- else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getName().equalsIgnoreCase("http://example.org/mtom/data")) {
+ else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getNamespaceURI().equalsIgnoreCase("http://example.org/mtom/data")) {
Iterator childrenIterator = element.getChildren();
while (childrenIterator.hasNext()) {
OMElement dataElement = (OMElement) childrenIterator.next();
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java Wed Jul 26 04:18:39 2006
@@ -17,11 +17,11 @@
package org.apache.rampart.conversation;
import org.apache.axiom.om.OMElement;
+import org.apache.axis2.util.Base64;
+import org.apache.axis2.util.Loader;
import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
import org.apache.rahas.TrustException;
-import org.apache.axis2.util.Base64;
-import org.apache.axis2.util.Loader;
import org.apache.rampart.RampartException;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.components.crypto.Crypto;
@@ -32,7 +32,6 @@
import javax.security.auth.callback.CallbackHandler;
import javax.xml.namespace.QName;
-
import java.util.Vector;
public class Util {
@@ -114,7 +113,7 @@
OMElement elem = rpt.getFirstElement();
if (WSConstants.ENC_KEY_LN.equals(elem.getLocalName())
- && WSConstants.ENC_NS.equals(elem.getNamespace().getName())) {
+ && WSConstants.ENC_NS.equals(elem.getNamespace().getNamespaceURI())) {
// Handle the xenc:EncryptedKey case
EncryptedKeyProcessor processor = new EncryptedKeyProcessor();
processor.handleToken((Element) elem, null, Util
@@ -123,12 +122,12 @@
null);
secret = processor.getDecryptedBytes();
} else if (RahasConstants.BINARY_SECRET_LN.equals(elem.getLocalName())
- && RahasConstants.WST_NS_05_02.equals(elem.getNamespace().getName())) {
+ && RahasConstants.WST_NS_05_02.equals(elem.getNamespace().getNamespaceURI())) {
// Handle the wst:BinarySecret case
secret = Base64.decode(elem.getText());
} else {
throw new TrustException("notSupported", new String[] { "{"
- + elem.getNamespace().getName() + "}"
+ + elem.getNamespace().getNamespaceURI() + "}"
+ elem.getLocalName() });
}
} else {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java Wed Jul 26 04:18:39 2006
@@ -50,7 +50,6 @@
import javax.security.auth.callback.CallbackHandler;
import javax.xml.namespace.QName;
-
import java.security.cert.X509Certificate;
import java.util.Iterator;
import java.util.Vector;
@@ -324,7 +323,7 @@
while (headers.hasNext()) { // Find the wsse header
SOAPHeaderBlock hb = (SOAPHeaderBlock) headers.next();
if (hb.getLocalName().equals(WSConstants.WSSE_LN)
- && hb.getNamespace().getName().equals(WSConstants.WSSE_NS)) {
+ && hb.getNamespace().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
headerBlock = hb;
break;
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java Wed Jul 26 04:18:39 2006
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
@@ -46,13 +45,12 @@
}
OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace ns = fac.createOMNamespace("", null);
//TODO: Find the constants for "Parameter" and "name"
- OMElement paramElement = fac.createOMElement("Parameter",ns);
+ OMElement paramElement = fac.createOMElement("Parameter",null);
paramElement.addAttribute(fac.createOMAttribute("name", null ,WSSHandlerConstants.INFLOW_SECURITY));
OMElement actionElem = fac.createOMElement(
- WSSHandlerConstants.ACTION, ns);
+ WSSHandlerConstants.ACTION, null);
// Get the set of kes of the selected action
Iterator keys = action.keySet().iterator();
@@ -62,7 +60,7 @@
String value = (String) action.get(key);
if(value != null && value.length() > 0) {
// Create an element with the name of the key
- OMElement elem = fac.createOMElement(key, ns);
+ OMElement elem = fac.createOMElement(key, null);
// Set the text value of the element
elem.setText(value);
// Add the element as a child of this action element
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java Wed Jul 26 04:18:39 2006
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
@@ -75,16 +74,15 @@
}
OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace ns = fac.createOMNamespace("", null);
//TODO: Find the constants for "Parameter" and "name"
- OMElement paramElement = fac.createOMElement("Parameter",ns);
+ OMElement paramElement = fac.createOMElement("Parameter",null);
paramElement.addAttribute(fac.createOMAttribute("name", null ,WSSHandlerConstants.OUTFLOW_SECURITY));
for (int i = 0; i < this.actionList.length; i++) {
// Create the action element
OMElement actionElem = fac.createOMElement(
- WSSHandlerConstants.ACTION, ns);
+ WSSHandlerConstants.ACTION, null);
// Get the current action
HashMap action = this.actionList[i];
@@ -97,7 +95,7 @@
String value = (String) action.get(key);
if(value != null && value.length() > 0) {
// Create an element with the name of the key
- OMElement elem = fac.createOMElement(key, ns);
+ OMElement elem = fac.createOMElement(key, null);
// Set the text value of the element
elem.setText(value);
// Add the element as a child of this action element
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java Wed Jul 26 04:18:39 2006
@@ -40,7 +40,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamReader;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -99,7 +98,7 @@
//Check the namespace and find SOAP version and factory
String nsURI = null;
SOAPFactory factory;
- if(env.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ if(env.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
nsURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
factory = DOOMAbstractFactory.getSOAP11Factory();
} else {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java Wed Jul 26 04:18:39 2006
@@ -233,7 +233,7 @@
private static void handleSignEncrParts(boolean signAllHeaders,
boolean signBody, boolean encrBody, MessageContext msgCtx,
int repetition) {
- String soapNs = msgCtx.getEnvelope().getNamespace().getName();
+ String soapNs = msgCtx.getEnvelope().getNamespace().getNamespaceURI();
if(signBody) {
//Add body signPart
String sigBodySigPart = "{Element}{" + soapNs + "}Body";
@@ -250,7 +250,7 @@
OMElement element = (OMElement) children.next();
//Sign only the quilified headers
//TODO check whether we can sign the unqualified header elements
- String ns = element.getNamespace().getName();
+ String ns = element.getNamespace().getNamespaceURI();
if(ns != null && ns.length() > 0) {
addSigPart("{Element}{" + ns + "}" + element.getLocalName(),msgCtx, repetition);
}
Modified: webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java?rev=425704&r1=425703&r2=425704&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java (original)
+++ webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java Wed Jul 26 04:18:39 2006
@@ -16,12 +16,11 @@
package org.apache.rampart.handler.config;
+import junit.framework.TestCase;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
-import junit.framework.TestCase;
-
/**
* Tests the org.apache.axis2.security.handler.config.OutflowConfiguration
*/
@@ -131,13 +130,13 @@
"<" + WSHandlerConstants.ENC_SYM_ALGO + ">"
+ WSConstants.AES_128 + "</"
+ WSHandlerConstants.ENC_SYM_ALGO + ">"));
-
+
assertTrue("encrUser missing", -1 < ofc.getProperty().getParameterElement().toString()
.indexOf(
"<" + WSHandlerConstants.ENCRYPTION_USER + ">"
+ encrUser + "</"
+ WSHandlerConstants.ENCRYPTION_USER + ">"));
-
+
assertTrue("passwordType missing", -1 < ofc.getProperty().getParameterElement().toString()
.indexOf(
"<" + WSHandlerConstants.PASSWORD_TYPE + ">"
@@ -149,7 +148,7 @@
"<" + WSHandlerConstants.SAML_PROP_FILE + ">"
+ samlPropFile + "</"
+ WSHandlerConstants.SAML_PROP_FILE + ">"));
-
+
assertTrue("sigPropFile missing", -1 < ofc.getProperty().getParameterElement().toString()
.indexOf(
"<" + WSHandlerConstants.SIG_PROP_FILE + ">"
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org