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/01/03 18:27:38 UTC
svn commit: r365688 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test-resources/
addressing/test/org/apache/axis2/handlers/addressing/
core/src/org/apache/axis2/addressing/ core/src/org/apa...
Author: chinthaka
Date: Tue Jan 3 09:26:48 2006
New Revision: 365688
URL: http://svn.apache.org/viewcvs?rev=365688&view=rev
Log:
- Removing ServiceName from the addressing implementation. This seems not being used so far and this has been removed from WS-A final version as well.
- Removing un-necessary addHeaderBlock methods from SOAPEnvelope.
- Renaming sendReceiveNonblocking to sendReceiveNonBlocking.
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/test-resources/OutHandlerTest.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/SOAPEnvelopeImpl.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=365688&r1=365687&r2=365688&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 Tue Jan 3 09:26:48 2006
@@ -21,7 +21,6 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.addressing.ServiceName;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.om.OMAbstractFactory;
@@ -52,7 +51,7 @@
log.info("Addressing is disbaled .....");
return;
}
- OMNamespace addressingNamespaceObject = null;
+ OMNamespace addressingNamespaceObject;
String addressingNamespace = null;
Object addressingVersionFromCurrentMsgCtxt = msgContext.getProperty(WS_ADDRESSING_VERSION);
@@ -101,7 +100,7 @@
String address = epr.getAddress();
if (!"".equals(address) && address != null) {
- SOAPHeaderBlock toHeaderBlock = envelope.addHeaderBlock(WSA_TO, addressingNamespaceObject);
+ SOAPHeaderBlock toHeaderBlock = envelope.getHeader().addHeaderBlock(WSA_TO, addressingNamespaceObject);
toHeaderBlock.setText(address);
}
@@ -186,7 +185,7 @@
SOAPEnvelope soapEnvelope, OMNamespace addressingNamespaceObject) {
if (!"".equals(value) && value != null) {
SOAPHeaderBlock soapHeaderBlock =
- soapEnvelope.addHeaderBlock(type, addressingNamespaceObject);
+ soapEnvelope.getHeader().addHeaderBlock(type, addressingNamespaceObject);
soapHeaderBlock.addChild(
OMAbstractFactory.getOMFactory().createText(value));
return soapHeaderBlock;
@@ -202,7 +201,7 @@
}
SOAPHeaderBlock soapHeaderBlock =
- envelope.addHeaderBlock(type, addressingNamespaceObject);
+ envelope.getHeader().addHeaderBlock(type, addressingNamespaceObject);
String address = epr.getAddress();
if (!"".equals(address) && address != null) {
@@ -257,23 +256,9 @@
parentElement.addChild(interfaceName);
}
- ServiceName serviceName = epr.getServiceName();
- if (serviceName != null) {
- OMElement serviceNameElement =
- OMAbstractFactory.getOMFactory().createOMElement(
- EPR_SERVICE_NAME,
- addressingNamespaceObject);
- serviceNameElement.addAttribute(Submission.EPR_SERVICE_NAME_PORT_NAME, serviceName.getPortName(),
- addressingNamespaceObject);
- serviceNameElement.addChild(
- OMAbstractFactory.getOMFactory().createText(
- serviceName.getName().getPrefix()
- + ":"
- + serviceName.getName().getLocalPart()));
- parentElement.addChild(serviceNameElement);
+ // Note : We are not handling ServiceName purposely here. Most of the time, it will not
+ // and even from the final version this has been removed.
}
- }
-
}
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/OutHandlerTest.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test-resources/OutHandlerTest.xml?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/OutHandlerTest.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/OutHandlerTest.xml Tue Jan 3 09:26:48 2006
@@ -10,7 +10,6 @@
<wsa:MessageID>123456-7890</wsa:MessageID>
<myRef:Reference4>Value 400</myRef:Reference4>
<myRef:Reference3>Value 300</myRef:Reference3>
- <wsa:ServiceName wsa:PortName="port">serviceNS:Service</wsa:ServiceName>
<wsa:PortType>portNS:Port</wsa:PortType>
<wsa:Action>http://www.actions.org/action</wsa:Action>
<wsa:ReplyTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml Tue Jan 3 09:26:48 2006
@@ -5,7 +5,6 @@
<wsa:Reference0>Value 0</wsa:Reference0>
<wsa:Reference2>Value 200</wsa:Reference2>
<wsa:Reference3>Value 300</wsa:Reference3>
- <wsa:ServiceName wsa:PortName="port">serviceNS:Service</wsa:ServiceName>
<wsa:PortType>portNS:Port</wsa:PortType>
<wsa:To>http://www.to.org/service/</wsa:To>
<wsa:ReplyTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Tue Jan 3 09:26:48 2006
@@ -20,7 +20,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.ServiceName;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.util.TestUtil;
import org.apache.axis2.om.OMAbstractFactory;
@@ -54,12 +53,6 @@
new QName("http://www.from.org/service/port/",
"Port",
"portNS"));
- epr.setServiceName(
- new ServiceName(
- new QName("http://www.from.org/service/",
- "Service",
- "serviceNS"),
- "port"));
for (int i = 0; i < 5; i++) {
epr.addReferenceParameter(
@@ -102,13 +95,6 @@
epr.addReferenceParameter(
new QName("http://reference.org", "Reference3", "myRef"),
"Value 300");
-
- epr.setServiceName(
- new ServiceName(
- new QName("http://www.from.org/service/",
- "Service",
- "serviceNS"),
- "port"));
epr.setPortType(
new QName("http://www.from.org/service/port/",
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Tue Jan 3 09:26:48 2006
@@ -43,7 +43,6 @@
// Properties from WS-A Submission version
private Map referenceProperties;
- private ServiceName serviceName;
/**
* @param address
@@ -159,13 +158,6 @@
}
/**
- * Method getServiceName
- */
- public ServiceName getServiceName() {
- return serviceName;
- }
-
- /**
* Method setAddress
*
* @param address
@@ -204,14 +196,5 @@
*/
public void setReferenceProperties(HashMap referenceProperties) {
this.referenceProperties = referenceProperties;
- }
-
- /**
- * Method setServiceName
- *
- * @param serviceName
- */
- public void setServiceName(ServiceName serviceName) {
- this.serviceName = serviceName;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Tue Jan 3 09:26:48 2006
@@ -3,9 +3,17 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.OutInAxisOperation;
+import org.apache.axis2.description.OutOnlyAxisOperation;
+import org.apache.axis2.description.RobustOutOnlyAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAbstractFactory;
@@ -295,7 +303,7 @@
// this method call two channel non blocking method to do the work
// and wait on the callbck
- sendReceiveNonblocking(operation, elem, callback);
+ sendReceiveNonBlocking(operation, elem, callback);
long timeout = options.getTimeOutInMilliSeconds();
@@ -358,10 +366,10 @@
public void sendReceiveNonblocking(OMElement elem, Callback callback)
throws AxisFault {
- sendReceiveNonblocking(ANON_OUT_IN_OP, elem, callback);
+ sendReceiveNonBlocking(ANON_OUT_IN_OP, elem, callback);
}
- public void sendReceiveNonblocking(QName operation, OMElement elem,
+ public void sendReceiveNonBlocking(QName operation, OMElement elem,
Callback callback) throws AxisFault {
MessageContext mc = new MessageContext();
fillSoapEnvelope(mc, elem);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java Tue Jan 3 09:26:48 2006
@@ -95,28 +95,4 @@
"value " + i * 50);
}
}
-
- public void testGetAndSetServiceName() {
- ServiceName serviceName = new ServiceName(
- new QName("www.someservicename.org", "service"));
- endpointReference.setServiceName(serviceName);
- ServiceName retrievedServiceName = endpointReference.getServiceName();
- assertEquals("ServiceName name has not been get/set properly",
- serviceName.getName(),
- retrievedServiceName.getName());
-
- serviceName =
- new ServiceName(
- new QName("www.someservicename.org", "service"),
- "portName");
- endpointReference.setServiceName(serviceName);
- retrievedServiceName = endpointReference.getServiceName();
- assertEquals("ServiceName name has not been get/set properly",
- serviceName.getName(),
- retrievedServiceName.getName());
- assertEquals("ServiceName portName has not been get/set properly",
- serviceName.getPortName(),
- retrievedServiceName.getPortName());
- }
-
}
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/SOAPEnvelopeImpl.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/SOAPEnvelopeImpl.java Tue Jan 3 09:26:48 2006
@@ -25,7 +25,14 @@
import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.om.impl.dom.DocumentImpl;
import org.apache.axis2.om.impl.dom.NamespaceImpl;
-import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.SOAP11Constants;
+import org.apache.axis2.soap.SOAP12Constants;
+import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.soap.SOAPConstants;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.SOAPHeader;
+import org.apache.axis2.soap.SOAPProcessingException;
import org.apache.axis2.soap.impl.dom.factory.DOMSOAPFactory;
import org.apache.axis2.soap.impl.dom.soap11.SOAP11Factory;
@@ -89,25 +96,6 @@
}
return header;
}
-
- /**
- * Convenience method to add a SOAP header to this envelope
- *
- * @param name
- * @param namespaceURI
- */
- public SOAPHeaderBlock addHeaderBlock(String name, String namespaceURI)
- throws OMException {
- // TODO : cache SOAP header and body instead of looking them up?
-
- OMNamespace namespace = factory.createOMNamespace(namespaceURI, null);
- return this.addHeaderBlock(name, namespace);
- }
-
- public SOAPHeaderBlock addHeaderBlock(String name, OMNamespace namespace) throws OMException {
- SOAPHeader headerContainer = getHeader();
- return factory.createSOAPHeaderBlock(name, namespace, headerContainer);
- }
public void addChild(OMNode child) {
if ((child instanceof OMElement)
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Tue Jan 3 09:26:48 2006
@@ -85,9 +85,9 @@
ServiceClient sender = new ServiceClient(configConetxt, service);
sender.setOptions(options);
- options.setTo(targetEPR);
OMElement result = sender.sendReceive(operationName, method);
+ System.out.println("result = " + result);
TestingUtils.campareWithCreatedOMElement(result);
sender.finalizeInvoke();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Tue Jan 3 09:26:48 2006
@@ -121,7 +121,7 @@
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(operationName, method, callback);
+ sender.sendReceiveNonBlocking(operationName, method, callback);
// call.invokeNonBlocking(operationName.getLocalPart(),
// method,
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Tue Jan 3 09:26:48 2006
@@ -128,7 +128,7 @@
sender.engageModule(new QName("addressing"));
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(operationName, payload, callback);
+ sender.sendReceiveNonBlocking(operationName, payload, callback);
int index = 0;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Tue Jan 3 09:26:48 2006
@@ -138,7 +138,7 @@
ServiceClient sender = new ServiceClient(clientConfigContext, clientService);
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(operationName,createEnvelope(value), callback);
+ sender.sendReceiveNonBlocking(operationName,createEnvelope(value), callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Tue Jan 3 09:26:48 2006
@@ -146,7 +146,7 @@
ServiceClient sender = new ServiceClient(configContext, service);
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(operationName, createEnvelope(), callback);
+ sender.sendReceiveNonBlocking(operationName, createEnvelope(), callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java Tue Jan 3 09:26:48 2006
@@ -137,7 +137,7 @@
ServiceClient sender = new ServiceClient(configContext, service);
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(operationName, createEnvelope(), callback);
+ sender.sendReceiveNonBlocking(operationName, createEnvelope(), callback);
int index = 0;
while (!finish) {
Thread.sleep(1000);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Tue Jan 3 09:26:48 2006
@@ -129,7 +129,7 @@
ServiceClient sender = new ServiceClient(configContext, clientService);
sender.setOptions(options);
- sender.sendReceiveNonblocking(operationName, payload, callback);
+ sender.sendReceiveNonBlocking(operationName, payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Tue Jan 3 09:26:48 2006
@@ -124,7 +124,7 @@
sender = new ServiceClient(configContext, serviceClient);
sender.setOptions(options);
- sender.sendReceiveNonblocking(operationName, method, callback);
+ sender.sendReceiveNonBlocking(operationName, method, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java Tue Jan 3 09:26:48 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
/**
* Interface SOAPEnvelope
@@ -38,18 +37,6 @@
* obtaining the <CODE>SOAPHeader</CODE> object
*/
public abstract SOAPHeader getHeader() throws OMException;
-
- /**
- * Convenience method to add a SOAP header to this envelope
- *
- * @param name
- * @param namespaceURI
- */
- public abstract SOAPHeaderBlock addHeaderBlock(String name, String namespaceURI)
- throws OMException;
-
- public abstract SOAPHeaderBlock addHeaderBlock(String name, OMNamespace namespace)
- throws OMException;
/**
* Returns the <CODE>SOAPBody</CODE> object associated with
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java Tue Jan 3 09:26:48 2006
@@ -24,7 +24,14 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
-import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.SOAP11Constants;
+import org.apache.axis2.soap.SOAP12Constants;
+import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.soap.SOAPConstants;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.SOAPHeader;
+import org.apache.axis2.soap.SOAPProcessingException;
import org.apache.axis2.soap.impl.llom.factory.SOAPLinkedListImplFactory;
import javax.xml.namespace.QName;
@@ -86,28 +93,6 @@
factory = OMAbstractFactory.getSOAP11Factory();
}
}
- }
-
- /**
- * Convenience method to add a SOAP header to this envelope
- *
- * @param name
- * @param namespaceURI
- */
- public SOAPHeaderBlock addHeaderBlock(String name, String namespaceURI)
- throws OMException {
- // TODO : cache SOAP header and body instead of looking them up?
-
-
- OMNamespace namespace = factory.createOMNamespace(namespaceURI, null);
- return this.addHeaderBlock(name, namespace);
- }
-
- public SOAPHeaderBlock addHeaderBlock(String name, OMNamespace namespace) throws OMException {
- SOAPHeader headerContainer = getHeader();
- inferFactory();
-
- return factory.createSOAPHeaderBlock(name, namespace, headerContainer);
}
public void addChild(OMNode child) {
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java?rev=365688&r1=365687&r2=365688&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java Tue Jan 3 09:26:48 2006
@@ -24,11 +24,7 @@
public SOAPEnvelopeTest(String testName) {
super(testName);
soap11Envelope = soap11Factory.getDefaultEnvelope();
- // Toss in a header to make sure the SOAPHeader gets set up
- soap11Envelope.addHeaderBlock("dummy", "http://ns");
soap12Envelope = soap12Factory.getDefaultEnvelope();
- // Toss in a header to make sure the SOAPHeader gets set up
- soap12Envelope.addHeaderBlock("dummy", "http://ns");
}
//SOAP 1.1 Envelope Test (Programaticaly Created)-----------------------------------------------