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 2005/02/20 18:23:10 UTC
svn commit: r154531 [1/3] - in
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis: ./
addressing/ addressing/miheaders/ addressing/om/ clientapi/ context/
description/ engine/ handlers/ phaseresolver/ providers/ receivers/
transport/ transport/http/ util/
Author: dims
Date: Sun Feb 20 09:22:56 2005
New Revision: 154531
URL: http://svn.apache.org/viewcvs?view=rev&rev=154531
Log:
spelling changes, reformatting
Added:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java (with props)
Removed:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/INReceiver.java
Modified:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/Constants.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AnyContentType.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/ServiceName.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/miheaders/RelatesTo.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/om/AddressingHeaders.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/AsyncResult.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Callback.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Correlator.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/GlobalContext.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SessionContext.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SimpleSessionContext.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisGlobal.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisModule.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisOperation.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisService.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/DescriptionConstants.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowInclude.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowIncludeImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Parameter.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterInclude.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterIncludeImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhaseRule.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesInclude.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesIncludeImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/SimpleAxisOperationImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisFault.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryFactory.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Provider.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Receiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ReceiverLocator.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseException.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/AbstractProvider.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSenderLocator.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPConstants.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/tcpmon.java
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/Constants.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/Constants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/Constants.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis;
public class Constants {
@@ -33,12 +32,12 @@
public static final String TRANSPORT_TCP = "tcp";
public static final String TRANSPORT_HTTP = "http";
- public static final String TRANSPORT_SMTP= "smtp";
+ public static final String TRANSPORT_SMTP = "smtp";
public static final String LISTSERVICES = "listServices";
public static final String SERVICE_MAP = "servicemap";
public static final String SINGLE_SERVICE = "singleservice";
-
+
public static final char METHOD_NAME_ESCAPE_CHARACTOR = '#';
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing;
public interface AddressingConstants {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AnyContentType.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AnyContentType.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AnyContentType.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AnyContentType.java Sun Feb 20 09:22:56 2005
@@ -13,14 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing;
import javax.xml.namespace.QName;
import java.util.HashMap;
public class AnyContentType {
-
private String anyContentTypeName;
private HashMap valueHolder;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java Sun Feb 20 09:22:56 2005
@@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing;
import javax.xml.namespace.QName;
public class EndpointReference {
-
/**
* this can be one of the followings
* AddressingConstants.WSA_FROM
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/ServiceName.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/ServiceName.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/ServiceName.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/ServiceName.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing;
import javax.xml.namespace.QName;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/miheaders/RelatesTo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/miheaders/RelatesTo.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/miheaders/RelatesTo.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/miheaders/RelatesTo.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing.miheaders;
public class RelatesTo {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/om/AddressingHeaders.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/om/AddressingHeaders.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/om/AddressingHeaders.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/om/AddressingHeaders.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.addressing.om;
import org.apache.axis.addressing.EndpointReference;
@@ -21,7 +20,6 @@
import org.apache.axis.om.SOAPHeader;
public class AddressingHeaders {
-
private EndpointReference wsaTo;
private EndpointReference wsaFrom;
private EndpointReference wsaReply;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/AsyncResult.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/AsyncResult.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/AsyncResult.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/AsyncResult.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.clientapi;
import org.apache.axis.om.SOAPEnvelope;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java Sun Feb 20 09:22:56 2005
@@ -13,12 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.clientapi;
-import java.io.IOException;
-import java.io.Writer;
-
import org.apache.axis.Constants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
@@ -30,10 +26,13 @@
import org.apache.axis.om.OMException;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportReciverLocator;
+import org.apache.axis.transport.TransportReceiverLocator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.Writer;
+
public class Call {
private EngineRegistry registry;
protected Log log = LogFactory.getLog(getClass());
@@ -42,14 +41,14 @@
//only used in SendReciveAync , to get the response
private String Listenertransport;
//the type of transport that the request should be send throgh
- private String transport ;
+ private String transport;
private String action;
public Call() {
//TODO look for the Client XML and creatre a Engine registy
this.registry = new EngineRegistryImpl(new AxisGlobal());
Listenertransport = null;
- transport= Constants.TRANSPORT_HTTP;
+ transport = Constants.TRANSPORT_HTTP;
}
public void setTo(EndpointReference EPR) {
@@ -58,11 +57,11 @@
}
public void setTransportType(String transport) throws AxisFault {
- if((Constants.TRANSPORT_HTTP.equals(transport) || Constants.TRANSPORT_SMTP.equals(transport)
- || Constants.TRANSPORT_TCP.equals(transport) )) {
+ if ((Constants.TRANSPORT_HTTP.equals(transport) || Constants.TRANSPORT_SMTP.equals(transport)
+ || Constants.TRANSPORT_TCP.equals(transport))) {
this.transport = transport;
} else {
- throw new AxisFault("Selected transport dose not suppot ( " + transport + " )");
+ throw new AxisFault("Selected transport dose not suppot ( " + transport + " )");
}
}
@@ -73,12 +72,12 @@
* @param Listenertransport
*/
public void setListenerTransport(String Listenertransport, boolean useSeparateListener) throws AxisFault {
- if((Constants.TRANSPORT_HTTP.equals(transport) || Constants.TRANSPORT_SMTP.equals(transport)
- || Constants.TRANSPORT_TCP.equals(transport) )) {
+ if ((Constants.TRANSPORT_HTTP.equals(transport) || Constants.TRANSPORT_SMTP.equals(transport)
+ || Constants.TRANSPORT_TCP.equals(transport))) {
this.Listenertransport = Listenertransport;
this.useSeparateListener = useSeparateListener;
- } else {
- throw new AxisFault("Selected transport dose not suppot ( " + transport + " )");
+ } else {
+ throw new AxisFault("Selected transport dose not suppot ( " + transport + " )");
}
@@ -110,7 +109,6 @@
MessageContext.TRANSPORT_TYPE,
Constants.TRANSPORT_HTTP);
msgctx.setTo(targetEPR);
-
engine.send(msgctx);
} catch (IOException e) {
@@ -119,7 +117,7 @@
try {
//TODO This should be the Receiver.close();
//Receiver is taken using the
- //TransportReceiver reciver = TransportReciverLocator.locate(requestMessageContext);
+ //TransportReceiver reciver = TransportReceiverLocator.locate(requestMessageContext);
out.close();
} catch (IOException e1) {
throw new AxisFault();
@@ -128,7 +126,7 @@
}
public void send(SOAPEnvelope envelope) throws AxisFault {
- if (Constants.TRANSPORT_SMTP.equals(transport)){
+ if (Constants.TRANSPORT_SMTP.equals(transport)) {
throw new AxisFault("This invocation support only for bi-directional transport");
} else {
MessageContext request = null;
@@ -136,7 +134,6 @@
final AxisEngine engine = new AxisEngine(registry);
request = new MessageContext(registry, null, null);
request.setEnvelope(envelope);
-
request.setProperty(
MessageContext.TRANSPORT_TYPE,
transport);
@@ -156,18 +153,18 @@
request.setProperty(
MessageContext.TRANSPORT_TYPE,
transport);
- TransportReceiver receiver = TransportReciverLocator.locate(request);
+ TransportReceiver receiver = TransportReceiverLocator.locate(request);
receiver.invoke(request);
- if(request.getProperty(MessageContext.TRANSPORT_SUCCEED)!= null){
+ if (request.getProperty(MessageContext.TRANSPORT_SUCCEED) != null) {
throw new AxisFault("Sent failed");
- } else if (request.getEnvelope().getBody().hasFault()){
+ } else if (request.getEnvelope().getBody().hasFault()) {
throw new AxisFault(request.getEnvelope().getBody().getFault().getFaultString());
}
} catch (IOException e) {
throw AxisFault.makeFault(e);
- }finally{
- Writer writer = (Writer)request.getProperty(MessageContext.TRANSPORT_WRITER);
- if(writer != null){
+ } finally {
+ Writer writer = (Writer) request.getProperty(MessageContext.TRANSPORT_WRITER);
+ if (writer != null) {
try {
writer.close();
} catch (IOException e) {
@@ -180,32 +177,28 @@
}
public SOAPEnvelope sendReceive(SOAPEnvelope envelope) throws AxisFault {
- if(Constants.TRANSPORT_SMTP.equals(transport)){
+ if (Constants.TRANSPORT_SMTP.equals(transport)) {
throw new AxisFault("This invocation support only for bi-directional transport");
}
try {
AxisEngine engine = new AxisEngine(registry);
MessageContext msgctx = new MessageContext(registry, null, null);
msgctx.setEnvelope(envelope);
-
msgctx.setProperty(
MessageContext.TRANSPORT_TYPE,
transport);
msgctx.setTo(targetEPR);
-
engine.send(msgctx);
-
MessageContext response =
- new MessageContext(
- registry,
- msgctx.getProperties(),
- msgctx.getSessionContext());
-
+ new MessageContext(
+ registry,
+ msgctx.getProperties(),
+ msgctx.getSessionContext());
response.setServerSide(false);
response.setProperty(
MessageContext.TRANSPORT_TYPE,
transport);
- TransportReceiver receiver = TransportReciverLocator.locate(response);
+ TransportReceiver receiver = TransportReceiverLocator.locate(response);
receiver.invoke(response);
SOAPEnvelope resenvelope = response.getEnvelope();
@@ -230,14 +223,12 @@
try {
AxisEngine engine = new AxisEngine(registry);
final MessageContext msgctx =
- new MessageContext(registry, null, null);
+ new MessageContext(registry, null, null);
msgctx.setEnvelope(envelope);
-
- msgctx.setProperty(MessageContext.TRANSPORT_TYPE,transport);
+ msgctx.setProperty(MessageContext.TRANSPORT_TYPE, transport);
msgctx.setTo(targetEPR);
-
if (useSeparateListener) {
- if(Constants.TRANSPORT_SMTP.equals(transport)){
+ if (Constants.TRANSPORT_SMTP.equals(transport)) {
throw new AxisFault("This invocation support only for bi-directional transport");
}
Invoker invoker = new Invoker(msgctx, engine, registry, callback);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Callback.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Callback.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Callback.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Callback.java Sun Feb 20 09:22:56 2005
@@ -13,18 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.clientapi;
public abstract class Callback {
private boolean complete = false;
private AsyncResult result;
+
public abstract void onComplete(AsyncResult result);
+
public abstract void reportError(Exception e);
- public boolean isComplete(){
+
+ public boolean isComplete() {
return complete;
}
- public void setComplete(boolean complete){
+
+ public void setComplete(boolean complete) {
this.complete = complete;
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Correlator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Correlator.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Correlator.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Correlator.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.clientapi;
import java.util.HashMap;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java Sun Feb 20 09:22:56 2005
@@ -13,17 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.clientapi;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportReciverLocator;
+import org.apache.axis.transport.TransportReceiverLocator;
public class Invoker implements Runnable {
-
private AxisEngine engine;
private EngineRegistry registry;
@@ -46,27 +44,22 @@
final Correlator correlator = Correlator.getInstance();
final String messageID = Long.toString(System.currentTimeMillis());
try {
-
reqMsgContext.setMessageID(messageID);
-
engine.send(reqMsgContext);
correlator.addCorrelationInfo(reqMsgContext.getMessageID(),
callback);
-
- MessageContext resMsgContext = new MessageContext(registry, reqMsgContext.getProperties(),reqMsgContext.getSessionContext());
-
+ MessageContext resMsgContext = new MessageContext(registry, reqMsgContext.getProperties(), reqMsgContext.getSessionContext());
resMsgContext.setServerSide(false);
-// resMsgContext.setProperty(MessageContext.TRANSPORT_TYPE,
-// Constants.TRANSPORT_HTTP);
+ // resMsgContext.setProperty(MessageContext.TRANSPORT_TYPE,
+ // Constants.TRANSPORT_HTTP);
TransportReceiver receiver =
- TransportReciverLocator.locate(resMsgContext);
+ TransportReceiverLocator.locate(resMsgContext);
receiver.invoke(resMsgContext);
-
AsyncResult result = new AsyncResult();
result.setResult(resMsgContext.getEnvelope());
resMsgContext.setMessageID(messageID);
callback =
- correlator.getCorrelationInfo(resMsgContext.getMessageID());
+ correlator.getCorrelationInfo(resMsgContext.getMessageID());
callback.setComplete(true);
callback.setResult(result);
callback.onComplete(result);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/GlobalContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/GlobalContext.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/GlobalContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/GlobalContext.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.context;
import org.apache.axis.engine.EngineRegistry;
@@ -27,7 +26,6 @@
public class GlobalContext {
private EngineRegistry registry;
private final HashMap map = new HashMap(10);
-
public GlobalContext(EngineRegistry er) {
this.registry = er;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java Sun Feb 20 09:22:56 2005
@@ -13,14 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.context;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.description.AxisOperation;
@@ -33,6 +27,9 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.wsdl.WSDLService;
+import javax.xml.stream.XMLStreamReader;
+import java.util.HashMap;
+import java.util.Map;
/**
* The palce where all the service specific states are kept.
@@ -42,9 +39,9 @@
*/
public class MessageContext {
private String messageStyle = WSDLService.STYLE_RPC;
-
+
/**
- * Follwing are the defined properties that are stored in the message Context
+ * Follwing are the defined properties that are stored in the message Context
*/
public static final String USER_NAME = "USER";
public static final String PASSWORD = "PASSWD";
@@ -83,23 +80,20 @@
private boolean newThreadRequired = false;
private XMLStreamReader xpp;
private OMElement soapOperationElement;
-
+
/**
- *
- * @param Engine registry
- * @param initialProperties of the message context, should be null if no properties
- * @param sessionContext of the message context, should be null if no sessionContext
+ * @param Engine registry
+ * @param initialProperties of the message context, should be null if no properties
+ * @param sessionContext of the message context, should be null if no sessionContext
* @throws AxisFault
*/
-
- public MessageContext(EngineRegistry er, Map initialProperties,SessionContext sessionContext) throws AxisFault {
+ public MessageContext(EngineRegistry er, Map initialProperties, SessionContext sessionContext) throws AxisFault {
this.globalContext = new GlobalContext(er);
- if(sessionContext == null){
+ if (sessionContext == null) {
this.sessionContext = new SimpleSessionContext();
- }else{
+ } else {
this.sessionContext = sessionContext;
}
-
if (initialProperties == null) {
initialProperties = new HashMap();
}
@@ -107,7 +101,6 @@
chain = new ExecutionChain();
}
-
/**
* @return
*/
@@ -150,7 +143,6 @@
return messageID;
}
-
/**
* @return
*/
@@ -242,7 +234,6 @@
messageID = string;
}
-
/**
* @param b
*/
@@ -286,7 +277,6 @@
serverSide = b;
}
-
/**
* @param referance
*/
@@ -301,7 +291,6 @@
return service;
}
-
/**
* @return
*/
@@ -337,8 +326,6 @@
this.service = service;
}
-
-
/**
* @return
*/
@@ -350,12 +337,11 @@
* @param i
*/
public void setMessageStyle(String i) {
- if(i != null){
+ if (i != null) {
messageStyle = i;
}
}
-
public ExecutionChain getExecutionChain() {
return this.chain;
}
@@ -366,7 +352,6 @@
public void setExecutionChain(ExecutionChain chain) {
this.chain = chain;
}
-
/**
* @return
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SessionContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SessionContext.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SessionContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SessionContext.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.context;
/**
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SimpleSessionContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SimpleSessionContext.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SimpleSessionContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/SimpleSessionContext.java Sun Feb 20 09:22:56 2005
@@ -1,27 +1,24 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.context;
-
import java.util.HashMap;
public class SimpleSessionContext implements SessionContext {
private HashMap map = new HashMap();
-
public Object get(Object key) {
return map.get(key);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisGlobal.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisGlobal.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisGlobal.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisGlobal.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
import org.apache.axis.engine.AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisModule.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisModule.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisModule.java Sun Feb 20 09:22:56 2005
@@ -13,10 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
-
import javax.xml.namespace.QName;
/**
@@ -29,9 +27,7 @@
* has a module ref="." or avalible to a single service if service.xml have module ref=".."</p>
*/
public class AxisModule implements FlowInclude, ParameterInclude {
-
private QName name;
-
private final FlowInclude flowInclude = new FlowIncludeImpl();
private final ParameterInclude parameters = new ParameterIncludeImpl();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisOperation.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisOperation.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisOperation.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
import org.apache.wsdl.WSDLOperation;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisService.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisService.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisService.java Sun Feb 20 09:22:56 2005
@@ -13,24 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Provider;
import org.apache.wsdl.WSDLService;
import org.apache.wsdl.impl.WSDLServiceImpl;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
public class AxisService extends WSDLServiceImpl implements WSDLService, ParameterInclude, FlowInclude, PhasesInclude, DescriptionConstants {
/**
- * TODO this should be in the WSDLInterface, yet we want it to have in the the
+ * TODO this should be in the WSDLInterface, yet we want it to have in the the
* Services, so we put this here for M1 until we foud better way to do that
*/
protected final HashMap operationsMap = new HashMap();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
import org.apache.axis.engine.AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/DescriptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/DescriptionConstants.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/DescriptionConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/DescriptionConstants.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
/**
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
/**
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java Sun Feb 20 09:22:56 2005
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
-
import java.util.ArrayList;
import java.util.List;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowInclude.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowInclude.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowInclude.java Sun Feb 20 09:22:56 2005
@@ -1,21 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
-
public interface FlowInclude {
//Flow include
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowIncludeImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowIncludeImpl.java Sun Feb 20 09:22:56 2005
@@ -1,21 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
-
public class FlowIncludeImpl implements FlowInclude {
private Flow in;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
import org.apache.axis.engine.Handler;
@@ -29,7 +28,6 @@
private PhaseRule rules;
private Handler handler;
private String className;
-
public HandlerMetadata() {
this.parameterInclude = new ParameterIncludeImpl();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Parameter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Parameter.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Parameter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Parameter.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
public interface Parameter {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterImpl.java Sun Feb 20 09:22:56 2005
@@ -1,22 +1,20 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
-
public class ParameterImpl implements Parameter {
private String name;
private String value;
@@ -46,7 +44,6 @@
public void setLocked(boolean value) {
locked = value;
}
-
public String getName() {
return name;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterInclude.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterInclude.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterInclude.java Sun Feb 20 09:22:56 2005
@@ -1,21 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
-
public interface ParameterInclude {
//parameters
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterIncludeImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/ParameterIncludeImpl.java Sun Feb 20 09:22:56 2005
@@ -1,21 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
-
import java.util.HashMap;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhaseRule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhaseRule.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhaseRule.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhaseRule.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
public class PhaseRule {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesInclude.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesInclude.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesInclude.java Sun Feb 20 09:22:56 2005
@@ -1,26 +1,24 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
import org.apache.axis.engine.AxisFault;
import java.util.ArrayList;
-
public interface PhasesInclude {
/**
* When the Phases are resolved they are added to the EngineRegistry as phases at deploy time.
@@ -30,7 +28,6 @@
* @param flow
* @return
*/
-
public ArrayList getPhases(int flow) throws AxisFault;
public void setPhases(ArrayList phases, int flow) throws AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesIncludeImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/PhasesIncludeImpl.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.description;
import org.apache.axis.engine.AxisFault;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/SimpleAxisOperationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/SimpleAxisOperationImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/SimpleAxisOperationImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/SimpleAxisOperationImpl.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.description;
import org.apache.wsdl.MessageReference;
@@ -44,7 +43,6 @@
parameters = new ParameterIncludeImpl();
}
-
/**
* @param param
*/
@@ -198,7 +196,6 @@
public void setInputMessage(MessageReference inputMessage) {
wsdlOperation.setInputMessage(inputMessage);
}
-
/**
* @param name
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
@@ -41,14 +40,15 @@
/**
* This methods represents the outflow of the Axis, this could be either at the server side or the client side.
- * Here the <code>ExecutionChain</code> is created using the Phases. The Handlers at the each Phases is ordered in
+ * Here the <code>ExecutionChain</code> is created using the Phases. The Handlers at the each Phases is ordered in
* deployment time by the deployment module
+ *
+ * @param context
+ * @throws AxisFault
* @see MessageContext
* @see ExecutionChain
* @see Phase
* @see Handler
- * @param context
- * @throws AxisFault
*/
public void send(MessageContext context) throws AxisFault {
executeOutFlow(context, EngineRegistry.OUTFLOW);
@@ -57,16 +57,16 @@
/**
* This methods represents the inflow of the Axis, this could be either at the server side or the client side.
- * Here the <code>ExecutionChain</code> is created using the Phases. The Handlers at the each Phases is ordered in
+ * Here the <code>ExecutionChain</code> is created using the Phases. The Handlers at the each Phases is ordered in
* deployment time by the deployment module
+ *
+ * @param context
+ * @throws AxisFault
* @see MessageContext
* @see ExecutionChain
* @see Phase
* @see Handler
- * @param context
- * @throws AxisFault
*/
-
public void receive(MessageContext context) throws AxisFault {
try {
// org.TimeRecorder.START = System.currentTimeMillis();
@@ -83,7 +83,7 @@
}
//Add the phases that are are at Global scope
AxisGlobal global =
- context.getGlobalContext().getRegistry().getGlobal();
+ context.getGlobalContext().getRegistry().getGlobal();
chain.addPhases(global.getPhases(EngineRegistry.INFLOW));
//create a Dispatch Phase and add it to the Execution Chain
@@ -103,15 +103,16 @@
}
/**
- * If error occurs at inflow or the out flow this method will call to handle the error. But if the
- * execution reach this method twice, means the sending the error handling failed an in that case the
- * this method just log the error and exit</p>
+ * If error occurs at inflow or the out flow this method will call to handle the error. But if the
+ * execution reach this method twice, means the sending the error handling failed an in that case the
+ * this method just log the error and exit</p>
+ *
* @param context
* @param e
* @throws AxisFault
*/
private void handleFault(MessageContext context, Throwable e)
- throws AxisFault {
+ throws AxisFault {
boolean serverSide = context.isServerSide();
log.error("Error Ocurred", e);
if (serverSide && !context.isProcessingFault()) {
@@ -119,7 +120,7 @@
//create a SOAP envelope with the Fault
SOAPEnvelope envelope =
- OMFactory.newInstance().getDefaultEnvelope();
+ OMFactory.newInstance().getDefaultEnvelope();
//TODO do we need to set old Headers back?
envelope.getBody().addFault(new AxisFault(e.getMessage(), e));
context.setEnvelope(envelope);
@@ -133,21 +134,21 @@
log.error("Error in fault flow", e);
}
}
-
+
/**
- * <p>This method shows the execution of sending the SOAP message. That can be either a
- * sending the message at the Client side or the sending the response at the Server side or the
- * Seding the fault flow at the Server side.</p>
- * @param context
- * @param flow
- * @throws AxisFault
- */
+ * <p>This method shows the execution of sending the SOAP message. That can be either a
+ * sending the message at the Client side or the sending the response at the Server side or the
+ * Seding the fault flow at the Server side.</p>
+ *
+ * @param context
+ * @param flow
+ * @throws AxisFault
+ */
private void executeOutFlow(MessageContext context, int flow)
- throws AxisFault {
+ throws AxisFault {
try {
context.setExecutionChain(new ExecutionChain());
ExecutionChain chain = context.getExecutionChain();
-
AxisService service = context.getService();
if (service != null) {
//what are we suppose to do in the client side
@@ -160,7 +161,7 @@
}
//Add the phases that are are at Global scope
AxisGlobal global =
- context.getGlobalContext().getRegistry().getGlobal();
+ context.getGlobalContext().getRegistry().getGlobal();
chain.addPhases(global.getPhases(flow));
// Receiving is always a matter of running the transport handlers first
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisFault.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisFault.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisFault.java Sun Feb 20 09:22:56 2005
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
import java.lang.reflect.InvocationTargetException;
-
/**
* An exception which maps cleanly to a SOAP fault.
* This is a base class for exceptions which are mapped to faults.
@@ -30,7 +28,6 @@
* <li>Fault details; an xml tree of fault specific stuff
* </ol>
*/
-
public class AxisFault extends java.rmi.RemoteException {
/**
*
@@ -73,11 +70,9 @@
e = (Exception) t;
}
}
-
if (e instanceof AxisFault) {
return (AxisFault) e;
}
-
return new AxisFault(e.getMessage(), e);
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
import org.apache.axis.Constants;
@@ -26,7 +25,6 @@
import org.apache.axis.handlers.OpNameFinder;
import org.apache.wsdl.WSDLService;
-
import javax.xml.namespace.QName;
public class Dispatcher extends AbstractHandler implements Handler {
@@ -41,49 +39,44 @@
EndpointReference toEPR = msgctx.getTo();
String filePart = toEPR.getAddress();
String soapAction = (String) msgctx.getProperty(MessageContext.SOAP_ACTION);
-
int index = filePart.lastIndexOf('/');
String serviceAndMethodStr = null;
if (index > 0) {
serviceAndMethodStr = filePart.substring(index + 1);
}
-
- if(serviceAndMethodStr == null){
+ if (serviceAndMethodStr == null) {
serviceAndMethodStr = soapAction;
}
-
index = serviceAndMethodStr.lastIndexOf(Constants.METHOD_NAME_ESCAPE_CHARACTOR);
-
QName serviceName = null;
QName operationName = null;
if (index > 0) {
- serviceName = new QName(serviceAndMethodStr.substring(0,index - 1));
+ serviceName = new QName(serviceAndMethodStr.substring(0, index - 1));
operationName = new QName(serviceAndMethodStr.substring(index + 1));
- }else{
+ } else {
serviceName = new QName(serviceAndMethodStr);
}
-
if (serviceName != null) {
EngineRegistry registry = msgctx.getGlobalContext().getRegistry();
AxisService service = registry.getService(serviceName);
if (service != null) {
msgctx.setService(service);
msgctx.setMessageStyle(service.getStyle());
- if(!WSDLService.STYLE_RPC.equals(msgctx.getMessageStyle())){
- if(operationName != null){
+ if (!WSDLService.STYLE_RPC.equals(msgctx.getMessageStyle())) {
+ if (operationName != null) {
AxisOperation op = service.getOperation(operationName);
- if(op != null){
+ if (op != null) {
msgctx.setOperation(op);
- }else{
+ } else {
throw new AxisFault("Operation not found " + operationName);
}
- }else{
+ } else {
throw new AxisFault("Operation Name not specifed");
}
}
-
-
+
+
//let add the Handlers
ExecutionChain chain = msgctx.getExecutionChain();
chain.addPhases(service.getPhases(EngineRegistry.INFLOW));
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java Sun Feb 20 09:22:56 2005
@@ -13,10 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
-
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisService;
@@ -27,12 +25,11 @@
import java.util.HashMap;
/**
- * The palce where all the Globel states of Axis is kept.
+ * The palce where all the Global states of Axis is kept.
* All the Global states kept in the <code>EngineRegistry</code> and all the
* Service states kept in the <code>MessageContext</code>. Other runtime
* artifacts does not keep states foward from the execution.
*/
-
public interface EngineRegistry {
public static final int INFLOW = 10003;
public static final int OUTFLOW = 10004;
@@ -65,8 +62,4 @@
public ArrayList getPhases();
public HashMap getServices();
-
-// public ArrayList getTransPorts() ;
-// public void setTransPorts(ArrayList transPorts) ;
-
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryFactory.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryFactory.java Sun Feb 20 09:22:56 2005
@@ -1,23 +1,20 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.engine;
-
-
public interface EngineRegistryFactory {
- public EngineRegistry createEngineRegistry(String file) throws AxisFault;
+ public EngineRegistry createEngineRegistry(String file) throws AxisFault;
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.engine;
import org.apache.axis.description.AxisGlobal;
@@ -25,14 +24,12 @@
import java.util.ArrayList;
import java.util.HashMap;
-
public class EngineRegistryImpl implements EngineRegistry {
private final HashMap modules = new HashMap();
private final HashMap services = new HashMap();
private final HashMap transports = new HashMap();
private final AxisGlobal global;
private ArrayList phases;
-
public EngineRegistryImpl(AxisGlobal global) {
this.global = global;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
@@ -46,7 +45,6 @@
phases.put(phase.getPhaseName(), phase);
executionList.add(phase);
}
-
public void addPhases(ArrayList phases) {
if (phases != null && !phases.isEmpty()) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;