You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2004/12/27 07:10:41 UTC
svn commit: r123390 - in webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis: addressing addressing/om client clientapi context engine impl/transport/http impl/transport/tcp transport
Author: gdaniels
Date: Sun Dec 26 22:10:38 2004
New Revision: 123390
URL: http://svn.apache.org/viewcvs?view=rev&rev=123390
Log:
Spelling 'n stuff
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReference.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReferenceType.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTrasnportSender.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTrasnportSender.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReference.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReference.java?view=auto&rev=123390
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReference.java Sun Dec 26 22:10:38 2004
@@ -0,0 +1,100 @@
+package org.apache.axis.addressing;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ * <p/>
+ */
+public class EndpointReference {
+
+ /**
+ * this can be one of the followings
+ * AddressingConstants.WSA_FROM
+ * AddressingConstants.WSA_REPLY_TO
+ * AddressingConstants.WSA_FAULT_TO
+ */
+ private String messageInformationHeaderType;
+
+ private String address;
+ private QName portType;
+ private AnyContentType referenceProperties;
+ private AnyContentType referenceParameters;
+ private ServiceName serviceName;
+
+ /**
+ *
+ * @param messageInformationHeaderType
+ * this can be one of the followings
+ * AddressingConstants.WSA_FROM
+ * AddressingConstants.WSA_REPLY_TO
+ * AddressingConstants.WSA_FAULT_TO
+ *
+ * @param address
+ */
+ public EndpointReference(String messageInformationHeaderType, String address) {
+ this.messageInformationHeaderType = messageInformationHeaderType;
+ this.address = address;
+ }
+
+ public String getMessageInformationHeaderType() {
+ return messageInformationHeaderType;
+ }
+
+ public void setMessageInformationHeaderType(String messageInformationHeaderType) {
+ this.messageInformationHeaderType = messageInformationHeaderType;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public QName getPortType() {
+ return portType;
+ }
+
+ public void setPortType(QName portType) {
+ this.portType = portType;
+ }
+
+ public AnyContentType getReferenceProperties() {
+ return referenceProperties;
+ }
+
+ public void setReferenceProperties(AnyContentType referenceProperties) {
+ this.referenceProperties = referenceProperties;
+ }
+
+ public AnyContentType getReferenceParameters() {
+ return referenceParameters;
+ }
+
+ public void setReferenceParameters(AnyContentType referenceParameters) {
+ this.referenceParameters = referenceParameters;
+ }
+
+ public ServiceName getServiceName() {
+ return serviceName;
+ }
+
+ public void setServiceName(ServiceName serviceName) {
+ this.serviceName = serviceName;
+ }
+
+}
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReferenceType.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/EndpointReferenceType.java?view=auto&rev=123389
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/addressing/om/AddressingHeaders.java Sun Dec 26 22:10:38 2004
@@ -1,6 +1,6 @@
package org.apache.axis.addressing.om;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.om.SOAPHeader;
@@ -21,10 +21,10 @@
*/
public class AddressingHeaders {
- private EndpointReferenceType wsaTo;
- private EndpointReferenceType wsaFrom;
- private EndpointReferenceType wsaReply;
- private EndpointReferenceType wsaFaultTo;
+ private EndpointReference wsaTo;
+ private EndpointReference wsaFrom;
+ private EndpointReference wsaReply;
+ private EndpointReference wsaFaultTo;
private String action;
private String messageId;
private RelatesTo relatesTo;
@@ -34,7 +34,7 @@
* @param wsaTo
* @param action
*/
- public AddressingHeaders(EndpointReferenceType wsaTo, String action) {
+ public AddressingHeaders(EndpointReference wsaTo, String action) {
this.wsaTo = wsaTo;
this.action = action;
}
@@ -44,35 +44,35 @@
}
// ------------------- Setters and Getters --------------------------------------
- public EndpointReferenceType getWsaTo() {
+ public EndpointReference getWsaTo() {
return wsaTo;
}
- public void setWsaTo(EndpointReferenceType wsaTo) {
+ public void setWsaTo(EndpointReference wsaTo) {
this.wsaTo = wsaTo;
}
- public EndpointReferenceType getWsaFrom() {
+ public EndpointReference getWsaFrom() {
return wsaFrom;
}
- public void setWsaFrom(EndpointReferenceType wsaFrom) {
+ public void setWsaFrom(EndpointReference wsaFrom) {
this.wsaFrom = wsaFrom;
}
- public EndpointReferenceType getWsaReply() {
+ public EndpointReference getWsaReply() {
return wsaReply;
}
- public void setWsaReply(EndpointReferenceType wsaReply) {
+ public void setWsaReply(EndpointReference wsaReply) {
this.wsaReply = wsaReply;
}
- public EndpointReferenceType getWsaFaultTo() {
+ public EndpointReference getWsaFaultTo() {
return wsaFaultTo;
}
- public void setWsaFaultTo(EndpointReferenceType wsaFaultTo) {
+ public void setWsaFaultTo(EndpointReference wsaFaultTo) {
this.wsaFaultTo = wsaFaultTo;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java Sun Dec 26 22:10:38 2004
@@ -16,7 +16,7 @@
package org.apache.axis.client;
import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.engine.AxisEngine;
@@ -73,7 +73,7 @@
OutputStream out = urlConnect.getOutputStream();
msgctx.setProperty(MessageContext.TRANSPORT_DATA, out);
msgctx.setProperty(MessageContext.TRANSPORT_TYPE, TransportSenderLocator.TRANSPORT_HTTP);
- msgctx.setTo(new EndpointReferenceType(AddressingConstants.WSA_TO,url.toString()));
+ msgctx.setTo(new EndpointReference(AddressingConstants.WSA_TO,url.toString()));
engine.send(msgctx);
MessageContext response = createIncomingMessageContext(urlConnect.getInputStream(), engine);
@@ -131,7 +131,7 @@
OutputStream out = urlConnect.getOutputStream();
msgctx.setProperty(MessageContext.TRANSPORT_DATA, out);
msgctx.setProperty(MessageContext.TRANSPORT_TYPE, TransportSenderLocator.TRANSPORT_HTTP);
- msgctx.setTo(new EndpointReferenceType(AddressingConstants.WSA_TO,url.toString()));
+ msgctx.setTo(new EndpointReference(AddressingConstants.WSA_TO,url.toString()));
engine.send(msgctx);
@@ -183,7 +183,7 @@
OutputStream out = urlConnect.getOutputStream();
msgctx.setProperty(MessageContext.TRANSPORT_DATA, out);
msgctx.setProperty(MessageContext.TRANSPORT_TYPE, TransportSenderLocator.TRANSPORT_HTTP);
- msgctx.setTo(new EndpointReferenceType(AddressingConstants.WSA_TO,url.toString()));
+ msgctx.setTo(new EndpointReference(AddressingConstants.WSA_TO,url.toString()));
engine.send(msgctx);
//TODO
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java Sun Dec 26 22:10:38 2004
@@ -5,7 +5,7 @@
import java.net.URL;
import java.net.URLConnection;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.engine.AxisEngine;
@@ -39,7 +39,7 @@
public class Call extends AbstractCall {
private EngineRegistry registry;
protected Log log = LogFactory.getLog(getClass());
- private EndpointReferenceType targetEPR;
+ private EndpointReference targetEPR;
private boolean blocked;
private String transport;
private String action;
@@ -50,7 +50,7 @@
this.registry = new EngineRegistryImpl(new AxisGlobal());
}
- public void setTo(EndpointReferenceType EPR){
+ public void setTo(EndpointReference EPR){
this.targetEPR = EPR;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java Sun Dec 26 22:10:38 2004
@@ -22,7 +22,7 @@
import org.apache.axis.impl.context.SimpleSessionContext;
import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import java.util.HashMap;
@@ -38,18 +38,18 @@
// private HashMap messages = new HashMap();
public static final String USER_NAME = "USER";
- public static final String PASSWARD = "PASSWD";
+ public static final String PASSWORD = "PASSWD";
public static final String TRANSPORT_TYPE = "TRANSPORT_TYPE";
public static final String SOAP_ACTION = "SOAP_ACTION";
public static final String TRANSPORT_DATA = "TRANSPORT_DATA";
//public static final String REQUEST_URL = "REQUEST_URL";
private boolean processingFault = false;
- private EndpointReferenceType to;
- private EndpointReferenceType from;
+ private EndpointReference to;
+ private EndpointReference from;
private RelatesTo relatesTo;
- private EndpointReferenceType replyTo;
- private EndpointReferenceType faultTo;
+ private EndpointReference replyTo;
+ private EndpointReference faultTo;
private ExecutionChain chain;
private AxisTransport transport;
@@ -63,7 +63,7 @@
private AxisService service;
private SOAPEnvelope envelope;
private boolean responseWritten;
- private boolean infaultFlow;
+ private boolean inFaultFlow;
private boolean serverSide;
private String messageID;
private AxisOperation operation;
@@ -80,14 +80,14 @@
/**
* @return
*/
- public EndpointReferenceType getFaultTo() {
+ public EndpointReference getFaultTo() {
return faultTo;
}
/**
* @return
*/
- public EndpointReferenceType getFrom() {
+ public EndpointReference getFrom() {
return from;
}
@@ -101,8 +101,8 @@
/**
* @return
*/
- public boolean isInfaultFlow() {
- return infaultFlow;
+ public boolean isInFaultFlow() {
+ return inFaultFlow;
}
/**
@@ -144,7 +144,7 @@
/**
* @return
*/
- public EndpointReferenceType getReplyTo() {
+ public EndpointReference getReplyTo() {
return replyTo;
}
@@ -172,29 +172,29 @@
/**
* @return
*/
- public EndpointReferenceType getTo() {
+ public EndpointReference getTo() {
return to;
}
/**
* @param referance
*/
- public void setFaultTo(EndpointReferenceType referance) {
+ public void setFaultTo(EndpointReference referance) {
faultTo = referance;
}
/**
* @param referance
*/
- public void setFrom(EndpointReferenceType referance) {
+ public void setFrom(EndpointReference referance) {
from = referance;
}
/**
* @param b
*/
- public void setInfaultFlow(boolean b) {
- infaultFlow = b;
+ public void setInFaultFlow(boolean b) {
+ inFaultFlow = b;
}
/**
@@ -238,7 +238,7 @@
/**
* @param referance
*/
- public void setReplyTo(EndpointReferenceType referance) {
+ public void setReplyTo(EndpointReference referance) {
replyTo = referance;
}
@@ -260,7 +260,7 @@
/**
* @param referance
*/
- public void setTo(EndpointReferenceType referance) {
+ public void setTo(EndpointReference referance) {
to = referance;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java Sun Dec 26 22:10:38 2004
@@ -16,7 +16,7 @@
package org.apache.axis.engine;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.handlers.AbstractHandler;
@@ -30,7 +30,7 @@
public void invoke(MessageContext msgctx) throws AxisFault{
if(msgctx.isServerSide()){
String uri = null;
- EndpointReferenceType toEPR = msgctx.getTo();
+ EndpointReference toEPR = msgctx.getTo();
String filePart = toEPR.getAddress();
String soapAction = (String) msgctx.getProperty(MessageContext.SOAP_ACTION);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/TransportSenderLocator.java Sun Dec 26 22:10:38 2004
@@ -17,7 +17,7 @@
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.impl.transport.http.HTTPTrasnportSender;
+import org.apache.axis.impl.transport.http.HTTPTransportSender;
import org.apache.axis.impl.transport.tcp.TCPTrasnportSender;
import java.io.OutputStream;
@@ -39,7 +39,7 @@
}
} else if (TransportSenderLocator.TRANSPORT_HTTP.equals(type)) {
if (out != null) {
- return new HTTPTrasnportSender(out);
+ return new HTTPTransportSender(out);
} else {
throw new AxisFault("if TCP trsport used there should be a propoerty named " + MessageContext.TRANSPORT_DATA);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java Sun Dec 26 22:10:38 2004
@@ -32,7 +32,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
@@ -73,7 +73,7 @@
MessageContext msgContext = new MessageContext(engineRegistry);
msgContext.setServerSide(true);
String filePart = req.getRequestURL().toString();
- msgContext.setTo(new EndpointReferenceType(AddressingConstants.WSA_TO,filePart));
+ msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,filePart));
String soapActionString = req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (soapActionString != null) {
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java?view=auto&rev=123390
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java Sun Dec 26 22:10:38 2004
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2001-2004 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.impl.transport.http;
+
+import java.io.OutputStream;
+
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.transport.AbstractTransportSender;
+
+public class HTTPTransportSender extends AbstractTransportSender {
+ protected OutputStream out;
+
+ public HTTPTransportSender(OutputStream out) {
+ this.out = out;
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext) throws AxisFault {
+ OutputStream out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_DATA);
+ if (out == null) {
+ throw new AxisFault("can not find the suffient information to find endpoint");
+ } else {
+ return out;
+ }
+
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext, EndpointReference epr) throws AxisFault {
+ //TODO this is temporay work around
+ return obtainOutputStream(msgContext);
+ }
+
+ protected void finalizeSending() {
+ }
+
+ protected void startSending() {
+// if(!msgContext.isServerSide()){
+// URL url = (URL)msgContext.getProperty(MessageContext.REQUEST_URL);
+// if(url != null){
+// StringBuffer buf = new StringBuffer();
+// buf.append("POST ").append(url.getFile()).append("HTTP/1.1\n");
+// buf.append("Host: ").append(url.getHost());
+// buf.append("Content-Type: application/soap+xml; charset=\"utf-8\"\n");
+// out.write(buf.toString().getBytes());
+// }else{
+// throw new AxisFault(MessageContext.REQUEST_URL + "where to send ?");
+// }
+// }
+ }
+
+}
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTrasnportSender.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTrasnportSender.java?view=auto&rev=123389
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java Sun Dec 26 22:10:38 2004
@@ -26,7 +26,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
@@ -453,7 +453,7 @@
String filePart = fileName.toString();
- msgContext.setTo(new EndpointReferenceType(AddressingConstants.WSA_TO,filePart));
+ msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,filePart));
if (httpRequest.toString().equals("GET")) {
throw new UnsupportedOperationException("GET not supported");
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java?view=diff&rev=123390&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java&r1=123389&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java&r2=123390
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/tcp/TCPTrasnportSender.java Sun Dec 26 22:10:38 2004
@@ -18,19 +18,19 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.AbstractTrasnportSender;
-import org.apache.axis.addressing.EndpointReferenceType;
+import org.apache.axis.transport.AbstractTransportSender;
+import org.apache.axis.addressing.EndpointReference;
import java.io.OutputStream;
-public class TCPTrasnportSender extends AbstractTrasnportSender {
+public class TCPTrasnportSender extends AbstractTransportSender {
protected OutputStream out;
public TCPTrasnportSender(OutputStream out) {
this.out = out;
}
- protected OutputStream obtainOutPutStream(MessageContext msgContext) throws AxisFault {
+ protected OutputStream obtainOutputStream(MessageContext msgContext) throws AxisFault {
OutputStream out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_DATA);
if (out == null) {
throw new AxisFault("can not find the suffient information to find endpoint");
@@ -40,8 +40,8 @@
}
- protected OutputStream obtainOutPutStream(MessageContext msgContext, EndpointReferenceType epr) throws AxisFault {
- return obtainOutPutStream(msgContext);
+ protected OutputStream obtainOutputStream(MessageContext msgContext, EndpointReference epr) throws AxisFault {
+ return obtainOutputStream(msgContext);
}
protected void finalizeSending() {
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java?view=auto&rev=123390
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java Sun Dec 26 22:10:38 2004
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2001-2004 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.transport;
+
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.TransportSender;
+import org.apache.axis.impl.handlers.AbstractHandler;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.addressing.EndpointReference;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.OutputStream;
+
+/**
+ */
+public abstract class AbstractTransportSender extends AbstractHandler implements TransportSender {
+
+ public final void invoke(MessageContext msgContext) throws AxisFault {
+ OutputStream out = null;
+ if (msgContext.isProcessingFault()) {
+ //Means we are processing fault
+ if (msgContext.getFaultTo() != null) {
+ out = obtainOutputStream(msgContext, msgContext.getFaultTo());
+ } else {
+ out = obtainOutputStream(msgContext);
+ }
+ } else {
+ if (msgContext.getTo() != null) {
+ out = obtainOutputStream(msgContext, msgContext.getTo());
+ } else if (msgContext.getReplyTo() != null) {
+ out = obtainOutputStream(msgContext, msgContext.getTo());
+ } else {
+ out = obtainOutputStream(msgContext);
+ }
+ }
+ startSending();
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ if (envelope != null) {
+ try {
+ XMLStreamWriter outputWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+ envelope.serialize(outputWriter,true);
+ } catch (XMLStreamException e) {
+ throw new AxisFault("Stream error",e);
+ }
+
+ }
+ finalizeSending();
+ }
+
+ protected void startSending() {
+ }
+
+ protected abstract OutputStream obtainOutputStream(MessageContext msgContext, EndpointReference epr) throws AxisFault;
+
+ protected abstract OutputStream obtainOutputStream(MessageContext msgContext) throws AxisFault;
+
+ protected void finalizeSending() {
+ }
+}
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTrasnportSender.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTrasnportSender.java?view=auto&rev=123389
==============================================================================