You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/09/02 11:43:25 UTC
svn commit: r439567 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/
kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/deployment/util/
kernel/src/org/apache/axis2/description/ kernel/src/org/apach...
Author: deepal
Date: Sat Sep 2 02:43:23 2006
New Revision: 439567
URL: http://svn.apache.org/viewvc?rev=439567&view=rev
Log:
fixing AXIS2-1101
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeAfterTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseFirstTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseLastTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java
webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java
webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Sat Sep 2 02:43:23 2006
@@ -79,7 +79,7 @@
InstanceDispatcher id = new InstanceDispatcher();
- id.init(new HandlerDescription(new QName("InstanceDispatcher")));
+ id.init(new HandlerDescription("InstanceDispatcher"));
dispatchPhase.addHandler(abd);
dispatchPhase.addHandler(rud);
dispatchPhase.addHandler(sabd);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Sat Sep 2 02:43:23 2006
@@ -18,14 +18,9 @@
//todo
-import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.OutInAxisOperation;
+import org.apache.axis2.description.*;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
@@ -42,7 +37,7 @@
import java.net.Socket;
public class MessageWithServerTest extends UtilServerBasedTestCase {
- private static final Log log = LogFactory.getLog(MessageWithServerTest.class);
+ private static final Log log = LogFactory.getLog(MessageWithServerTest.class);
private QName serviceName = new QName("", "EchoService");
private QName operationName =
new QName("http://ws.apache.org/axis2", "echoVoid");
@@ -99,7 +94,7 @@
InstanceDispatcher id = new InstanceDispatcher();
- id.init(new HandlerDescription(new QName("InstanceDispatcher")));
+ id.init(new HandlerDescription("InstanceDispatcher"));
dispatchPhase.addHandler(abd);
dispatchPhase.addHandler(rud);
dispatchPhase.addHandler(sabd);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java Sat Sep 2 02:43:23 2006
@@ -25,8 +25,8 @@
super();
for (int i = 0; i < length; i++) {
SpeakingHandler1 h1 = new SpeakingHandler1(
- "Executing " + i + " inside " + message,new QName("SpeakingHandler" + i));
- h1.setName(new QName("SpeakingHandler" + i));
+ "Executing " + i + " inside " + message, new QName("SpeakingHandler" + i));
+ h1.setName("SpeakingHandler" + i);
this.addHandler(h1.getHandlerDescription());
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java Sat Sep 2 02:43:23 2006
@@ -22,18 +22,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class SpeakingHandler extends AbstractHandler implements Handler {
- private static final Log log = LogFactory.getLog(SpeakingHandler.class);
+ private static final Log log = LogFactory.getLog(SpeakingHandler.class);
private String message;
- private QName name;
+ private String name;
public SpeakingHandler() {
this.message = "Hi I amtesting ";
}
- public QName getName() {
+ public String getName() {
return name;
}
@@ -45,7 +43,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java Sat Sep 2 02:43:23 2006
@@ -30,21 +30,21 @@
public class SpeakingHandler1 extends AbstractHandler implements Handler {
private static final Log log = LogFactory.getLog(SpeakingHandler1.class);
private String message;
- private QName name;
+ private String name;
public SpeakingHandler1(String message, QName name) {
this.message = message;
HandlerDescription handlerDesc = new HandlerDescription();
- handlerDesc.setName(new QName("SpeakingHandler1"));
+ handlerDesc.setName("SpeakingHandler1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName(PhaseMetadata.PHASE_DISPATCH);
handlerDesc.setRules(rule);
handlerDesc.setHandler(this);
- handlerDesc.setName(name);
+ handlerDesc.setName(name.getLocalPart());
init(handlerDesc);
}
- public QName getName() {
+ public String getName() {
return name;
}
@@ -56,7 +56,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sat Sep 2 02:43:23 2006
@@ -230,7 +230,7 @@
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
"Name missing"));
} else {
- handler.setName(new QName(name_attribute.getAttributeValue()));
+ handler.setName(name_attribute.getAttributeValue());
}
// Setting Handler Class name
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java Sat Sep 2 02:43:23 2006
@@ -71,7 +71,7 @@
HandlerDescription makeHandler(OMElement handlerElement) {
String name = handlerElement.getAttributeValue(new QName("name"));
QName qname = handlerElement.resolveQName(name);
- HandlerDescription desc = new HandlerDescription(qname);
+ HandlerDescription desc = new HandlerDescription(qname.getLocalPart());
String className = handlerElement.getAttributeValue(new QName("class"));
desc.setClassName(className);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java Sat Sep 2 02:43:23 2006
@@ -22,7 +22,6 @@
import org.apache.axis2.engine.Handler;
import org.apache.axis2.i18n.Messages;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
/**
@@ -43,7 +42,7 @@
/**
* Field name
*/
- private QName name;
+ private String name;
/**
* Field parameterInclude
@@ -69,7 +68,7 @@
*
* @param name
*/
- public HandlerDescription(QName name) {
+ public HandlerDescription(String name) {
this();
this.name = name;
}
@@ -116,7 +115,7 @@
/**
* @return Returns QName.
*/
- public QName getName() {
+ public String getName() {
return name;
}
@@ -175,7 +174,7 @@
/**
* @param name
*/
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java Sat Sep 2 02:43:23 2006
@@ -28,8 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
/**
* This the base class for all dispatchers. A dispatcher's task is
* to find the service for an incoming SOAP message.
@@ -42,7 +40,7 @@
/**
* Field NAME
*/
- public static final QName NAME = new QName("http://ws.apache.org/axis2/", "AbstractDispatcher");
+ public static final String NAME = "AbstractDispatcher";
private static final Log log = LogFactory.getLog(AbstractDispatcher.class);
public AbstractDispatcher() {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Sat Sep 2 02:43:23 2006
@@ -42,8 +42,7 @@
/**
* Field NAME
*/
- public static final QName NAME = new QName("http://ws.apache.org/axis2/",
- "AddressingBasedDispatcher");
+ public static final String NAME = "AddressingBasedDispatcher";
private static final Log log = LogFactory.getLog(AddressingBasedDispatcher.class);
// TODO this logic needed to be improved, as the Dispatching is almost guaranteed to fail
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java Sat Sep 2 02:43:23 2006
@@ -66,9 +66,9 @@
/**
* Method getName.
*
- * @return Returns QName
+ * @return Returns String
*/
- public QName getName();
+ public String getName();
/**
* Method getParameter.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java Sat Sep 2 02:43:23 2006
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Iterator;
@@ -35,8 +34,6 @@
*/
public class Phase implements Handler {
- private static final long serialVersionUID = -3352439587370050957L;
-
public static final String ALL_PHASES = "*";
/**
@@ -62,7 +59,7 @@
/**
* Field log
*/
- private static final Log log = LogFactory.getLog(Phase.class);
+ private static final Log log = LogFactory.getLog(Phase.class);
/**
* Field handlers
@@ -135,7 +132,7 @@
while (handlers_itr.hasNext()) {
Handler hand = (Handler) handlers_itr.next();
HandlerDescription handlerDesc = hand.getHandlerDesc();
- if (handler.getName().getLocalPart().equals(handlerDesc.getName().getLocalPart())) {
+ if (handler.getName().equals(handlerDesc.getName())) {
return;
}
}
@@ -208,7 +205,7 @@
for (int i = 0; i < handlers.size(); i++) {
Handler temphandler = (Handler) handlers.get(i);
- if (temphandler.getName().getLocalPart().equals(afterName)) {
+ if (temphandler.getName().equals(afterName)) {
if (phaselastset && (i == handlers.size() - 1)) {
throw new PhaseException("Can't insert handler after handler '"
+ temphandler.getName()
@@ -244,7 +241,7 @@
for (int i = 0; i < handlers.size(); i++) {
Handler temphandler = (Handler) handlers.get(i);
- if (temphandler.getName().getLocalPart().equals(beforename)) {
+ if (temphandler.getName().equals(beforename)) {
if (i == 0) {
if (phasefirstset) {
throw new PhaseException("Can't insert handler before handler '"
@@ -281,10 +278,10 @@
for (int i = 0; i < handlers.size(); i++) {
Handler temphandler = (Handler) handlers.get(i);
- if (afterName.equals(temphandler.getName().getLocalPart())) {
+ if (afterName.equals(temphandler.getName())) {
after = i;
} else {
- if (beforeName.equals(temphandler.getName().getLocalPart())) {
+ if (beforeName.equals(temphandler.getName())) {
before = i;
}
}
@@ -447,8 +444,8 @@
return handlers;
}
- public QName getName() {
- return new QName(phaseName);
+ public String getName() {
+ return phaseName;
}
public Parameter getParameter(String name) {
@@ -526,19 +523,19 @@
public void removeHandler(HandlerDescription handler) {
if (handlers.remove(handler.getHandler())) {
PhaseRule rule = handler.getRules();
- if(rule.isPhaseFirst()){
+ if (rule.isPhaseFirst()) {
phasefirstset = false;
}
- if(rule.isPhaseLast()){
+ if (rule.isPhaseLast()) {
phaselastset = false;
}
- if(rule.isPhaseFirst()&& rule.isPhaseLast()){
+ if (rule.isPhaseFirst() && rule.isPhaseLast()) {
isOneHandler = false;
}
- log.debug("removed handler " + handler.getName().getLocalPart()
+ log.debug("removed handler " + handler.getName()
+ " from the phase " + phaseName);
} else {
- log.debug("unable to remove handler " + handler.getName().getLocalPart()
+ log.debug("unable to remove handler " + handler.getName()
+ " from the phase " + phaseName);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Sat Sep 2 02:43:23 2006
@@ -34,11 +34,8 @@
*/
public class RequestURIBasedDispatcher extends AbstractDispatcher {
- private static final long serialVersionUID = 6212111158265910316L;
-
- public static final QName NAME = new QName("http://ws.apache.org/axis2/",
- "RequestURIBasedDispatcher");
- private static final Log log = LogFactory.getLog(RequestURIBasedDispatcher.class);
+ public static final String NAME = "RequestURIBasedDispatcher";
+ private static final Log log = LogFactory.getLog(RequestURIBasedDispatcher.class);
/*
* (non-Javadoc)
@@ -50,24 +47,20 @@
EndpointReference toEPR = messageContext.getTo();
if (toEPR != null) {
String filePart = toEPR.getAddress();
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart ,
+ String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
messageContext.getConfigurationContext().getServiceContextPath());
if ((values.length >= 2) && (values[1] != null)) {
QName operationName = new QName(values[1]);
log.debug("Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
return service.getOperation(operationName);
+ } else {
+ log.debug("Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
+ return null;
}
- else
- {
- log.debug("Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
- return null;
- }
- }
- else
- {
- log.debug("Attempted to check for Operation using null target endpoint URI");
- return null;
+ } else {
+ log.debug("Attempted to check for Operation using null target endpoint URI");
+ return null;
}
}
@@ -83,7 +76,7 @@
String filePart = toEPR.getAddress();
//REVIEW: (nagy) Parsing the RequestURI will also give us the operationName if present, so we could conceivably store it in the MessageContext, but doing so and retrieving it is probably no faster than simply reparsing the URI
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart ,
+ String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
messageContext.getConfigurationContext().getServiceContextPath());
if ((values.length >= 1) && (values[0] != null)) {
@@ -91,17 +84,13 @@
messageContext.getConfigurationContext().getAxisConfiguration();
return registry.getService(values[0]);
+ } else {
+ log.debug("Attempted to check for Service using target endpoint URI, but the service fragment was missing");
+ return null;
}
- else
- {
- log.debug("Attempted to check for Service using target endpoint URI, but the service fragment was missing");
- return null;
- }
- }
- else
- {
- log.debug("Attempted to check for Service using null target endpoint URI");
- return null;
+ } else {
+ log.debug("Attempted to check for Service using null target endpoint URI");
+ return null;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java Sat Sep 2 02:43:23 2006
@@ -32,14 +32,11 @@
*/
public class SOAPActionBasedDispatcher extends AbstractDispatcher {
- private static final long serialVersionUID = 6319071671173417797L;
-
- /**
+ /**
* Field NAME
*/
- public static final QName NAME = new QName("http://ws.apache.org/axis2/",
- "SOAPActionBasedDispatcher");
- private static final Log log = LogFactory.getLog(SOAPActionBasedDispatcher.class);
+ public static final String NAME = "SOAPActionBasedDispatcher";
+ private static final Log log = LogFactory.getLog(SOAPActionBasedDispatcher.class);
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Sat Sep 2 02:43:23 2006
@@ -36,14 +36,11 @@
*/
public class SOAPMessageBodyBasedDispatcher extends AbstractDispatcher {
- private static final long serialVersionUID = 487519840603427717L;
-
- /**
+ /**
* Field NAME
*/
- public static final QName NAME = new QName("http://ws.apache.org/axis2/",
- "SOAPMessageBodyBasedDispatcher");
- private static final Log log = LogFactory.getLog(SOAPMessageBodyBasedDispatcher.class);
+ public static final String NAME = "SOAPMessageBodyBasedDispatcher";
+ private static final Log log = LogFactory.getLog(SOAPMessageBodyBasedDispatcher.class);
String serviceName = null;
QName operationName = null;
@@ -80,7 +77,7 @@
"Checking for Service using SOAP message body's first child's namespace : "
+ filePart);
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart ,
+ String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
messageContext.getConfigurationContext().getServiceContextPath());
if (values[1] != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java Sat Sep 2 02:43:23 2006
@@ -21,8 +21,6 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.Handler;
-import javax.xml.namespace.QName;
-
/**
* Class AbstractHandler
*/
@@ -32,7 +30,7 @@
* Field EMPTY_HANDLER_METADATA
*/
private static HandlerDescription EMPTY_HANDLER_METADATA =
- new HandlerDescription(new QName("default Handler"));
+ new HandlerDescription(("default Handler"));
/**
* Field handlerDesc
@@ -66,10 +64,10 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- QName name = this.getName();
+ String name = this.getName();
return (name != null)
- ? name.toString()
+ ? name
: null;
}
@@ -87,7 +85,7 @@
*
* @return Returns QName.
*/
- public QName getName() {
+ public String getName() {
return handlerDesc.getName();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java Sat Sep 2 02:43:23 2006
@@ -64,7 +64,7 @@
getPhase(phaseName).addHandler(handlerDesc);
} else {
throw new PhaseException(Messages.getMessage(DeploymentErrorMsgs.INVALID_PHASE,
- phaseName, handlerDesc.getName().getLocalPart()));
+ phaseName, handlerDesc.getName()));
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java Sat Sep 2 02:43:23 2006
@@ -32,7 +32,6 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.HTTPTransportUtils;
-import javax.xml.namespace.QName;
import java.io.OutputStream;
/**
@@ -46,7 +45,7 @@
/**
* Field NAME
*/
- public static final QName NAME = new QName("http://ws.apache.org/axis2/", "TransportSender");
+ public static final String NAME = "TransportSender";
/**
* Constructor AbstractTransportSender
@@ -90,13 +89,13 @@
if (epr != null) {
if (!epr.getAddress().equals(AddressingConstants.Final.WSA_NONE_URI)) {
out = openTheConnection(epr, msgContext);
-
+
OutputStream newOut = startSendWithToAddress(msgContext, out);
-
+
if (newOut != null) {
out = newOut;
}
-
+
writeMessage(msgContext, out);
finalizeSendWithToAddress(msgContext, out);
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java Sat Sep 2 02:43:23 2006
@@ -5,8 +5,6 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -24,15 +22,16 @@
*
*/
-public class ModuleHandler1 extends AbstractHandler implements Handler {
- private static final long serialVersionUID = 8180024686236178934L;
- private static final Log log = LogFactory.getLog(ModuleHandler1 .class);
+public class ModuleHandler1 extends AbstractHandler implements Handler {
+ private static final Log log = LogFactory.getLog(ModuleHandler1 .class);
private String message;
- private QName name;
+ private String name;
+
public ModuleHandler1() {
- this.message = "inside invalid module";
+ this.message = "inside invalid module";
}
- public QName getName() {
+
+ public String getName() {
return name;
}
@@ -44,7 +43,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java Sat Sep 2 02:43:23 2006
@@ -23,21 +23,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class SpeakingHandler extends AbstractHandler implements Handler {
-
- private static final long serialVersionUID = -7115915636830140164L;
-
- private static final Log log = LogFactory.getLog(SpeakingHandler.class);
+
+ private static final Log log = LogFactory.getLog(SpeakingHandler.class);
private String message;
- private QName name;
+ private String name;
public SpeakingHandler() {
this.message = "Hi I amtesting ";
}
- public QName getName() {
+ public String getName() {
return name;
}
@@ -49,7 +45,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java Sat Sep 2 02:43:23 2006
@@ -23,19 +23,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class SpeakingHandler extends AbstractHandler implements Handler {
- private static final long serialVersionUID = 1981398896004153611L;
- private static final Log log = LogFactory.getLog(SpeakingHandler.class);
+ private static final Log log = LogFactory.getLog(SpeakingHandler.class);
private String message;
- private QName name;
+ private String name;
public SpeakingHandler() {
this.message = "Hi I amtesting ";
}
- public QName getName() {
+ public String getName() {
return name;
}
@@ -48,7 +45,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java Sat Sep 2 02:43:23 2006
@@ -23,19 +23,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class SpeakingHandler1 extends AbstractHandler implements Handler {
- private static final long serialVersionUID = -9147014780463234096L;
- private static final Log log = LogFactory.getLog(SpeakingHandler1.class);
+ private static final Log log = LogFactory.getLog(SpeakingHandler1.class);
private String message;
- private QName name;
+ private String name;
public SpeakingHandler1(String message) {
this.message = message;
}
- public QName getName() {
+ public String getName() {
return name;
}
@@ -47,7 +44,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java Sat Sep 2 02:43:23 2006
@@ -23,12 +23,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -90,7 +85,7 @@
InstanceDispatcher id = new InstanceDispatcher();
- id.init(new HandlerDescription(new QName("InstanceDispatcher")));
+ id.init(new HandlerDescription("InstanceDispatcher"));
dispatchPhase.addHandler(abd);
dispatchPhase.addHandler(rud);
dispatchPhase.addHandler(sabd);
@@ -183,19 +178,18 @@
}
public class TempHandler extends AbstractHandler {
- private static final long serialVersionUID = 6201231320871883424L;
private Integer index;
private boolean pause = false;
public TempHandler(int index, boolean pause) {
this.index = new Integer(index);
this.pause = pause;
- init(new HandlerDescription(new QName("handler" + index)));
+ init(new HandlerDescription("handler" + index));
}
public TempHandler(int index) {
this.index = new Integer(index);
- init(new HandlerDescription(new QName("handler" + index)));
+ init(new HandlerDescription("handler" + index));
}
public void invoke(MessageContext msgContext) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java Sat Sep 2 02:43:23 2006
@@ -5,8 +5,6 @@
import org.apache.axis2.engine.Handler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -25,14 +23,15 @@
*/
public class Handler2 extends AbstractHandler implements Handler {
- private static final long serialVersionUID = 972538148763607921L;
- private static final Log log = LogFactory.getLog(Handler2.class);
+ private static final Log log = LogFactory.getLog(Handler2.class);
private String message;
- private QName name;
+ private String name;
+
public Handler2() {
this.message = "inside service 2";
}
- public QName getName() {
+
+ public String getName() {
return name;
}
@@ -44,7 +43,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeAfterTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeAfterTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeAfterTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeAfterTest.java Sat Sep 2 02:43:23 2006
@@ -43,7 +43,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("First"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
hm.setRules(rule);
@@ -55,7 +55,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Forth"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
hm1.setRules(rule1);
@@ -68,7 +68,7 @@
((PhaseRuleHandlers) h3).setName(new QName("Second"));
h3.init(hm3);
hm3.setHandler(h3);
- hm3.setName(new QName("H3"));
+ hm3.setName("H3");
PhaseRule rule3 = new PhaseRule();
rule3.setPhaseName("PhaseA");
rule3.setAfter("H1");
@@ -81,7 +81,7 @@
((PhaseRuleHandlers) h4).setName(new QName("Third"));
h4.init(hm4);
hm4.setHandler(h4);
- hm4.setName(new QName("H4"));
+ hm4.setName("H4");
PhaseRule rule4 = new PhaseRule();
rule4.setPhaseName("PhaseA");
rule4.setAfter("H1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java Sat Sep 2 02:43:23 2006
@@ -49,7 +49,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("First"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
hm.setRules(rule);
@@ -61,7 +61,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setBefore("H1");
@@ -74,7 +74,7 @@
fail("Computed Hnadler order is wrong ");
}
handler = (Handler) handlers.get(1);
- if (handler !=h1) {
+ if (handler != h1) {
fail("Computed Hnadler order is wrong ");
}
p1.invoke(msg);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setBefore("H1");
@@ -64,7 +64,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("First"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
hm.setRules(rule);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseFirstHnadler"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseFirst(true);
@@ -65,7 +65,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
hm1.setRules(rule1);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseFirstHnadler"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseFirst(true);
@@ -64,7 +64,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setPhaseFirst(true);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseFirstHnadler"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseLast(true);
@@ -65,7 +65,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
hm1.setRules(rule1);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java Sat Sep 2 02:43:23 2006
@@ -25,14 +25,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
public class InvalidPhaseRuleTest extends AbstractTestCase {
InvalidPhaseRuleTest phaserul;
AxisConfiguration axisSytem;
- private static final Log log = LogFactory.getLog(InvalidPhaseRuleTest.class);
+ private static final Log log = LogFactory.getLog(InvalidPhaseRuleTest.class);
public InvalidPhaseRuleTest(String testName) {
super(testName);
@@ -52,7 +51,7 @@
HandlerDescription hm = new HandlerDescription();
hm.setClassName("org.apache.axis2.handlers.AbstractHandler");
hm.setHandler(han);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("global");
rule.setPhaseFirst(true);
@@ -62,7 +61,7 @@
HandlerDescription hm1 = new HandlerDescription();
hm1.setClassName("org.apache.axis2.handlers.AbstractHandler");
hm1.setHandler(han);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("global");
rule1.setAfter("H1");
@@ -72,7 +71,7 @@
HandlerDescription hm3 = new HandlerDescription();
hm3.setClassName("org.apache.axis2.handlers.AbstractHandler");
hm3.setHandler(han);
- hm3.setName(new QName("H4"));
+ hm3.setName("H4");
PhaseRule rule3 = new PhaseRule();
rule3.setPhaseName("Logging");
hm3.setRules(rule3);
@@ -93,9 +92,9 @@
ArrayList inPhase = axisSytem.getGlobalInFlow();
inPhase.add("global");
- ((AxisConfiguration) axisSytem).setInFaultPhases(inPhase);
- ((AxisConfiguration) axisSytem).setOutFaultPhases(inPhase);
- ((AxisConfiguration) axisSytem).setGlobalOutPhase(inPhase);
+ axisSytem.setInFaultPhases(inPhase);
+ axisSytem.setOutFaultPhases(inPhase);
+ axisSytem.setGlobalOutPhase(inPhase);
Handler han = null;
PhaseHolder ph = new PhaseHolder(inPhase);
@@ -104,7 +103,7 @@
HandlerDescription hm = new HandlerDescription();
hm.setClassName("org.apache.axis2.handlers.AbstractHandler");
hm.setHandler(han);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("global");
rule.setPhaseFirst(true);
@@ -115,7 +114,7 @@
HandlerDescription hm1 = new HandlerDescription();
hm1.setClassName("org.apache.axis2.handlers.AbstractHandler");
hm1.setHandler(han);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("global");
rule1.setAfter("H1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseLast"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseLast(true);
@@ -64,7 +64,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setPhaseLast(true);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseFirstTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseFirstTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseFirstTest.java Sat Sep 2 02:43:23 2006
@@ -43,7 +43,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseFirstHnadler"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseFirst(true);
@@ -56,7 +56,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setBefore("H1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseLastTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseLastTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseLastTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseLastTest.java Sat Sep 2 02:43:23 2006
@@ -44,7 +44,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseLast"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseLast(true);
@@ -57,7 +57,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setAfter("H1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTest.java Sat Sep 2 02:43:23 2006
@@ -25,7 +25,6 @@
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseHolder;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
public class PhaseRuleTest extends AbstractTestCase {
@@ -60,7 +59,7 @@
Handler h1 = new PhaseRuleHandlers();
h1.init(hm);
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PreDispatch");
rule.setPhaseFirst(true);
@@ -72,7 +71,7 @@
Handler h2 = new PhaseRuleHandlers();
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PreDispatch");
rule1.setAfter("H1");
@@ -84,7 +83,7 @@
Handler h3 = new PhaseRuleHandlers();
h3.init(hm2);
hm2.setHandler(h3);
- hm2.setName(new QName("H3"));
+ hm2.setName("H3");
PhaseRule rule2 = new PhaseRule();
rule2.setPhaseName("PreDispatch");
rule2.setAfter("H1");
@@ -97,7 +96,7 @@
Handler h4 = new PhaseRuleHandlers();
h4.init(hm3);
hm3.setHandler(h4);
- hm3.setName(new QName("H4"));
+ hm3.setName("H4");
PhaseRule rule3 = new PhaseRule();
rule3.setPhaseName("Dispatch");
hm3.setRules(rule3);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java Sat Sep 2 02:43:23 2006
@@ -25,7 +25,6 @@
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseHolder;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
public class PreDispatchPhaseRuleTest extends AbstractTestCase {
@@ -58,7 +57,7 @@
Handler h1 = new PhaseRuleHandlers();
h1.init(pre);
pre.setHandler(h1);
- pre.setName(new QName("pre-H1"));
+ pre.setName("pre-H1");
PhaseRule pre_rule1 = new PhaseRule();
pre_rule1.setPhaseName("PreDispatch");
pre.setRules(pre_rule1);
@@ -69,7 +68,7 @@
Handler h2 = new PhaseRuleHandlers();
h2.init(pre2);
pre2.setHandler(h2);
- pre2.setName(new QName("dispatch"));
+ pre2.setName("dispatch");
PhaseRule prerule2 = new PhaseRule();
prerule2.setPhaseName("Dispatch");
pre2.setRules(prerule2);
@@ -81,7 +80,7 @@
Handler h3 = new PhaseRuleHandlers();
h3.init(hm);
hm.setHandler(h3);
- hm.setName(new QName("pre-H2"));
+ hm.setName("pre-H2");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PreDispatch");
rule.setPhaseFirst(true);
@@ -93,7 +92,7 @@
Handler h4 = new PhaseRuleHandlers();
h4.init(hm1);
hm1.setHandler(h4);
- hm1.setName(new QName("pre-H3"));
+ hm1.setName("pre-H3");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PreDispatch");
rule1.setAfter("pre-H2");
@@ -105,7 +104,7 @@
Handler h5 = new PhaseRuleHandlers();
h5.init(hm2);
hm2.setHandler(h5);
- hm2.setName(new QName("H3"));
+ hm2.setName("H3");
PhaseRule rule2 = new PhaseRule();
rule2.setPhaseName("PreDispatch");
rule2.setAfter("pre-H2");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java Sat Sep 2 02:43:23 2006
@@ -51,7 +51,7 @@
h1.init(hm);
((PhaseRuleHandlers) h1).setName(new QName("PhaseFirstHnadler"));
hm.setHandler(h1);
- hm.setName(new QName("H1"));
+ hm.setName("H1");
PhaseRule rule = new PhaseRule();
rule.setPhaseName("PhaseA");
rule.setPhaseFirst(true);
@@ -65,7 +65,7 @@
((PhaseRuleHandlers) h2).setName(new QName("Second Handler"));
h2.init(hm1);
hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
+ hm1.setName("H2");
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
rule1.setAfter("H1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java Sat Sep 2 02:43:23 2006
@@ -25,15 +25,16 @@
*
*/
-public class Handler3 extends AbstractHandler implements Handler {
- private static final long serialVersionUID = 5364844101018794296L;
- private static final Log log = LogFactory.getLog(Handler3 .class);
+public class Handler3 extends AbstractHandler implements Handler {
+ private static final Log log = LogFactory.getLog(Handler3 .class);
private String message;
- private QName name;
+ private String name;
+
public Handler3() {
- this.message = "inside Module 1";
+ this.message = "inside Module 1";
}
- public QName getName() {
+
+ public String getName() {
return name;
}
@@ -45,7 +46,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java Sat Sep 2 02:43:23 2006
@@ -27,9 +27,9 @@
public class LogHandler extends AbstractHandler implements Handler {
private static final Log log = LogFactory.getLog(LogHandler.class);
- private QName name;
+ private String name;
- public QName getName() {
+ public String getName() {
return name;
}
@@ -41,7 +41,7 @@
log.info(msgContext.getEnvelope().toString());
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java Sat Sep 2 02:43:23 2006
@@ -35,7 +35,7 @@
* Field EMPTY_HANDLER_METADATA
*/
private static HandlerDescription EMPTY_HANDLER_METADATA =
- new HandlerDescription(new QName("deafult Handler"));
+ new HandlerDescription("deafult Handler");
private final static String WSS_PASSWORD = "password";
@@ -80,7 +80,7 @@
*
* @return Returns name.
*/
- public QName getName() {
+ public String getName() {
return handlerDesc.getName();
}
@@ -122,8 +122,8 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- QName name = this.getName();
- return (name != null) ? name.toString() : null;
+ String name = this.getName();
+ return (name != null) ? name : null;
}
Modified: webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java?rev=439567&r1=439566&r2=439567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java Sat Sep 2 02:43:23 2006
@@ -17,18 +17,15 @@
package org.apache.axis2.handlers.soapmonitor;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.Handler;
import org.apache.axis2.handlers.AbstractHandler;
-
-import javax.xml.namespace.QName;
import org.apache.axis2.soapmonitor.servlet.SOAPMonitorConstants;
import org.apache.axis2.soapmonitor.servlet.SOAPMonitorService;
-import org.apache.axis2.addressing.EndpointReference;
public class SOAPMonitorHandler extends AbstractHandler {
- private QName name;
+ private String name;
private static long next_message_id = 1;
@@ -36,99 +33,98 @@
* Constructor
*/
public SOAPMonitorHandler() {
- super();
+ super();
}
-
- public QName getName() {
+
+ public String getName() {
return name;
}
public void revoke(MessageContext msgContext) {
- ;
}
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
- /**
- * Process and SOAP message
- */
- public void invoke(MessageContext messageContext) throws AxisFault {
-
- EndpointReference ref = null;
-
- // Get id, type and content
- Long id;
- Integer type;
- // 'soap request' must be called first
- if (messageContext.getFLOW() == MessageContext.IN_FLOW) {
- // show soap message inside the 'soap request' pane in the applet
- id = assignMessageId(messageContext);
- type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_REQUEST);
- ref = messageContext.getTo();
- } else if (messageContext.getFLOW() == MessageContext.OUT_FLOW) {
- id = getMessageId(messageContext);
- // show soap message inside the 'soap response' pane in the applet
- type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_RESPONSE);
- ref = messageContext.getFrom();
- } else if (messageContext.getFLOW() == MessageContext.IN_FAULT_FLOW) {
- id = getMessageId(messageContext);
- // show soap message inside the 'soap request' pane in the applet
- type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_REQUEST);
- ref = messageContext.getFaultTo();
- } else if (messageContext.getFLOW() == MessageContext.OUT_FAULT_FLOW) {
- id = getMessageId(messageContext);
- // show soap message inside the 'soap response' pane in the applet
- type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_RESPONSE);
- // TODO - How do I get an EPR on MessageContext.OUT_FAULT_FLOW ?
- } else {
- throw new IllegalStateException("unknown FLOW detected in messageContext: " + messageContext.getFLOW());
- }
-
- String target = null;
- if (ref != null) {
- target = ref.getAddress();
- }
- // Check for null target
- if (target == null) {
- target = "";
- }
-
- // Get the SOAP portion of the message
- String soap = null;
- if (messageContext.getEnvelope() != null) {
- soap = messageContext.getEnvelope().toString();
- }
- // If we have an id and a SOAP portion, then send the
- // message to the SOAP monitor service
- if ((id != null) && (soap != null)) {
- SOAPMonitorService.publishMessage(id,type,target,soap);
- }
- }
-
- /**
- * Assign a new message id
- */
- private Long assignMessageId(MessageContext messageContext) {
- Long id = null;
- synchronized(SOAPMonitorConstants.SOAP_MONITOR_ID) {
- id = new Long(next_message_id);
- next_message_id++;
- }
- messageContext.getOperationContext().setProperty(
- SOAPMonitorConstants.SOAP_MONITOR_ID, id);
- return id;
- }
-
- /**
- * Get the already assigned message id
- */
- private Long getMessageId(MessageContext messageContext) {
- Long id = null;
- id = (Long) messageContext.getOperationContext().getProperty(
- SOAPMonitorConstants.SOAP_MONITOR_ID);
- return id;
- }
+ /**
+ * Process and SOAP message
+ */
+ public void invoke(MessageContext messageContext) throws AxisFault {
+
+ EndpointReference ref = null;
+
+ // Get id, type and content
+ Long id;
+ Integer type;
+ // 'soap request' must be called first
+ if (messageContext.getFLOW() == MessageContext.IN_FLOW) {
+ // show soap message inside the 'soap request' pane in the applet
+ id = assignMessageId(messageContext);
+ type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_REQUEST);
+ ref = messageContext.getTo();
+ } else if (messageContext.getFLOW() == MessageContext.OUT_FLOW) {
+ id = getMessageId(messageContext);
+ // show soap message inside the 'soap response' pane in the applet
+ type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_RESPONSE);
+ ref = messageContext.getFrom();
+ } else if (messageContext.getFLOW() == MessageContext.IN_FAULT_FLOW) {
+ id = getMessageId(messageContext);
+ // show soap message inside the 'soap request' pane in the applet
+ type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_REQUEST);
+ ref = messageContext.getFaultTo();
+ } else if (messageContext.getFLOW() == MessageContext.OUT_FAULT_FLOW) {
+ id = getMessageId(messageContext);
+ // show soap message inside the 'soap response' pane in the applet
+ type = new Integer(SOAPMonitorConstants.SOAP_MONITOR_RESPONSE);
+ // TODO - How do I get an EPR on MessageContext.OUT_FAULT_FLOW ?
+ } else {
+ throw new IllegalStateException("unknown FLOW detected in messageContext: " + messageContext.getFLOW());
+ }
+
+ String target = null;
+ if (ref != null) {
+ target = ref.getAddress();
+ }
+ // Check for null target
+ if (target == null) {
+ target = "";
+ }
+
+ // Get the SOAP portion of the message
+ String soap = null;
+ if (messageContext.getEnvelope() != null) {
+ soap = messageContext.getEnvelope().toString();
+ }
+ // If we have an id and a SOAP portion, then send the
+ // message to the SOAP monitor service
+ if ((id != null) && (soap != null)) {
+ SOAPMonitorService.publishMessage(id, type, target, soap);
+ }
+ }
+
+ /**
+ * Assign a new message id
+ */
+ private Long assignMessageId(MessageContext messageContext) {
+ Long id;
+ synchronized (SOAPMonitorConstants.SOAP_MONITOR_ID) {
+ id = new Long(next_message_id);
+ next_message_id++;
+ }
+ messageContext.getOperationContext().setProperty(
+ SOAPMonitorConstants.SOAP_MONITOR_ID, id);
+ return id;
+ }
+
+ /**
+ * Get the already assigned message id
+ */
+ private Long getMessageId(MessageContext messageContext) {
+ Long id;
+ id = (Long) messageContext.getOperationContext().getProperty(
+ SOAPMonitorConstants.SOAP_MONITOR_ID);
+ return id;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org