You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/25 21:14:45 UTC
svn commit: r511588 [3/8] - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./
addressing/ addressing/wsdl/ builder/ client/ context/ dataretrieval/
dataretrieval/client/ deployment/ deployment/resolver/ deployment/util/
descripti...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Sun Feb 25 12:14:38 2007
@@ -16,17 +16,21 @@
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisError;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.modules.Module;
import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Sun Feb 25 12:14:38 2007
@@ -27,15 +27,18 @@
import org.apache.axis2.dataretrieval.AxisDataLocator;
import org.apache.axis2.dataretrieval.AxisDataLocatorImpl;
import org.apache.axis2.dataretrieval.DRConstants;
+import org.apache.axis2.dataretrieval.Data;
import org.apache.axis2.dataretrieval.DataRetrievalException;
+import org.apache.axis2.dataretrieval.DataRetrievalRequest;
import org.apache.axis2.dataretrieval.LocatorType;
import org.apache.axis2.dataretrieval.OutputForm;
-
-import org.apache.axis2.dataretrieval.Data;
-import org.apache.axis2.dataretrieval.DataRetrievalRequest;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.engine.*;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.DefaultObjectSupplier;
+import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.engine.ObjectSupplier;
+import org.apache.axis2.engine.ServiceLifeCycle;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.modules.Module;
import org.apache.axis2.phaseresolver.PhaseResolver;
@@ -52,12 +55,12 @@
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
+import org.apache.ws.java2wsdl.AnnotationConstants;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.AnnotationConstants;
import org.apache.ws.java2wsdl.utils.TypeTable;
-import org.codehaus.jam.JMethod;
import org.codehaus.jam.JAnnotation;
+import org.codehaus.jam.JMethod;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -77,7 +80,17 @@
import java.net.SocketException;
import java.net.URL;
import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Class AxisService
@@ -299,16 +312,16 @@
}
/**
- * @deprecated use AxisService#getEndpointName() instead.
* @return name of the port type
+ * @deprecated use AxisService#getEndpointName() instead.
*/
public String getPortTypeName() {
return endpointName;
}
/**
- * @deprecated use AxisService#setEndpointName() instead
* @param portTypeName
+ * @deprecated use AxisService#setEndpointName() instead
*/
public void setPortTypeName(String portTypeName) {
this.endpointName = portTypeName;
@@ -667,8 +680,7 @@
log.debug("mapActionToOperation: This operation is already mapped to this action: " + action + "; AxisOperation: "
+ currentlyMappedOperation + " named: " + currentlyMappedOperation.getName());
}
- }
- else {
+ } else {
// This action is already mapped, but it is to a different operation. Remove
// the action mapping from the alias table and add it to the list of invalid mappings
operationsAliasesMap.remove(action);
@@ -682,8 +694,7 @@
}
}
return;
- }
- else {
+ } else {
operationsAliasesMap.put(action, axisOperation);
}
}
@@ -1317,6 +1328,7 @@
/**
* To eneble service to be expose in all the transport
+ *
* @param enableAllTransports
*/
public void setEnableAllTransports(boolean enableAllTransports) {
@@ -2092,11 +2104,13 @@
data = dataLocator.getData(request, msgContext);
if (data==null){
data = bubbleupDataLocators(nextIndex, request, msgContext);
+ } else {
+ return data;
}
- else return data;
+ } else {
+ data = bubbleupDataLocators(nextIndex, request, msgContext);
}
- else data = bubbleupDataLocators(nextIndex, request, msgContext);
}
@@ -2121,18 +2135,19 @@
*/
private AxisDataLocator getDataLocator(LocatorType locatorType, String dialect) throws AxisFault {
AxisDataLocator locator = null;
- if (locatorType == LocatorType.SERVICE_DIALECT)
+ if (locatorType == LocatorType.SERVICE_DIALECT) {
locator = getServiceDataLocator( dialect);
- else if (locatorType == LocatorType.SERVICE_LEVEL)
+ } else if (locatorType == LocatorType.SERVICE_LEVEL) {
locator = getServiceDataLocator( DRConstants.SERVICE_LEVEL);
- else if (locatorType == LocatorType.GLOBAL_DIALECT)
+ } else if (locatorType == LocatorType.GLOBAL_DIALECT) {
locator = getGlobalDataLocator( dialect);
- else if (locatorType == LocatorType.GLOBAL_LEVEL)
+ } else if (locatorType == LocatorType.GLOBAL_LEVEL) {
locator = getGlobalDataLocator( DRConstants.GLOBAL_LEVEL);
- else if (locatorType == LocatorType.DEFAULT_AXIS)
+ } else if (locatorType == LocatorType.DEFAULT_AXIS) {
locator = getDefaultDataLocator();
- else
+ } else {
locator = getDefaultDataLocator();
+ }
return locator;
@@ -2141,8 +2156,9 @@
// Return default Axis2 Data Locator
private AxisDataLocator getDefaultDataLocator() throws DataRetrievalException {
- if (defaultDataLocator == null)
+ if (defaultDataLocator == null) {
defaultDataLocator = new AxisDataLocatorImpl(this);
+ }
defaultDataLocator.loadServiceData();
@@ -2224,6 +2240,7 @@
/**
* When we are trying to find out the operation by the QName of the SOAPBody first child, this
* map will help to retrieve that data very fast.
+ *
* @param messageQNameToOperationMap
*/
public void setMessageNameToOperationsMap(Map messageQNameToOperationMap) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java Sun Feb 25 12:14:38 2007
@@ -45,7 +45,9 @@
TransportOutDescription transportOut = ac.getTransportOut(new QName(transport));
if (transportOut == null) {
throw new AxisFault("No Tranport Sender found for : " + transport);
- } else return ac.getTransportOut(new QName(transport));
+ } else {
+ return ac.getTransportOut(new QName(transport));
+ }
} else {
throw new AxisFault(Messages.getMessage("cannotInferTransport", transportURI));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -15,12 +15,12 @@
*/
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.i18n.Messages;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -15,11 +15,11 @@
*/
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.i18n.Messages;
-import org.apache.axiom.om.util.UUIDGenerator;
import javax.xml.namespace.QName;
import java.util.HashMap;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -15,6 +15,7 @@
*/
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
@@ -25,13 +26,16 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.util.CallbackReceiver;
import org.apache.axis2.util.Utils;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -151,7 +155,9 @@
* @throws AxisFault if something goes wrong during the execution of the MEP.
*/
public void execute(boolean block) throws AxisFault {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient::execute, " + block);
+ if (log.isDebugEnabled()) {
+ log.debug("Entry: OutInAxisOperationClient::execute, " + block);
+ }
if (completed) {
throw new AxisFault(Messages.getMessage("mepiscomplted"));
}
@@ -180,12 +186,15 @@
boolean useAsync = false;
if(!options.isUseSeparateListener()) {
Boolean useAsyncOption = (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
- if(useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
+ if (useAsyncOption != null) {
+ useAsync = useAsyncOption.booleanValue();
+ }
}
if (useAsync || options.isUseSeparateListener()) {
- if(log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("useAsync=" + useAsync + ", seperateListener=" + options.isUseSeparateListener());
+ }
/**
* We are following the async path. If the user hasn't set a callback object then we must
* block until the whole MEP is complete, as they have no other way to get their reply message.
@@ -194,7 +203,9 @@
if(axisOp.getMessageReceiver() != null && axisOp.getMessageReceiver() instanceof CallbackReceiver) {
callbackReceiver = (CallbackReceiver) axisOp.getMessageReceiver();
} else {
- if(log.isDebugEnabled()) log.debug("Creating new callback receiver");
+ if (log.isDebugEnabled()) {
+ log.debug("Creating new callback receiver");
+ }
callbackReceiver = new CallbackReceiver();
axisOp.setMessageReceiver(callbackReceiver);
}
@@ -203,7 +214,9 @@
if(callback != null) {
callbackReceiver.addCallback(mc.getMessageID(), callback);
} else {
- if(log.isDebugEnabled()) log.debug("Creating internal callback");
+ if (log.isDebugEnabled()) {
+ log.debug("Creating internal callback");
+ }
internalCallback = new SyncCallBack();
callbackReceiver.addCallback(mc.getMessageID(), internalCallback);
}
@@ -214,7 +227,9 @@
* response message.
*/
Boolean useCustomListener = (Boolean) options.getProperty(Constants.Configuration.USE_CUSTOM_LISTENER);
- if(useAsync) useCustomListener = Boolean.TRUE;
+ if (useAsync) {
+ useCustomListener = Boolean.TRUE;
+ }
if (useCustomListener==null || !useCustomListener.booleanValue()) {
EndpointReference replyToFromTransport = mc.getConfigurationContext().getListenerManager().
@@ -263,10 +278,11 @@
throw new AxisFault(internalCallback.error);
} else if (! internalCallback.isComplete()) {
throw new AxisFault(Messages.getMessage("responseTimeOut"));
- } else
+ } else {
throw new AxisFault(Messages.getMessage("callBackCompletedWithError"));
}
}
+ }
} else {
if (block) {
// Send the SOAP Message and receive a response
@@ -415,29 +431,41 @@
private Exception error;
public void onComplete(AsyncResult result) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onComplete");
+ if (log.isDebugEnabled()) {
+ log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onComplete");
+ }
// Transport input stream gets closed after calling setComplete
// method. Have to build the whole envelope including the
// attachments at this stage. Data might get lost if the input
// stream gets closed before building the whole envelope.
this.envelope = result.getResponseEnvelope();
this.envelope.buildWithAttachments();
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onComplete");
+ if (log.isDebugEnabled()) {
+ log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onComplete");
+ }
}
public void setComplete(boolean complete) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ if (log.isDebugEnabled()) {
+ log.debug("Entry: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ }
super.setComplete(complete);
synchronized (this) {
notify();
}
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ if (log.isDebugEnabled()) {
+ log.debug("Exit: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ }
}
public void onError(Exception e) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onError, " + e);
+ if (log.isDebugEnabled()) {
+ log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onError, " + e);
+ }
error = e;
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onError");
+ if (log.isDebugEnabled()) {
+ log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onError");
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -15,14 +15,18 @@
*/
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java Sun Feb 25 12:14:38 2007
@@ -15,25 +15,20 @@
*/
package org.apache.axis2.description;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.util.ObjectStateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.ObjectInputStream;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.InputStream;
/**
@@ -229,7 +224,7 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
* Also, objects that represent "static" data are
* not saved, except for enough information to be
@@ -237,11 +232,9 @@
* context is re-constituted.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
//---------------------------------------------------------
@@ -275,8 +268,7 @@
String tmp = null;
- if (parameterElement != null)
- {
+ if (parameterElement != null) {
tmp = parameterElement.toString();
}
@@ -292,21 +284,18 @@
/**
* Restore the contents of the object that was previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// trace point
- if (log.isTraceEnabled())
- {
+ if (log.isTraceEnabled()) {
log.trace(myClassName+":readExternal(): BEGIN bytes available in stream ["+in.available()+"] ");
}
@@ -317,14 +306,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -350,10 +337,8 @@
String tmp = (String) ObjectStateUtils.readObject(in, "Parameter.parameterElement");
// convert to an OMElement
- if (tmp != null)
- {
- try
- {
+ if (tmp != null) {
+ try {
ByteArrayInputStream bais = new ByteArrayInputStream(tmp.getBytes());
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(bais);
@@ -363,24 +348,18 @@
OMElement docElement = builder.getDocumentElement();
- if (docElement != null)
- {
+ if (docElement != null) {
parameterElement = docElement;
- }
- else
- {
+ } else {
// TODO: error handling if can't create an OMElement
parameterElement = null;
}
}
- catch (Exception exc)
- {
+ catch (Exception exc) {
// TODO: error handling if can't create an OMElement
parameterElement = null;
}
- }
- else
- {
+ } else {
parameterElement = null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.description;
import org.apache.axiom.om.util.UUIDGenerator;
-import org.apache.axis2.i18n.Messages;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyReference;
import org.apache.neethi.PolicyRegistry;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -16,18 +16,17 @@
package org.apache.axis2.description;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.util.Utils;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java Sun Feb 25 12:14:38 2007
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.i18n.Messages;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.transport.TransportListener;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java Sun Feb 25 12:14:38 2007
@@ -1,11 +1,11 @@
package org.apache.axis2.description;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.i18n.Messages;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java Sun Feb 25 12:14:38 2007
@@ -17,23 +17,21 @@
*/
package org.apache.axis2.description;
+import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.wsdl.Port;
+import javax.wsdl.Service;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Extends the WSDL11ToAxisServiceBuilder class to provide functionality to return
* multiple AxisService objects; one for each port on each service in the WSDL 1.1 file.
- *
*/
public class WSDL11ToAllAxisServicesBuilder extends WSDL11ToAxisServiceBuilder {
protected static final Log log =
@@ -47,6 +45,7 @@
/**
* Class constructor.
+ *
* @param in - Contains the wsdl 1.1 file
*/
public WSDL11ToAllAxisServicesBuilder(InputStream in) {
@@ -59,6 +58,7 @@
* For each port on each service in the wsdl, an AxisService object is created and
* added to the List. The name of the AxisService is changed from the service name
* to the port name, since port names are unique to the wsdl.
+ *
* @return A List containing one AxisService object for each port in the wsdl file.
* The name of the AxisService is modified from the service name to the port name.
* @throws AxisFault
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Feb 25 12:14:38 2007
@@ -1,13 +1,27 @@
package org.apache.axis2.description;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
+import com.ibm.wsdl.util.xml.DOM2Writer;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.AddressingHelper;
+import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
+import org.apache.axis2.util.PolicyUtil;
+import org.apache.axis2.util.XMLUtils;
+import org.apache.axis2.wsdl.SOAPHeaderMessage;
+import org.apache.axis2.wsdl.SoapAddress;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.WSDLUtil;
+import org.apache.axis2.wsdl.util.WSDL4JImportedWSDLHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.neethi.Constants;
+import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyReference;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
import javax.wsdl.Binding;
import javax.wsdl.BindingFault;
@@ -16,7 +30,6 @@
import javax.wsdl.BindingOutput;
import javax.wsdl.Definition;
import javax.wsdl.Fault;
-import javax.wsdl.Import;
import javax.wsdl.Input;
import javax.wsdl.Message;
import javax.wsdl.Operation;
@@ -46,30 +59,13 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.AddressingHelper;
-import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
-import org.apache.axis2.util.PolicyUtil;
-import org.apache.axis2.util.XMLUtils;
-import org.apache.axis2.wsdl.SOAPHeaderMessage;
-import org.apache.axis2.wsdl.SoapAddress;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.WSDLUtil;
-import org.apache.axis2.wsdl.util.WSDL4JImportedWSDLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.neethi.Constants;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyReference;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.util.xml.DOM2Writer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -288,7 +284,6 @@
}
/**
- *
* @param binding
* @param wsdl4jService must have atlease one port
* @throws AxisFault
@@ -337,6 +332,7 @@
* soap style (rpc or document) and parts elememet of the soap body
* On the otherhand we keep only one set of axis operations belongs to a selected port type in axis service
* So setting qname refetences done only with the selected binding processing
+ *
* @param axisEndpoint
* @param wsdl4jPort
* @param isSetMessageQNames
@@ -565,6 +561,7 @@
* return the service to process
* if user has specified we check whether it exists
* else pick a random service and throws an exception if not found any thing
+ *
* @param definition
* @return service to process
* @throws AxisFault
@@ -604,6 +601,7 @@
* Look for the relevant binding!
* if user has spcifed a port get it
* otherwise find first soap port or pick random one if there is no soap port
+ *
* @param dif
* @param service service can not be null
* @throws AxisFault
@@ -1428,6 +1426,7 @@
/**
* creates a new shema complex element according to the elements sequence difined
+ *
* @param document
* @param xsdPrefix
* @param partsIterator
@@ -1986,8 +1985,9 @@
OperationType operationType = operation.getStyle();
if (isServerSide) {
if (operationType != null) {
- if (operationType.equals(OperationType.REQUEST_RESPONSE))
+ if (operationType.equals(OperationType.REQUEST_RESPONSE)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
+ }
if (operationType.equals(OperationType.ONE_WAY)) {
if (operation.getFaults().size() > 0) {
@@ -1996,26 +1996,32 @@
return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY;
}
- if (operationType.equals(OperationType.NOTIFICATION))
+ if (operationType.equals(OperationType.NOTIFICATION)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY;
+ }
- if (operationType.equals(OperationType.SOLICIT_RESPONSE))
+ if (operationType.equals(OperationType.SOLICIT_RESPONSE)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN;
+ }
throw new AxisFault("Cannot Determine the MEP");
}
} else {
if (operationType != null) {
- if (operationType.equals(OperationType.REQUEST_RESPONSE))
+ if (operationType.equals(OperationType.REQUEST_RESPONSE)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN;
+ }
- if (operationType.equals(OperationType.ONE_WAY))
+ if (operationType.equals(OperationType.ONE_WAY)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY;
+ }
- if (operationType.equals(OperationType.NOTIFICATION))
+ if (operationType.equals(OperationType.NOTIFICATION)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY;
+ }
- if (operationType.equals(OperationType.SOLICIT_RESPONSE))
+ if (operationType.equals(OperationType.SOLICIT_RESPONSE)) {
return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
+ }
throw new AxisFault("Cannot Determine the MEP");
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java Sun Feb 25 12:14:38 2007
@@ -18,27 +18,19 @@
package org.apache.axis2.description;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.Endpoint;
-import org.apache.woden.wsdl20.Interface;
-import org.apache.woden.wsdl20.Service;
-
-
-import javax.wsdl.WSDLException;
-
import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.woden.wsdl20.Endpoint;
+import org.apache.woden.wsdl20.Service;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
/**
* Extends the WSDL20ToAxisServiceBuilder class to provide functionality to return
* multiple AxisService objects; one for each endpoint on each service in the WSDL 2.0 file.
- *
*/
public class WSDL20ToAllAxisServicesBuilder extends WSDL20ToAxisServiceBuilder {
protected static final Log log =
@@ -48,6 +40,7 @@
/**
* Class constructor.
+ *
* @param in - Contains the wsdl 2.0 file
*/
public WSDL20ToAllAxisServicesBuilder(InputStream in) {
@@ -63,6 +56,7 @@
* is not unique to a wsdl 2.0 file. Multiple services in the file may have endpoints
* with the same name. Therefore the name of the AxisService needs to be a combination
* of service/endpoint name to be unique to the wsdl.
+ *
* @return A List containing one AxisService object for each port in the wsdl file.
* The name of the AxisService is modified to uniquely represent the service/endpoint
* pair. The format of the name is "<wsdl service name>#<wsdl endpoint name>"
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Sun Feb 25 12:14:38 2007
@@ -33,7 +33,6 @@
import org.apache.woden.wsdl20.InterfaceMessageReference;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.Service;
-import org.apache.woden.wsdl20.TypeDefinition;
import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions;
import org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions;
@@ -56,11 +55,16 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.InputStream;
import java.io.File;
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -414,6 +418,7 @@
String soapVersion;
if ((soapVersion = soapBindingExtensions.getSoapVersion()) != null)
+ {
if (soapVersion.equals(WSDL2Constants.SOAP_VERSION_1_1)) {
// Might have to remove this as its a binding specific property
axisService.setSoapNsUri(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
@@ -425,6 +430,7 @@
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_VERSION,
WSDL2Constants.SOAP_VERSION_1_2);
}
+ }
URI soapUnderlyingProtocol = soapBindingExtensions.getSoapUnderlyingProtocol();
if (soapUnderlyingProtocol != null) {
@@ -885,8 +891,7 @@
elementQName = messageReference.getElementDeclaration().getName();
} else if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_ANY.equals(messageContentModelName)) {
elementQName = Constants.XSD_ANY;
- } else
- if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_NONE.equals(messageContentModelName)) {
+ } else if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_NONE.equals(messageContentModelName)) {
// nothing to do here keep the message element as null
} else {
throw new AxisFault("Sorry we do not support " + messageContentModelName +
@@ -913,13 +918,15 @@
/**
* Convert woden dependent SOAPHeaderBlock objects to SOAPHeaderMessage objects
+ *
* @param soapHeaderBlocks - An array of SOAPHeaderBlock objects
* @return ArrayList - An ArrayList of SOAPHeaderMessage objects
*/
private ArrayList createSoapHeaders(SOAPHeaderBlock soapHeaderBlocks[]) {
- if (soapHeaderBlocks.length ==0)
+ if (soapHeaderBlocks.length == 0) {
return null;
+ }
ArrayList soapHeaderMessages = new ArrayList();
for (int i = 0; i < soapHeaderBlocks.length; i++) {
@@ -940,13 +947,15 @@
/**
* Convert woden dependent SOAPHeaderBlock objects to SOAPHeaderMessage objects
+ *
* @param soapModules - An array of SOAPModule objects
* @return ArrayList - An ArrayList of SOAPHeaderMessage objects
*/
private ArrayList createSoapModules(SOAPModule soapModules[]) {
- if (soapModules.length ==0)
+ if (soapModules.length == 0) {
return null;
+ }
ArrayList soapModuleMessages = new ArrayList();
for (int i = 0; i < soapModules.length; i++) {
@@ -960,13 +969,15 @@
/**
* Convert woden dependent HTTPHeader objects to Header objects
+ *
* @param httpHeaders - An array of HTTPHeader objects
* @return ArrayList - An ArrayList of Header objects
*/
private ArrayList createHttpHeaders(HTTPHeader httpHeaders[]) {
- if (httpHeaders.length ==0)
+ if (httpHeaders.length == 0) {
return null;
+ }
ArrayList httpHeaderMessages = new ArrayList();
for (int i = 0; i < httpHeaders.length; i++) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java Sun Feb 25 12:14:38 2007
@@ -1,7 +1,7 @@
package org.apache.axis2.description;
-import org.apache.axis2.namespace.Constants;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.namespace.Constants;
import org.apache.neethi.PolicyRegistry;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -126,7 +126,9 @@
protected XmlSchema getXMLSchema(Element element, String baseUri) {
XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
- if (baseUri != null) schemaCollection.setBaseUri(baseUri);
+ if (baseUri != null) {
+ schemaCollection.setBaseUri(baseUri);
+ }
if (customResolver != null) {
schemaCollection.setSchemaResolver(customResolver);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java Sun Feb 25 12:14:38 2007
@@ -15,8 +15,6 @@
package org.apache.axis2.dispatchers;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
@@ -26,6 +24,8 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
/**
* Dispatches the operation based on the information from the target endpoint URL.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java Sun Feb 25 12:14:38 2007
@@ -14,15 +14,16 @@
package org.apache.axis2.dispatchers;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.HandlerDescription;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
public class SOAPMessageBodyBasedOperationDispatcher extends AbstractOperationDispatcher {
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -20,12 +20,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisBindingOperation;
+import org.apache.axis2.description.AxisEndpoint;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.AxisEndpoint;
import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.wsdl.WSDLConstants;
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -16,10 +16,6 @@
package org.apache.axis2.engine;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
@@ -36,6 +32,9 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
/**
* Dispatcher based on the WS-Addressing properties.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Sun Feb 25 12:14:38 2007
@@ -17,8 +17,8 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.cluster.ClusterManager;
import org.apache.axis2.builder.OMBuilder;
+import org.apache.axis2.cluster.ClusterManager;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.dataretrieval.AxisDataLocator;
import org.apache.axis2.deployment.DeploymentException;
@@ -178,6 +178,7 @@
/**
* Register a messageBuilder implementation against a content type.
* This is used by Axis2 to support different message formats.
+ *
* @param contentType
* @param messageBuilder
*/
@@ -191,6 +192,7 @@
* Register a messageFormatter implementation against a content type.
* This is used by Axis2 to support serialization of messages to different
* message formats. (Eg: JSON)
+ *
* @param contentType
* @param messageFormatter
*/
@@ -279,7 +281,9 @@
AxisOperation axisOperation = (AxisOperation) operatins
.next();
- if (axisOperation.isControlOperation()) { continue; }
+ if (axisOperation.isControlOperation()) {
+ continue;
+ }
if (axisOperation.getMessageReceiver() == null) {
axisService.setWsdlFound(false);
@@ -1017,6 +1021,7 @@
/**
* For internal used only! To store instance of DataLocator when it is first loaded. This allows to
* re-use DataLocator after it is initially loaded.
+ *
* @param dialect- an absolute URI represents the format and version of data
* @param dataLocator - specified an DataLocator instance to support retrieval
* of the specified dialect.
@@ -1047,6 +1052,7 @@
* for all the flows. If they have been changed,throws a DeploymentException.
*
* @throws org.apache.axis2.deployment.DeploymentException
+ *
*/
public void validateSystemPredefinedPhases() throws DeploymentException {
PhasesInfo phasesInfo = getPhasesInfo();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Sun Feb 25 12:14:38 2007
@@ -17,9 +17,6 @@
package org.apache.axis2.engine;
-import java.util.ArrayList;
-import java.util.Iterator;
-
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
@@ -40,6 +37,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+import java.util.Iterator;
+
/**
* There is one engine for the Server and the Client. the send() and receive()
* Methods are the basic operations the Sync, Async messageing are build on top.
@@ -137,6 +137,7 @@
* This method is called to handle any error that occurs at inflow or outflow. But if the
* method is called twice, it implies that sending the error handling has failed, in which case
* the method logs the error and exists.
+ *
* @deprecated (post 1.1 branch)
*/
public MessageContext createFaultMessageContext(MessageContext processingContext, Throwable e)
@@ -166,14 +167,11 @@
// affecting later messages.
msgContext.setExecutionChain((ArrayList) preCalculatedPhases.clone());
msgContext.setFLOW(MessageContext.IN_FLOW);
- try
- {
+ try {
InvocationResponse pi = invoke(msgContext, IS_INBOUND, NOT_RESUMING_EXECUTION);
- if (pi.equals(InvocationResponse.CONTINUE))
- {
- if (msgContext.isServerSide())
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
+ if (msgContext.isServerSide()) {
// invoke the Message Receivers
checkMustUnderstand(msgContext);
@@ -186,25 +184,18 @@
receiver.receive(msgContext);
}
flowComplete(msgContext, true);
- }
- else if (pi.equals(InvocationResponse.SUSPEND))
- {
+ } else if (pi.equals(InvocationResponse.SUSPEND)) {
return pi;
- }
- else if (pi.equals(InvocationResponse.ABORT))
- {
+ } else if (pi.equals(InvocationResponse.ABORT)) {
flowComplete(msgContext, true);
return pi;
- }
- else
- {
+ } else {
String errorMsg = "Unrecognized InvocationResponse encountered in AxisEngine.receive()";
log.error(msgContext.getLogIDString()+" "+errorMsg);
throw new AxisFault(errorMsg);
}
}
- catch (AxisFault e)
- {
+ catch (AxisFault e) {
flowComplete(msgContext, true);
throw e;
}
@@ -234,21 +225,14 @@
Handler currentHandler = (Handler) msgContext.getExecutionChain().
get(msgContext.getCurrentHandlerIndex());
- try
- {
- if (!resuming)
- {
- if (inbound)
- {
+ try {
+ if (!resuming) {
+ if (inbound) {
msgContext.addInboundExecutedPhase(currentHandler);
- }
- else
- {
+ } else {
msgContext.addOutboundExecutedPhase(currentHandler);
}
- }
- else
- {
+ } else {
/* If we are resuming the flow, we don't want to add the phase
* again, as it has already been added.
*/
@@ -256,10 +240,8 @@
}
pi = currentHandler.invoke(msgContext);
}
- catch (AxisFault e)
- {
- if (msgContext.getCurrentPhaseIndex() == 0)
- {
+ catch (AxisFault e) {
+ if (msgContext.getCurrentPhaseIndex() == 0) {
/* If we got a fault, we still want to add the phase to the
list to be executed for flowComplete(...) unless this was
the first handler, as then the currentPhaseIndex will be
@@ -268,12 +250,9 @@
notification of flowComplete, then we'll need to introduce
some more complex logic to keep track of what has been
executed.*/
- if (inbound)
- {
+ if (inbound) {
msgContext.removeFirstInboundExecutedPhase();
- }
- else
- {
+ } else {
msgContext.removeFirstOutboundExecutedPhase();
}
}
@@ -281,8 +260,7 @@
}
if (pi.equals(InvocationResponse.SUSPEND) ||
- pi.equals(InvocationResponse.ABORT))
- {
+ pi.equals(InvocationResponse.ABORT)) {
break;
}
@@ -292,13 +270,11 @@
return pi;
}
- private void flowComplete(MessageContext msgContext, boolean inbound)
- {
+ private void flowComplete(MessageContext msgContext, boolean inbound) {
Iterator invokedPhaseIterator = inbound?msgContext.getInboundExecutedPhases():msgContext.getOutboundExecutedPhases();
Handler currentHandler;
- while (invokedPhaseIterator.hasNext())
- {
+ while (invokedPhaseIterator.hasNext()) {
currentHandler = ((Handler)invokedPhaseIterator.next());
currentHandler.flowComplete(msgContext);
}
@@ -307,12 +283,9 @@
* receive() even when a fault occurs, and we will have already executed
* the flowComplete on those before receiveFault() is called.
*/
- if (inbound)
- {
+ if (inbound) {
msgContext.resetInboundExecutedPhases();
- }
- else
- {
+ } else {
msgContext.resetOutboundExecutedPhases();
}
}
@@ -341,10 +314,8 @@
InvocationResponse pi = invoke(msgContext, IS_INBOUND, RESUMING_EXECUTION);
//invoking the MR
- if (pi.equals(InvocationResponse.CONTINUE))
- {
- if (msgContext.isServerSide())
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
+ if (msgContext.isServerSide()) {
// invoke the Message Receivers
checkMustUnderstand(msgContext);
MessageReceiver receiver = msgContext.getAxisOperation().getMessageReceiver();
@@ -384,8 +355,7 @@
//invoke the phases
InvocationResponse pi = invoke(msgContext, IS_OUTBOUND, RESUMING_EXECUTION);
//Invoking Transport Sender
- if (pi.equals(InvocationResponse.CONTINUE))
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
// write the Message to the Wire
TransportOutDescription transportOut = msgContext.getTransportOut();
TransportSender sender = transportOut.getSender();
@@ -417,14 +387,11 @@
msgContext.setExecutionChain((ArrayList) preCalculatedPhases.clone());
msgContext.setFLOW(MessageContext.IN_FAULT_FLOW);
- try
- {
+ try {
InvocationResponse pi = invoke(msgContext, IS_INBOUND, NOT_RESUMING_EXECUTION);
- if (pi.equals(InvocationResponse.CONTINUE))
- {
- if (msgContext.isServerSide())
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
+ if (msgContext.isServerSide()) {
// invoke the Message Receivers
checkMustUnderstand(msgContext);
@@ -433,25 +400,18 @@
receiver.receive(msgContext);
}
flowComplete(msgContext, true);
- }
- else if (pi.equals(InvocationResponse.SUSPEND))
- {
+ } else if (pi.equals(InvocationResponse.SUSPEND)) {
return pi;
- }
- else if (pi.equals(InvocationResponse.ABORT))
- {
+ } else if (pi.equals(InvocationResponse.ABORT)) {
flowComplete(msgContext, true);
return pi;
- }
- else
- {
+ } else {
String errorMsg = "Unrecognized InvocationResponse encountered in AxisEngine.receiveFault()";
log.error(msgContext.getLogIDString()+" "+errorMsg);
throw new AxisFault(errorMsg);
}
}
- catch (AxisFault e)
- {
+ catch (AxisFault e) {
flowComplete(msgContext, true);
throw e;
}
@@ -461,6 +421,7 @@
/**
* Resume processing of a message.
+ *
* @param msgctx
* @return An InvocationResponse allowing the invoker to perhaps determine
* whether or not the message processing will ever succeed.
@@ -504,12 +465,10 @@
.getAxisConfiguration().getGlobalOutPhases().clone());
msgContext.setExecutionChain(outPhases);
msgContext.setFLOW(MessageContext.OUT_FLOW);
- try
- {
+ try {
InvocationResponse pi = invoke(msgContext, IS_OUTBOUND, NOT_RESUMING_EXECUTION);
- if (pi.equals(InvocationResponse.CONTINUE))
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
// write the Message to the Wire
TransportOutDescription transportOut = msgContext.getTransportOut();
if(transportOut == null) {
@@ -529,8 +488,7 @@
}
//REVIEW: In the case of the TransportNonBlockingInvocationWorker, does this need to wait until that finishes?
flowComplete(msgContext, false);
- }
- else if (pi.equals(InvocationResponse.SUSPEND)){
+ } else if (pi.equals(InvocationResponse.SUSPEND)) {
}else if (pi.equals(InvocationResponse.ABORT)){
flowComplete(msgContext, false);
}else{
@@ -570,29 +528,22 @@
outFaultPhases.addAll((ArrayList) faultExecutionChain.clone());
msgContext.setExecutionChain((ArrayList) outFaultPhases.clone());
msgContext.setFLOW(MessageContext.OUT_FAULT_FLOW);
- try
- {
+ try {
InvocationResponse pi = invoke(msgContext, IS_OUTBOUND, NOT_RESUMING_EXECUTION);
- if (pi.equals(InvocationResponse.SUSPEND))
- {
+ if (pi.equals(InvocationResponse.SUSPEND)) {
log.warn(msgContext.getLogIDString()+" The resumption of this flow may function incorrectly, as the OutFaultFlow will not be used");
return;
- }
- else if (pi.equals(InvocationResponse.ABORT))
- {
+ } else if (pi.equals(InvocationResponse.ABORT)) {
flowComplete(msgContext, false);
return;
- }
- else if (!pi.equals(InvocationResponse.CONTINUE))
- {
+ } else if (!pi.equals(InvocationResponse.CONTINUE)) {
String errorMsg = "Unrecognized InvocationResponse encountered in AxisEngine.sendFault()";
log.error(msgContext.getLogIDString()+" "+errorMsg);
throw new AxisFault(errorMsg);
}
}
- catch (AxisFault e)
- {
+ catch (AxisFault e) {
flowComplete(msgContext, false);
throw e;
}
@@ -602,8 +553,7 @@
msgContext.setFLOW(MessageContext.OUT_FAULT_FLOW);
InvocationResponse pi = invoke(msgContext, IS_OUTBOUND, NOT_RESUMING_EXECUTION);
- if (pi.equals(InvocationResponse.CONTINUE))
- {
+ if (pi.equals(InvocationResponse.CONTINUE)) {
// Actually send the SOAP Fault
TransportOutDescription transportOut = msgContext.getTransportOut();
if(transportOut == null) {
@@ -651,17 +601,13 @@
sender.invoke(msgctx);
} catch (Exception e) {
log.info(msgctx.getLogIDString()+" "+e.getMessage());
- if (msgctx.getProperty(MessageContext.DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR) == null)
- {
+ if (msgctx.getProperty(MessageContext.DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR) == null) {
AxisOperation axisOperation = msgctx.getAxisOperation();
- if (axisOperation != null)
- {
+ if (axisOperation != null) {
MessageReceiver msgReceiver = axisOperation.getMessageReceiver();
- if ((msgReceiver != null) && (msgReceiver instanceof CallbackReceiver))
- {
+ if ((msgReceiver != null) && (msgReceiver instanceof CallbackReceiver)) {
Callback callback = ((CallbackReceiver)msgReceiver).lookupCallback(msgctx.getMessageID());
- if (callback != null)
- {
+ if (callback != null) {
callback.onError(e);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Sun Feb 25 12:14:38 2007
@@ -19,9 +19,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java Sun Feb 25 12:14:38 2007
@@ -1,8 +1,8 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.AddressingHelper;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.i18n.Messages;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java Sun Feb 25 12:14:38 2007
@@ -19,20 +19,16 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisEndpoint;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.AxisEndpoint;
import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import javax.servlet.http.HttpServletRequest;
import java.util.Collection;
import java.util.Iterator;
@@ -111,8 +107,7 @@
if (-1 != index) {
service = path.substring(index);
- }
- else {
+ } else {
int queryIndex = path.indexOf("?");
if (queryIndex != -1) {
service = path.substring(queryIndex);
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -46,9 +46,9 @@
* needs to be processed. If the message processing is paused by the
* handler, then this method will be called again for the handler that
* paused the processing once it is resumed.
- *
+ * <p/>
* This method may be called concurrently from multiple threads.
- *
+ * <p/>
* Handlers that want to determine the type of message that is to be
* processed (e.g. response vs request, inbound vs. outbound, etc.) can
* retrieve that information from the MessageContext via
@@ -103,8 +103,7 @@
* runtime. The returned instruction will determine the next step in
* the processing.
*/
- public class InvocationResponse
- {
+ public class InvocationResponse {
public static InvocationResponse CONTINUE = new InvocationResponse(0, "InvocationResponse.CONTINUE");
public static InvocationResponse SUSPEND = new InvocationResponse(1, "InvocationResponse.SUSPEND");
public static InvocationResponse ABORT = new InvocationResponse(2, "InvocationResponse.ABORT");
@@ -112,19 +111,16 @@
private int instructionID;
private String description;
- private InvocationResponse(int instructionID, String description)
- {
+ private InvocationResponse(int instructionID, String description) {
this.instructionID = instructionID;
this.description = description;
}
- public boolean equals(InvocationResponse instruction)
- {
+ public boolean equals(InvocationResponse instruction) {
return this.instructionID == instruction.instructionID;
}
- public int hashCode()
- {
+ public int hashCode() {
return instructionID;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Sun Feb 25 12:14:38 2007
@@ -21,7 +21,12 @@
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ServiceGroupContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -381,8 +381,7 @@
}
pi = handler.invoke(msgctx);
- if (!pi.equals(InvocationResponse.CONTINUE))
- {
+ if (!pi.equals(InvocationResponse.CONTINUE)) {
return pi;
}
@@ -399,33 +398,26 @@
return pi;
}
- public void flowComplete(MessageContext msgContext)
- {
- if (isDebugEnabled)
- {
+ public void flowComplete(MessageContext msgContext) {
+ if (isDebugEnabled) {
log.debug(msgContext.getLogIDString()+" Invoking flowComplete() in Phase \"" + phaseName + "\"");
}
/*This will be non-zero if we failed during execution of one of the
*handlers in this phase*/
int currentHandlerIndex = msgContext.getCurrentPhaseIndex();
- if (currentHandlerIndex == 0)
- {
+ if (currentHandlerIndex == 0) {
currentHandlerIndex = handlers.size();
- }
- else
- {
+ } else {
/*We need to set it to 0 so that any previous phases will execute all
* of their handlers.*/
msgContext.setCurrentPhaseIndex(0);
}
- for (; currentHandlerIndex > 0; currentHandlerIndex--)
- {
+ for (; currentHandlerIndex > 0; currentHandlerIndex--) {
Handler handler = (Handler) handlers.get(currentHandlerIndex-1);
- if (isDebugEnabled)
- {
+ if (isDebugEnabled) {
log.debug(msgContext.getLogIDString()+" Invoking flowComplete() for Handler '" + handler.getName() + "' in 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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -19,8 +19,8 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
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;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java Sun Feb 25 12:14:38 2007
@@ -18,21 +18,16 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
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.AxisEndpoint;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import javax.servlet.http.HttpServletRequest;
/**
* Dispatches the operation based on the information from the target endpoint URL.
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -18,14 +18,10 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
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.AxisEndpoint;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -20,15 +20,11 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.MessageContext;
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.AxisEndpoint;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -102,7 +102,6 @@
return handlerDesc.getParameter(name);
}
- public void flowComplete(MessageContext msgContext)
- {
+ public void flowComplete(MessageContext msgContext) {
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java Sun Feb 25 12:14:38 2007
@@ -182,8 +182,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key);
}
@@ -199,8 +200,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key, String arg0)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key, arg0);
}
@@ -217,8 +219,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key, arg0, arg1);
}
@@ -236,8 +239,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key, arg0, arg1, arg2);
}
@@ -256,8 +260,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2, String arg3)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3);
}
@@ -277,8 +282,9 @@
public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2, String arg3, String arg4)
throws MissingResourceException, Exception {
MessageBundle messageBundle = getMessageBundle(messageBundleKey);
- if (messageBundle == null)
+ if (messageBundle == null) {
throw new Exception(NO_MESSAGE_BUNDLE);
+ }
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3, arg4);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org