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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [4/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/
core/src/org/apache/axis2/a...
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Mon Jul 11 10:48:55 2005
@@ -21,7 +21,12 @@
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFault;
+import org.apache.axis2.soap.SOAPFaultCode;
+import org.apache.axis2.soap.SOAPFaultDetail;
+import org.apache.axis2.soap.SOAPFaultReason;
import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
import org.apache.axis2.transport.TransportSender;
@@ -66,7 +71,8 @@
verifyContextBuilt(msgContext);
OperationContext operationContext = msgContext.getOperationContext();
- ArrayList phases = operationContext.getAxisOperation().getPhasesOutFlow();
+ ArrayList phases = operationContext.getAxisOperation()
+ .getPhasesOutFlow();
if (msgContext.isPaused()) {
resumeInvocationPhases(phases, msgContext);
} else {
@@ -99,7 +105,8 @@
try {
ConfigurationContext sysCtx = msgContext.getSystemContext();
ArrayList phases =
- sysCtx.getAxisConfiguration().getInPhasesUptoAndIncludingPostDispatch();
+ sysCtx.getAxisConfiguration()
+ .getInPhasesUptoAndIncludingPostDispatch();
if (paused) {
resumeInvocationPhases(phases, msgContext);
@@ -153,9 +160,11 @@
if (context.getFaultTo() != null) {
faultContext.setFaultTo(context.getFaultTo());
} else {
- Object writer = context.getProperty(MessageContext.TRANSPORT_OUT);
+ Object writer = context.getProperty(
+ MessageContext.TRANSPORT_OUT);
if (writer != null) {
- faultContext.setProperty(MessageContext.TRANSPORT_OUT, writer);
+ faultContext.setProperty(MessageContext.TRANSPORT_OUT,
+ writer);
} else {
//TODO Opps there are no place to send this, we will log and should we throw the exception?
log.error("Error in fault flow", e);
@@ -170,10 +179,15 @@
try {
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(context.getEnvelope().getNamespace().getName())) {
- envelope = OMAbstractFactory.getSOAP12Factory().getDefaultFaultEnvelope();
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ context.getEnvelope().getNamespace().getName())) {
+ envelope =
+ OMAbstractFactory.getSOAP12Factory()
+ .getDefaultFaultEnvelope();
} else {
- envelope = OMAbstractFactory.getSOAP11Factory().getDefaultFaultEnvelope();
+ envelope =
+ OMAbstractFactory.getSOAP11Factory()
+ .getDefaultFaultEnvelope();
}
} catch (SOAPProcessingException e1) {
throw new AxisFault(e1);
@@ -184,7 +198,9 @@
// body.addFault(new AxisFault(e.getMessage(), e));
body.getFault().setException(new AxisFault(e.getMessage(), e));
- extractFaultInformationFromMessageContext(context, envelope.getBody().getFault());
+ extractFaultInformationFromMessageContext(context,
+ envelope.getBody()
+ .getFault());
faultContext.setEnvelope(envelope);
@@ -206,28 +222,34 @@
}
}
- private void extractFaultInformationFromMessageContext(MessageContext context, SOAPFault fault) {
- Object faultCode = context.getProperty(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME);
+ private void extractFaultInformationFromMessageContext(
+ MessageContext context, SOAPFault fault) {
+ Object faultCode = context.getProperty(
+ SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME);
if (faultCode != null) {
fault.setCode((SOAPFaultCode) faultCode);
}
- Object faultReason = context.getProperty(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME);
+ Object faultReason = context.getProperty(
+ SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME);
if (faultReason != null) {
fault.setReason((SOAPFaultReason) faultReason);
}
- Object faultRole = context.getProperty(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME);
+ Object faultRole = context.getProperty(
+ SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME);
if (faultRole != null) {
fault.getRole().setText((String) faultRole);
}
- Object faultNode = context.getProperty(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME);
+ Object faultNode = context.getProperty(
+ SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME);
if (faultNode != null) {
fault.getNode().setText((String) faultNode);
}
- Object faultDetail = context.getProperty(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
+ Object faultDetail = context.getProperty(
+ SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
if (faultDetail != null) {
fault.setDetail((SOAPFaultDetail) faultDetail);
}
@@ -253,7 +275,8 @@
}
}
- public void resumeInvocationPhases(ArrayList phases, MessageContext msgctx) throws AxisFault {
+ public void resumeInvocationPhases(ArrayList phases,
+ MessageContext msgctx) throws AxisFault {
msgctx.setPausedFalse();
int count = phases.size();
boolean foudMatch = false;
@@ -262,7 +285,8 @@
Phase phase = (Phase) phases.get(i);
if (phase.getPhaseName().equals(msgctx.getPausedPhaseName())) {
foudMatch = true;
- phase.invokeStartFromHandler(msgctx.getPausedHandlerName(), msgctx);
+ phase.invokeStartFromHandler(msgctx.getPausedHandlerName(),
+ msgctx);
} else {
if (foudMatch) {
phase.invoke(msgctx);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java Mon Jul 11 10:48:55 2005
@@ -25,15 +25,19 @@
public class DependencyManager {
private final static String MESSAGE_CONTEXT_INJECTION_METHOD = "init";
- public static void configureBusinussLogicProvider(Object obj, MessageContext msgctx)
+ public static void configureBusinussLogicProvider(Object obj,
+ MessageContext msgctx)
throws AxisFault {
try {
Class classToLoad = obj.getClass();
Method[] methods = classToLoad.getMethods();
for (int i = 0; i < methods.length; i++) {
- if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName()) && methods[i].getParameterTypes().length == 1 &&
- methods[i].getParameterTypes()[0] == MessageContext.class) {
+ if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(
+ methods[i].getName()) &&
+ methods[i].getParameterTypes().length == 1 &&
+ methods[i].getParameterTypes()[0] ==
+ MessageContext.class) {
methods[i].invoke(obj, new Object[]{msgctx});
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPostConditionsEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPostConditionsEvaluator.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPostConditionsEvaluator.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPostConditionsEvaluator.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "DispatchPostConditionsEvaluator");
+ new QName("http://axis.ws.apache.org",
+ "DispatchPostConditionsEvaluator");
/**
* Constructor Dispatcher
@@ -51,11 +52,18 @@
public final void invoke(MessageContext msgctx) throws AxisFault {
EndpointReference toEPR = msgctx.getTo();
if (msgctx.getServiceContext() == null) {
- throw new AxisFault("Service Not found EPR is " + ((toEPR != null) ? toEPR.getAddress() : ""));
+ throw new AxisFault(
+ "Service Not found EPR is " +
+ ((toEPR != null) ? toEPR.getAddress() : ""));
}
- if (msgctx.getServiceContext() != null && msgctx.getOperationContext() == null) {
- throw new AxisFault("Operation Not found EPR is " + ((toEPR != null) ? toEPR.getAddress() : "") + " and WSA Action = " + msgctx.getWSAAction());
+ if (msgctx.getServiceContext() != null &&
+ msgctx.getOperationContext() == null) {
+ throw new AxisFault(
+ "Operation Not found EPR is " +
+ ((toEPR != null) ? toEPR.getAddress() : "") +
+ " and WSA Action = " +
+ msgctx.getWSAAction());
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java Mon Jul 11 10:48:55 2005
@@ -109,7 +109,10 @@
* @param index
*/
public void addHandler(Handler handler, int index) {
- log.info("Handler " + handler.getName() + "Added to place " + 1 + " At the Phase " + phaseName);
+ log.info(
+ "Handler " + handler.getName() + "Added to place " + 1 +
+ " At the Phase " +
+ phaseName);
handlers.add(index, handler);
}
@@ -119,7 +122,9 @@
* @param handler
*/
public void addHandler(Handler handler) {
- log.info("Handler " + handler.getName() + " Added to the Phase " + phaseName);
+ log.info(
+ "Handler " + handler.getName() + " Added to the Phase " +
+ phaseName);
handlers.add(handler);
}
@@ -137,9 +142,9 @@
return;
} else {
log.info("Invoke the Phase first handler "
- + phaseFirst.getName()
- + "with in the Phase "
- + phaseName);
+ + phaseFirst.getName()
+ + "with in the Phase "
+ + phaseName);
phaseFirst.invoke(msgctx);
}
}
@@ -149,12 +154,13 @@
if (msgctx.isPaused()) {
break;
} else {
- Handler handler = (Handler) handlers.get(indexOfHandlerToExecute);
+ Handler handler = (Handler) handlers.get(
+ indexOfHandlerToExecute);
if (handler != null) {
log.info("Invoke the Handler "
- + handler.getName()
- + "with in the Phase "
- + phaseName);
+ + handler.getName()
+ + "with in the Phase "
+ + phaseName);
handler.invoke(msgctx);
//This line should be after the invoke as if the invocation failed this handlers is takn care of and
//no need to revoke agien
@@ -168,9 +174,9 @@
return;
} else {
log.info("Invoke the Phase first handler "
- + phaseLast.getName()
- + "with in the Phase "
- + phaseName);
+ + phaseLast.getName()
+ + "with in the Phase "
+ + phaseName);
phaseLast.invoke(msgctx);
}
}
@@ -199,14 +205,15 @@
*/
private int getBeforeAfter(Handler handler) throws PhaseException {
if ((!handler.getHandlerDesc().getRules().getBefore().equals(""))
- && (!handler.getHandlerDesc().getRules().getAfter().equals(""))) {
+ &&
+ (!handler.getHandlerDesc().getRules().getAfter().equals(""))) {
if (handler
.getHandlerDesc()
.getRules()
.getBefore()
.equals(handler.getHandlerDesc().getRules().getAfter())) {
throw new PhaseException("Both before and after cannot be the same for this handler"
- + handler.getName());
+ + handler.getName());
}
return BOTH_BEFORE_AFTER;
} else if (!handler.getHandlerDesc().getRules().getBefore().equals("")) {
@@ -227,11 +234,11 @@
public void setPhaseFirst(Handler phaseFirst) throws PhaseException {
if (phasefirstset) {
throw new PhaseException("PhaseFirst alredy has been set, cannot have two phaseFirst Handler for same phase "
- + this.getPhaseName());
+ + this.getPhaseName());
} else {
if (getBeforeAfter(phaseFirst) != ANYWHERE) {
throw new PhaseException("Handler with PhaseFirst can not have any before or after proprty error in "
- + phaseFirst.getName());
+ + phaseFirst.getName());
} else {
this.phaseFirst = phaseFirst;
}
@@ -248,11 +255,11 @@
public void setPhaseLast(Handler phaseLast) throws PhaseException {
if (phaselastset) {
throw new PhaseException("PhaseLast already has been set, cannot have two PhaseLast Handler for same phase "
- + this.getPhaseName());
+ + this.getPhaseName());
} else {
if (getBeforeAfter(phaseLast) != ANYWHERE) {
throw new PhaseException("Handler with PhaseLast property can not have any before or after property error in "
- + phaseLast.getName());
+ + phaseLast.getName());
} else {
this.phaseLast = phaseLast;
}
@@ -268,16 +275,19 @@
*/
public void addHandler(HandlerDescription handler) throws PhaseException {
if (isonehanlder) {
- throw new PhaseException(this.getPhaseName()
- + "can only have one handler, since there is a "
- + "handler with both phaseFirst and PhaseLast true ");
+ throw new PhaseException(
+ this.getPhaseName()
+ + "can only have one handler, since there is a "
+ + "handler with both phaseFirst and PhaseLast true ");
} else {
- if (handler.getRules().isPhaseFirst() && handler.getRules().isPhaseLast()) {
+ if (handler.getRules().isPhaseFirst() &&
+ handler.getRules().isPhaseLast()) {
if (handlers.size() > 0) {
- throw new PhaseException(this.getPhaseName()
- + " can not have more than one handler "
- + handler.getName()
- + " is invalid or incorrect phase rules");
+ throw new PhaseException(
+ this.getPhaseName()
+ + " can not have more than one handler "
+ + handler.getName()
+ + " is invalid or incorrect phase rules");
} else {
handlers.add(handler.getHandler());
isonehanlder = true;
@@ -306,12 +316,14 @@
*/
private void validatebefore(Handler handler) throws PhaseException {
if (phaseFirst != null) {
- String phasFirstname = phaseFirst.getHandlerDesc().getName().getLocalPart();
- if (handler.getHandlerDesc().getRules().getBefore().equals(phasFirstname)) {
+ String phasFirstname = phaseFirst.getHandlerDesc().getName()
+ .getLocalPart();
+ if (handler.getHandlerDesc().getRules().getBefore().equals(
+ phasFirstname)) {
throw new PhaseException("Trying to insert a Handler "
- + handler.getName()
- + " before phaseFirst "
- + phasFirstname);
+ + handler.getName()
+ + " before phaseFirst "
+ + phasFirstname);
}
}
}
@@ -324,12 +336,13 @@
*/
private void validateafter(Handler handler) throws PhaseException {
if (phaseLast != null) {
- String phaseLastName = phaseLast.getHandlerDesc().getName().getLocalPart();
+ String phaseLastName = phaseLast.getHandlerDesc().getName()
+ .getLocalPart();
if (handler.getName().equals(phaseLastName)) {
throw new PhaseException("Try to insert a Handler "
- + handler.getName()
- + " after phaseLast "
- + phaseLastName);
+ + handler.getName()
+ + " after phaseLast "
+ + phaseLastName);
}
}
}
@@ -342,14 +355,16 @@
private void insertBefore(Handler handler) {
String beforename = handler.getHandlerDesc().getRules().getBefore();
if (phaseLast != null) {
- if (phaseLast.getHandlerDesc().getName().getLocalPart().equals(beforename)) {
+ if (phaseLast.getHandlerDesc().getName().getLocalPart().equals(
+ beforename)) {
handlers.add(handler);
return;
}
}
for (int i = 0; i < handlers.size(); i++) {
Handler temphandler = (Handler) handlers.get(i);
- if (temphandler.getHandlerDesc().getName().getLocalPart().equals(beforename)) {
+ if (temphandler.getHandlerDesc().getName().getLocalPart().equals(
+ beforename)) {
if (i == 0) {
handlers.add(0, handler);
return;
@@ -371,7 +386,8 @@
private void insertAfter(Handler handler) {
String afterName = handler.getHandlerDesc().getRules().getAfter();
if (phaseFirst != null) {
- if (phaseFirst.getHandlerDesc().getName().getLocalPart().equals(afterName)) {
+ if (phaseFirst.getHandlerDesc().getName().getLocalPart().equals(
+ afterName)) {
handlers.add(0, handler);
return;
}
@@ -379,7 +395,8 @@
int count = handlers.size();
for (int i = 0; i < count; i++) {
Handler temphandler = (Handler) handlers.get(i);
- if (temphandler.getHandlerDesc().getName().getLocalPart().equals(afterName)) {
+ if (temphandler.getHandlerDesc().getName().getLocalPart().equals(
+ afterName)) {
if (i == count - 1) {
handlers.add(handler);
return;
@@ -449,17 +466,23 @@
.getHandlerDesc()
.getRules()
.getAfter()
- .equals(temphandler.getHandlerDesc().getName().getLocalPart())) {
+ .equals(
+ temphandler.getHandlerDesc().getName()
+ .getLocalPart())) {
after = i;
} else if (
- handler.getHandlerDesc().getRules().getBefore().equals(temphandler.getHandlerDesc().getName().getLocalPart())) {
+ handler.getHandlerDesc().getRules().getBefore().equals(
+ temphandler.getHandlerDesc().getName()
+ .getLocalPart())) {
before = i;
}
if ((after >= 0) && (before >= 0)) {
// no point of continue since both the before and after index has found
if (after > before) {
//TODO fix me Deepal , (have to check this)
- throw new PhaseException("incorrect handler order for " + handler.getHandlerDesc().getName());
+ throw new PhaseException(
+ "incorrect handler order for " +
+ handler.getHandlerDesc().getName());
} else {
if (after + 1 <= handlers.size()) {
handlers.add(after + 1, handler);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Mon Jul 11 10:48:55 2005
@@ -32,7 +32,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "RequestURIBasedDispatcher");
+ new QName("http://axis.ws.apache.org",
+ "RequestURIBasedDispatcher");
QName serviceName = null;
QName operatoinName = null;
@@ -61,7 +62,8 @@
EndpointReference toEPR = messageContext.getTo();
if (toEPR != null) {
String filePart = toEPR.getAddress();
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart);
+ String[] values = Utils.parseRequestURLForServiceAndOperation(
+ filePart);
if (values[1] != null) {
operatoinName = new QName(values[1]);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "SOAPActionBasedDispatcher");
+ new QName("http://axis.ws.apache.org",
+ "SOAPActionBasedDispatcher");
public SOAPActionBasedDispatcher() {
init(new HandlerDescription(NAME));
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Mon Jul 11 10:48:55 2005
@@ -33,7 +33,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "SOAPMessageBodyBasedDispatcher");
+ new QName("http://axis.ws.apache.org",
+ "SOAPMessageBodyBasedDispatcher");
QName serviceName = null;
QName operatoinName = null;
@@ -47,7 +48,8 @@
public OperationDescription findOperation(ServiceDescription service,
MessageContext messageContext)
throws AxisFault {
- OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement();
+ OMElement bodyFirstChild = messageContext.getEnvelope().getBody()
+ .getFirstElement();
operatoinName = new QName(bodyFirstChild.getLocalName());
OperationDescription axisOp = service.getOperation(operatoinName);
@@ -59,12 +61,14 @@
*/
public ServiceDescription findService(MessageContext messageContext) throws AxisFault {
final String URI_ID_STRING = "/services";
- OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement();
+ OMElement bodyFirstChild = messageContext.getEnvelope().getBody()
+ .getFirstElement();
OMNamespace ns = bodyFirstChild.getNamespace();
if (ns != null) {
String filePart = ns.getName();
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart);
+ String[] values = Utils.parseRequestURLForServiceAndOperation(
+ filePart);
if (values[1] != null) {
operatoinName = new QName(values[1]);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java Mon Jul 11 10:48:55 2005
@@ -64,10 +64,12 @@
if (isPhaseExist(phaseName)) {
getPhase(phaseName).addHandler(handler);
} else {
- throw new PhaseException("Invalid Phase ," + phaseName
- + "for the handler "
- + handler.getName()
- + " dose not exit in axis2.xml or refering to phase in diffrent flow");
+ throw new PhaseException(
+ "Invalid Phase ," + phaseName
+ + "for the handler "
+ + handler.getName()
+ +
+ " dose not exit in axis2.xml or refering to phase in diffrent flow");
}
}
@@ -100,9 +102,12 @@
Class handlerClass = null;
Handler handler;
for (int i = 0; i < handlers.size(); i++) {
- HandlerDescription description = (HandlerDescription) handlers.get(i);
- handlerClass = Class.forName(description.getClassName(), true,
- Thread.currentThread().getContextClassLoader());
+ HandlerDescription description = (HandlerDescription) handlers.get(
+ i);
+ handlerClass =
+ Class.forName(description.getClassName(),
+ true,
+ Thread.currentThread().getContextClassLoader());
handler =
(Handler) handlerClass.newInstance();
handler.init(description);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,13 @@
*/
package org.apache.axis2.phaseresolver;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.Flow;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.AxisFault;
@@ -138,14 +144,18 @@
axisService.addToEngagModuleList(module);
operation.addToEngageModuleList(module);
} else {
- throw new PhaseException("referance to invalid module " + modulename.getLocalPart() + " by axis2.xml");
+ throw new PhaseException(
+ "referance to invalid module " +
+ modulename.getLocalPart() +
+ " by axis2.xml");
}
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
+ if (!PhaseValidator.isSystemPhases(
+ metadata.getRules().getPhaseName())) {
allHandlers.add(metadata);
} else {
/**
@@ -198,22 +208,27 @@
switch (flowtype) {
case PhaseMetadata.IN_FLOW:
{
- phaseHolder = new PhaseHolder(operation.getRemainingPhasesInFlow());
+ phaseHolder =
+ new PhaseHolder(
+ operation.getRemainingPhasesInFlow());
break;
}
case PhaseMetadata.OUT_FLOW:
{
- phaseHolder = new PhaseHolder(operation.getPhasesOutFlow());
+ phaseHolder =
+ new PhaseHolder(operation.getPhasesOutFlow());
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- phaseHolder = new PhaseHolder(operation.getPhasesInFaultFlow());
+ phaseHolder =
+ new PhaseHolder(operation.getPhasesInFaultFlow());
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- phaseHolder = new PhaseHolder(operation.getPhasesOutFaultFlow());
+ phaseHolder =
+ new PhaseHolder(operation.getPhasesOutFaultFlow());
break;
}
}
@@ -272,7 +287,8 @@
ArrayList handlers = new ArrayList();
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- metadata.getRules().setPhaseName(PhaseMetadata.TRANSPORT_PHASE);
+ metadata.getRules().setPhaseName(
+ PhaseMetadata.TRANSPORT_PHASE);
handlers.add(metadata);
}
new PhaseHolder().buildTransportHandlerChain(phase, handlers);
@@ -312,7 +328,8 @@
ArrayList handlers = new ArrayList();
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- metadata.getRules().setPhaseName(PhaseMetadata.TRANSPORT_PHASE);
+ metadata.getRules().setPhaseName(
+ PhaseMetadata.TRANSPORT_PHASE);
handlers.add(metadata);
}
new PhaseHolder().buildTransportHandlerChain(phase, handlers);
@@ -342,14 +359,16 @@
* @param module
* @throws PhaseException
*/
- public void engageModuleToServiceFromGlobal(ServiceDescription service, ModuleDescription module) throws PhaseException {
+ public void engageModuleToServiceFromGlobal(ServiceDescription service,
+ ModuleDescription module) throws PhaseException {
HashMap opeartions = service.getOperations();
Collection opCol = opeartions.values();
boolean engaged = false;
for (Iterator iterator = opCol.iterator(); iterator.hasNext();) {
OperationDescription opDesc = (OperationDescription) iterator.next();
Collection modules = opDesc.getModules();
- for (Iterator iterator1 = modules.iterator(); iterator1.hasNext();) {
+ for (Iterator iterator1 = modules.iterator();
+ iterator1.hasNext();) {
ModuleDescription description = (ModuleDescription) iterator1.next();
if (description.getName().equals(module.getName())) {
engaged = true;
@@ -364,22 +383,29 @@
switch (type) {
case PhaseMetadata.IN_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getRemainingPhasesInFlow());
+ phaseHolder =
+ new PhaseHolder(
+ opDesc.getRemainingPhasesInFlow());
break;
}
case PhaseMetadata.OUT_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesOutFlow());
+ phaseHolder =
+ new PhaseHolder(opDesc.getPhasesOutFlow());
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesInFaultFlow());
+ phaseHolder =
+ new PhaseHolder(
+ opDesc.getPhasesInFaultFlow());
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesOutFaultFlow());
+ phaseHolder =
+ new PhaseHolder(
+ opDesc.getPhasesOutFaultFlow());
break;
}
}
@@ -411,7 +437,8 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
+ if (!PhaseValidator.isSystemPhases(
+ metadata.getRules().getPhaseName())) {
phaseHolder.addHandler(metadata);
} else {
continue;
@@ -430,22 +457,30 @@
switch (type) {
case PhaseMetadata.IN_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getInPhasesUptoAndIncludingPostDispatch());
+ phaseHolder =
+ new PhaseHolder(
+ ((AxisConfigurationImpl) axisConfig).getInPhasesUptoAndIncludingPostDispatch());
break;
}
case PhaseMetadata.OUT_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFlow());
+ phaseHolder =
+ new PhaseHolder(
+ ((AxisConfigurationImpl) axisConfig).getOutFlow());
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getInFaultFlow());
+ phaseHolder =
+ new PhaseHolder(
+ ((AxisConfigurationImpl) axisConfig).getInFaultFlow());
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFaultFlow());
+ phaseHolder =
+ new PhaseHolder(
+ ((AxisConfigurationImpl) axisConfig).getOutFaultFlow());
break;
}
}
@@ -477,7 +512,8 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- if (PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
+ if (PhaseValidator.isSystemPhases(
+ metadata.getRules().getPhaseName())) {
phaseHolder.addHandler(metadata);
} else {
/**
@@ -494,14 +530,16 @@
}
- public void engageModuleToService(ServiceDescription service, ModuleDescription module) throws PhaseException {
+ public void engageModuleToService(ServiceDescription service,
+ ModuleDescription module) throws PhaseException {
HashMap opeartions = service.getOperations();
Collection opCol = opeartions.values();
boolean engaged = false;
for (Iterator iterator = opCol.iterator(); iterator.hasNext();) {
OperationDescription opDesc = (OperationDescription) iterator.next();
Collection modules = opDesc.getModules();
- for (Iterator iterator1 = modules.iterator(); iterator1.hasNext();) {
+ for (Iterator iterator1 = modules.iterator();
+ iterator1.hasNext();) {
ModuleDescription description = (ModuleDescription) iterator1.next();
if (description.getName().equals(module.getName())) {
engaged = true;
@@ -517,29 +555,35 @@
}
- public void engageModuleToOperation(OperationDescription operation, ModuleDescription module) throws PhaseException {
+ public void engageModuleToOperation(OperationDescription operation,
+ ModuleDescription module) throws PhaseException {
OperationDescription opDesc = operation;
Flow flow = null;
for (int type = 1; type < 5; type++) {
switch (type) {
case PhaseMetadata.IN_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getRemainingPhasesInFlow());
+ phaseHolder =
+ new PhaseHolder(
+ opDesc.getRemainingPhasesInFlow());
break;
}
case PhaseMetadata.OUT_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesOutFlow());
+ phaseHolder =
+ new PhaseHolder(opDesc.getPhasesOutFlow());
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesInFaultFlow());
+ phaseHolder =
+ new PhaseHolder(opDesc.getPhasesInFaultFlow());
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- phaseHolder = new PhaseHolder(opDesc.getPhasesOutFaultFlow());
+ phaseHolder =
+ new PhaseHolder(opDesc.getPhasesOutFaultFlow());
break;
}
}
@@ -569,11 +613,13 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
+ if (!PhaseValidator.isSystemPhases(
+ metadata.getRules().getPhaseName())) {
phaseHolder.addHandler(metadata);
} else {
- throw new PhaseException("Service specific module can not refer system pre defined phases : "
- + metadata.getRules().getPhaseName());
+ throw new PhaseException(
+ "Service specific module can not refer system pre defined phases : "
+ + metadata.getRules().getPhaseName());
}
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/util/PhaseValidator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/util/PhaseValidator.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/util/PhaseValidator.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/util/PhaseValidator.java Mon Jul 11 10:48:55 2005
@@ -31,8 +31,10 @@
public static int SERVICE_MODULE = 1;
public static boolean isSystemPhases(String phaseName) {
- if (PhaseMetadata.PHASE_TRANSPORTIN.equals(phaseName) || PhaseMetadata.PHASE_DISPATCH.equals(phaseName) ||
- PhaseMetadata.PHASE_POST_DISPATCH.equals(phaseName) || PhaseMetadata.PHASE_PRE_DISPATCH.equals(phaseName)) {
+ if (PhaseMetadata.PHASE_TRANSPORTIN.equals(phaseName) ||
+ PhaseMetadata.PHASE_DISPATCH.equals(phaseName) ||
+ PhaseMetadata.PHASE_POST_DISPATCH.equals(phaseName) ||
+ PhaseMetadata.PHASE_PRE_DISPATCH.equals(phaseName)) {
return true;
}
return false;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -28,19 +28,25 @@
extends AbstractMessageReceiver {
protected Log log = LogFactory.getLog(getClass());
- public abstract void invokeBusinessLogic(MessageContext inMessage, ServerCallback callback)
+ public abstract void invokeBusinessLogic(MessageContext inMessage,
+ ServerCallback callback)
throws AxisFault;
public final void recieve(final MessageContext messgeCtx) throws AxisFault {
final ServerCallback callback = new ServerCallback() {
public void handleResult(MessageContext result) throws AxisFault {
AxisEngine engine =
- new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
+ new AxisEngine(
+ messgeCtx.getOperationContext()
+ .getServiceContext()
+ .getEngineContext());
engine.send(messgeCtx);
}
public void handleFault(AxisFault fault) throws AxisFault {
- AxisEngine engine = new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
+ AxisEngine engine = new AxisEngine(
+ messgeCtx.getOperationContext().getServiceContext()
+ .getEngineContext());
engine.handleFault(messgeCtx, fault);
}
};
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -35,32 +35,39 @@
public final void recieve(MessageContext messgeCtx) throws AxisFault {
MessageContext newmsgCtx =
new MessageContext(messgeCtx.getSystemContext(),
- messgeCtx.getSessionContext(),
- messgeCtx.getTransportIn(),
- messgeCtx.getTransportOut());
+ messgeCtx.getSessionContext(),
+ messgeCtx.getTransportIn(),
+ messgeCtx.getTransportOut());
- newmsgCtx.setMessageInformationHeaders(new MessageInformationHeadersCollection());
+ newmsgCtx.setMessageInformationHeaders(
+ new MessageInformationHeadersCollection());
MessageInformationHeadersCollection oldMessageInfoHeaders =
messgeCtx.getMessageInformationHeaders();
MessageInformationHeadersCollection messageInformationHeaders =
new MessageInformationHeadersCollection();
messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
- messageInformationHeaders.setFaultTo(oldMessageInfoHeaders.getFaultTo());
+ messageInformationHeaders.setFaultTo(
+ oldMessageInfoHeaders.getFaultTo());
messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
- messageInformationHeaders.setRelatesTo(new RelatesTo(oldMessageInfoHeaders.getMessageId(),
- AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+ messageInformationHeaders.setRelatesTo(
+ new RelatesTo(oldMessageInfoHeaders.getMessageId(),
+ AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);
newmsgCtx.setOperationContext(messgeCtx.getOperationContext());
newmsgCtx.setServiceContext(messgeCtx.getServiceContext());
- newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT, messgeCtx.getProperty(MessageContext.TRANSPORT_OUT));
- newmsgCtx.setProperty(HTTPConstants.HTTPOutTransportInfo, messgeCtx.getProperty(HTTPConstants.HTTPOutTransportInfo));
+ newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT,
+ messgeCtx.getProperty(MessageContext.TRANSPORT_OUT));
+ newmsgCtx.setProperty(HTTPConstants.HTTPOutTransportInfo,
+ messgeCtx.getProperty(HTTPConstants.HTTPOutTransportInfo));
newmsgCtx.setDoingREST(messgeCtx.isDoingREST());
newmsgCtx.setDoingMTOM(messgeCtx.isDoingMTOM());
invokeBusinessLogic(messgeCtx, newmsgCtx);
AxisEngine engine =
- new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
+ new AxisEngine(
+ messgeCtx.getOperationContext().getServiceContext()
+ .getEngineContext());
engine.send(newmsgCtx);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -51,19 +51,24 @@
String nsURI = msgContext.getEnvelope().getNamespace().getName();
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
fac = OMAbstractFactory.getSOAP12Factory();
- } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
+ } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ nsURI)) {
fac = OMAbstractFactory.getSOAP11Factory();
} else {
- throw new AxisFault("Unknown SOAP Version. Current Axis handles only SOAP 1.1 and SOAP 1.2 messages");
+ throw new AxisFault(
+ "Unknown SOAP Version. Current Axis handles only SOAP 1.1 and SOAP 1.2 messages");
}
ServiceDescription service =
- msgContext.getOperationContext().getServiceContext().getServiceConfig();
+ msgContext.getOperationContext().getServiceContext()
+ .getServiceConfig();
ClassLoader classLoader = service.getClassLoader();
Parameter implInfoParam = service.getParameter(SERVICE_CLASS);
if (implInfoParam != null) {
Class implClass =
- Class.forName((String) implInfoParam.getValue(), true, classLoader);
+ Class.forName((String) implInfoParam.getValue(),
+ true,
+ classLoader);
return implClass.newInstance();
} else {
throw new AxisFault("SERVICE_CLASS parameter is not specified");
@@ -83,24 +88,30 @@
*/
protected Object getTheImplementationObject(MessageContext msgContext) throws AxisFault {
ServiceDescription service =
- msgContext.getOperationContext().getServiceContext().getServiceConfig();
+ msgContext.getOperationContext().getServiceContext()
+ .getServiceConfig();
Parameter scopeParam = service.getParameter(SCOPE);
QName serviceName = service.getName();
- if (scopeParam != null && Constants.SESSION_SCOPE.equals(scopeParam.getValue())) {
+ if (scopeParam != null &&
+ Constants.SESSION_SCOPE.equals(scopeParam.getValue())) {
SessionContext sessionContext = msgContext.getSessionContext();
synchronized (sessionContext) {
- Object obj = sessionContext.getProperty(serviceName.getLocalPart());
+ Object obj = sessionContext.getProperty(
+ serviceName.getLocalPart());
if (obj == null) {
obj = makeNewServiceObject(msgContext);
- sessionContext.setProperty(serviceName.getLocalPart(), obj);
+ sessionContext.setProperty(serviceName.getLocalPart(),
+ obj);
}
return obj;
}
- } else if (scopeParam != null && Constants.APPLICATION_SCOPE.equals(scopeParam.getValue())) {
+ } else if (scopeParam != null &&
+ Constants.APPLICATION_SCOPE.equals(scopeParam.getValue())) {
ConfigurationContext globalContext = msgContext.getSystemContext();
synchronized (globalContext) {
- Object obj = globalContext.getProperty(serviceName.getLocalPart());
+ Object obj = globalContext.getProperty(
+ serviceName.getLocalPart());
if (obj == null) {
obj = makeNewServiceObject(msgContext);
globalContext.setProperty(serviceName.getLocalPart(), obj);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -34,7 +34,9 @@
try {
invokeBusinessLogic(messgeCtx);
} catch (AxisFault e) {
- AxisEngine engine = new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
+ AxisEngine engine = new AxisEngine(
+ messgeCtx.getOperationContext().getServiceContext()
+ .getEngineContext());
engine.handleFault(messgeCtx, e);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -76,9 +76,11 @@
Class ImplClass = obj.getClass();
DependencyManager.configureBusinussLogicProvider(obj, msgContext);
- OperationDescription op = msgContext.getOperationContext().getAxisOperation();
+ OperationDescription op = msgContext.getOperationContext()
+ .getAxisOperation();
if (op == null) {
- throw new AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
+ throw new AxisFault(
+ "Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
}
String methodName = op.getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
@@ -91,13 +93,17 @@
Class[] parameters = method.getParameterTypes();
if ((parameters != null)
&& (parameters.length == 1)
- && OMElement.class.getName().equals(parameters[0].getName())) {
- OMElement methodElement = msgContext.getEnvelope().getBody().getFirstElement();
+ &&
+ OMElement.class.getName().equals(parameters[0].getName())) {
+ OMElement methodElement = msgContext.getEnvelope().getBody()
+ .getFirstElement();
OMElement parmeter = null;
SOAPEnvelope envelope = null;
- String style = msgContext.getOperationContext().getAxisOperation().getStyle();
+ String style = msgContext.getOperationContext()
+ .getAxisOperation()
+ .getStyle();
if (WSDLService.STYLE_DOC.equals(style)) {
parmeter = methodElement;
@@ -105,7 +111,9 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ envelope =
+ OMAbstractFactory.getSOAP11Factory()
+ .getDefaultEnvelope();
envelope.getBody().setFirstChild(result);
} else if (WSDLService.STYLE_RPC.equals(style)) {
@@ -117,8 +125,10 @@
SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
envelope = fac.getDefaultEnvelope();
- OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
- OMElement responseMethodName = fac.createOMElement(methodName + "Response", ns);
+ OMNamespace ns = fac.createOMNamespace("http://soapenc/",
+ "res");
+ OMElement responseMethodName = fac.createOMElement(
+ methodName + "Response", ns);
if (result != null) {
responseMethodName.addChild(result);
}
@@ -129,8 +139,10 @@
throw new AxisFault("Unknown style ");
}
} else {
- throw new AxisFault("Raw Xml provider supports only the methods bearing the signature public OMElement "
- + "<method-name>(OMElement) where the method name is anything");
+ throw new AxisFault(
+ "Raw Xml provider supports only the methods bearing the signature public OMElement "
+ +
+ "<method-name>(OMElement) where the method name is anything");
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Mon Jul 11 10:48:55 2005
@@ -58,7 +58,8 @@
scope = Constants.APPLICATION_SCOPE;
}
- public void invokeBusinessLogic(MessageContext msgContext, MessageContext newmsgContext)
+ public void invokeBusinessLogic(MessageContext msgContext,
+ MessageContext newmsgContext)
throws AxisFault {
try {
@@ -71,10 +72,13 @@
//Inject the Message Context if it is asked for
DependencyManager.configureBusinussLogicProvider(obj, msgContext);
- OperationDescription opDesc = msgContext.getOperationContext().getAxisOperation();
+ OperationDescription opDesc = msgContext.getOperationContext()
+ .getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
- String style = msgContext.getOperationContext().getAxisOperation().getStyle();
+ String style = msgContext.getOperationContext()
+ .getAxisOperation()
+ .getStyle();
Class[] parameters = method.getParameterTypes();
Object[] args = null;
@@ -84,35 +88,52 @@
} else if (parameters.length == 1) {
OMElement omElement = null;
if (WSDLService.STYLE_DOC.equals(style)) {
- omElement = msgContext.getEnvelope().getBody().getFirstElement();
+ omElement =
+ msgContext.getEnvelope().getBody()
+ .getFirstElement();
} else if (WSDLService.STYLE_RPC.equals(style)) {
- OMElement operationElement = msgContext.getEnvelope().getBody().getFirstElement();
+ OMElement operationElement = msgContext.getEnvelope()
+ .getBody()
+ .getFirstElement();
if (operationElement != null) {
- if (method.getName().equals(operationElement.getLocalName())
- || operationElement.getLocalName() != null && operationElement.getLocalName().startsWith(method.getName())) {
+ if (method.getName().equals(
+ operationElement.getLocalName())
+ ||
+ operationElement.getLocalName() != null &&
+ operationElement.getLocalName().startsWith(
+ method.getName())) {
omElement = operationElement.getFirstElement();
} else {
- throw new AxisFault("Operation Name does not match the immediate child name, expected " + method.getName() + " but get " + operationElement.getLocalName());
+ throw new AxisFault(
+ "Operation Name does not match the immediate child name, expected " +
+ method.getName() +
+ " but get " +
+ operationElement.getLocalName());
}
} else {
- throw new AxisFault("rpc style expect the immediate child of the SOAP body ");
+ throw new AxisFault(
+ "rpc style expect the immediate child of the SOAP body ");
}
} else {
throw new AxisFault("Unknown style ");
}
args = new Object[]{omElement};
} else {
- throw new AxisFault("Raw Xml provider supports only the methods bearing the signature public OMElement "
- + "<method-name>(OMElement) where the method name is anything");
+ throw new AxisFault(
+ "Raw Xml provider supports only the methods bearing the signature public OMElement "
+ +
+ "<method-name>(OMElement) where the method name is anything");
}
OMElement result = (OMElement) method.invoke(obj, args);
OMElement bodyContent = null;
if (WSDLService.STYLE_RPC.equals(style)) {
- OMNamespace ns = getSOAPFactory().createOMNamespace("http://soapenc/", "res");
+ OMNamespace ns = getSOAPFactory().createOMNamespace(
+ "http://soapenc/", "res");
bodyContent =
- getSOAPFactory().createOMElement(method.getName() + "Response", ns);
+ getSOAPFactory().createOMElement(
+ method.getName() + "Response", ns);
bodyContent.addChild(result);
} else {
bodyContent = result;
@@ -124,7 +145,9 @@
}
newmsgContext.setEnvelope(envelope);
} else {
- throw new AxisFault("Implementation class does not define a method called" + opDesc.getName());
+ throw new AxisFault(
+ "Implementation class does not define a method called" +
+ opDesc.getName());
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java Mon Jul 11 10:48:55 2005
@@ -52,7 +52,7 @@
* Field NAME
*/
public static final QName NAME = new QName("http://axis.ws.apache.org",
- "TransportSender");
+ "TransportSender");
/**
* Constructor AbstractTransportSender
@@ -101,18 +101,21 @@
out = (OutputStream) msgContext
.getProperty(MessageContext.TRANSPORT_OUT);
if (out != null) {
- startSendWithOutputStreamFromIncomingConnection(msgContext, out);
+ startSendWithOutputStreamFromIncomingConnection(msgContext,
+ out);
writeMessage(msgContext, out);
finalizeSendWithOutputStreamFromIncomingConnection(msgContext,
- out);
+ out);
} else {
- throw new AxisFault("Both the TO and Property MessageContext.TRANSPORT_WRITER is Null, No where to send");
+ throw new AxisFault(
+ "Both the TO and Property MessageContext.TRANSPORT_WRITER is Null, No where to send");
}
}
//TODO fix this, we do not set the value if the operation context is
// not avalible
if (msgContext.getOperationContext() != null) {
- msgContext.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
+ msgContext.getOperationContext().setProperty(
+ Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
}
}
@@ -149,14 +152,17 @@
}
}
- public abstract OutputStream startSendWithToAddress(MessageContext msgContext, OutputStream out) throws AxisFault;
+ public abstract OutputStream startSendWithToAddress(
+ MessageContext msgContext, OutputStream out) throws AxisFault;
public abstract void finalizeSendWithToAddress(MessageContext msgContext,
OutputStream out) throws AxisFault;
- public abstract OutputStream startSendWithOutputStreamFromIncomingConnection(MessageContext msgContext, OutputStream out) throws AxisFault;
+ public abstract OutputStream startSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext, OutputStream out) throws AxisFault;
- public abstract void finalizeSendWithOutputStreamFromIncomingConnection(MessageContext msgContext, OutputStream out) throws AxisFault;
+ public abstract void finalizeSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext, OutputStream out) throws AxisFault;
protected abstract OutputStream openTheConnection(EndpointReference epr,
MessageContext msgctx) throws AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/EmailReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/EmailReceiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/EmailReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/EmailReceiver.java Mon Jul 11 10:48:55 2005
@@ -19,7 +19,14 @@
import org.apache.axis2.engine.AxisFault;
-import javax.mail.*;
+import javax.mail.Authenticator;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.NoSuchProviderException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Store;
import java.util.Properties;
/**
@@ -37,7 +44,10 @@
private Store store;
private Folder inbox;
- public EmailReceiver(String user, String host, String popPort, String password) {
+ public EmailReceiver(String user,
+ String host,
+ String popPort,
+ String password) {
this.user = user;
this.host = host;
this.popPort = popPort;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportListener.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportListener.java Mon Jul 11 10:48:55 2005
@@ -26,7 +26,8 @@
public abstract class TransportListener {
public static final String PARAM_PORT = "port";
- public abstract void init(ConfigurationContext axisConf, TransportInDescription transprtIn)
+ public abstract void init(ConfigurationContext axisConf,
+ TransportInDescription transprtIn)
throws AxisFault;
public abstract void start() throws AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportSender.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportSender.java Mon Jul 11 10:48:55 2005
@@ -27,5 +27,6 @@
public interface TransportSender extends Handler {
public void cleanUp(MessageContext msgContext) throws AxisFault;
- public void init(ConfigurationContext confContext, TransportOutDescription transportOut) throws AxisFault;
+ public void init(ConfigurationContext confContext,
+ TransportOutDescription transportOut) throws AxisFault;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java Mon Jul 11 10:48:55 2005
@@ -36,7 +36,8 @@
public class TransportUtils {
public static SOAPEnvelope createSOAPMessage(MessageContext msgContext) throws AxisFault {
- InputStream inStream = (InputStream) msgContext.getProperty(MessageContext.TRANSPORT_IN);
+ InputStream inStream = (InputStream) msgContext.getProperty(
+ MessageContext.TRANSPORT_IN);
msgContext.setProperty(MessageContext.TRANSPORT_IN, null);
if (inStream == null) {
throw new AxisFault("Input stream is Null");
@@ -44,13 +45,16 @@
return createSOAPMessage(msgContext, inStream);
}
- public static SOAPEnvelope createSOAPMessage(MessageContext msgContext, InputStream inStream)
+ public static SOAPEnvelope createSOAPMessage(MessageContext msgContext,
+ InputStream inStream)
throws AxisFault {
try {
Object contentType = null;
OperationContext opContext = msgContext.getOperationContext();
if (opContext != null) {
- contentType = opContext.getProperty(HTTPConstants.MTOM_RECIVED_CONTENT_TYPE);
+ contentType =
+ opContext.getProperty(
+ HTTPConstants.MTOM_RECIVED_CONTENT_TYPE);
} else {
throw new AxisFault("Operation Context can not be Null");
}
@@ -60,12 +64,16 @@
if (contentType != null) {
msgContext.setDoingMTOM(true);
- builder = HTTPTransportUtils.selectBuilderForMIME(msgContext, inStream, (String) contentType);
+ builder =
+ HTTPTransportUtils.selectBuilderForMIME(msgContext,
+ inStream,
+ (String) contentType);
envelope = (SOAPEnvelope) builder.getDocumentElement();
} else if (msgContext.isDoingREST()) {
Reader reader = new InputStreamReader(inStream);
XMLStreamReader xmlreader =
- XMLInputFactory.newInstance().createXMLStreamReader(reader);
+ XMLInputFactory.newInstance().createXMLStreamReader(
+ reader);
SOAPFactory soapFactory = new SOAP11Factory();
builder = new StAXOMBuilder(xmlreader);
builder.setOmbuilderFactory(soapFactory);
@@ -74,7 +82,8 @@
} else {
Reader reader = new InputStreamReader(inStream);
XMLStreamReader xmlreader =
- XMLInputFactory.newInstance().createXMLStreamReader(reader);
+ XMLInputFactory.newInstance().createXMLStreamReader(
+ reader);
builder = new StAXSOAPModelBuilder(xmlreader);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Mon Jul 11 10:48:55 2005
@@ -60,7 +60,8 @@
String repoDir = context.getRealPath("/WEB-INF");
ConfigurationContextFactory erfac = new ConfigurationContextFactory();
configContext = erfac.buildConfigurationContext(repoDir);
- configContext.setProperty(Constants.CONTAINER_MANAGED, Constants.VALUE_TRUE);
+ configContext.setProperty(Constants.CONTAINER_MANAGED,
+ Constants.VALUE_TRUE);
configContext.setRootDir(new File(context.getRealPath("/WEB-INF")));
lister = new ListingAgent(configContext);
} catch (Exception e) {
@@ -84,11 +85,13 @@
OutputStream out = null;
try {
Object sessionContext =
- httpServletRequest.getSession().getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
+ httpServletRequest.getSession().getAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null) {
sessionContext = new SessionContext(null);
- httpServletRequest.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
- sessionContext);
+ httpServletRequest.getSession().setAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY,
+ sessionContext);
}
Enumeration enu = httpServletRequest.getParameterNames();
@@ -101,22 +104,26 @@
msgContext =
new MessageContext(configContext,
- (SessionContext) sessionContext,
- configContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
- configContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+ (SessionContext) sessionContext,
+ configContext.getAxisConfiguration()
+ .getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+ configContext.getAxisConfiguration()
+ .getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setDoingREST(true);
msgContext.setServerSide(true);
- msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo, new ServletBasedOutTransportInfo(httpServletResponse));
+ msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
+ new ServletBasedOutTransportInfo(httpServletResponse));
out = httpServletResponse.getOutputStream();
boolean processed =
HTTPTransportUtils.processHTTPGetRequest(msgContext,
- httpServletRequest.getInputStream(),
- out,
- httpServletRequest.getContentType(),
- httpServletRequest.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
- httpServletRequest.getRequestURL().toString(),
- configContext,
- map);
+ httpServletRequest.getInputStream(),
+ out,
+ httpServletRequest.getContentType(),
+ httpServletRequest.getHeader(
+ HTTPConstants.HEADER_SOAP_ACTION),
+ httpServletRequest.getRequestURL().toString(),
+ configContext,
+ map);
if (!processed) {
lister.handle(httpServletRequest, httpServletResponse, out);
}
@@ -148,33 +155,41 @@
MessageContext msgContext = null;
try {
Object sessionContext =
- req.getSession().getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
+ req.getSession().getAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null) {
sessionContext = new SessionContext(null);
- req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY, sessionContext);
+ req.getSession().setAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY, sessionContext);
}
msgContext =
new MessageContext(configContext,
- (SessionContext) sessionContext,
- configContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
- configContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
- msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo, new ServletBasedOutTransportInfo(res));
+ (SessionContext) sessionContext,
+ configContext.getAxisConfiguration()
+ .getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+ configContext.getAxisConfiguration()
+ .getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+ msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
+ new ServletBasedOutTransportInfo(res));
res.setContentType("text/xml; charset=utf-8");
HTTPTransportUtils.processHTTPPostRequest(msgContext,
- req.getInputStream(),
- res.getOutputStream(),
- req.getContentType(),
- req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
- req.getRequestURL().toString(),
- configContext);
- Object contextWritten = msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
- if (contextWritten == null || !Constants.VALUE_TRUE.equals(contextWritten)) {
+ req.getInputStream(),
+ res.getOutputStream(),
+ req.getContentType(),
+ req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
+ req.getRequestURL().toString(),
+ configContext);
+ Object contextWritten = msgContext.getOperationContext()
+ .getProperty(Constants.RESPONSE_WRITTEN);
+ if (contextWritten == null ||
+ !Constants.VALUE_TRUE.equals(contextWritten)) {
res.setStatus(HttpServletResponse.SC_ACCEPTED);
}
} catch (AxisFault e) {
AxisEngine engine = new AxisEngine(configContext);
if (msgContext != null) {
- msgContext.setProperty(MessageContext.TRANSPORT_OUT, res.getOutputStream());
+ msgContext.setProperty(MessageContext.TRANSPORT_OUT,
+ res.getOutputStream());
engine.handleFault(msgContext, e);
}
}