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/12/08 06:29:32 UTC
svn commit: r354996 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms:
JMSSender.java JMSVendorAdapterFactory.java SimpleJMSWorker.java
Author: dims
Date: Wed Dec 7 21:28:30 2005
New Revision: 354996
URL: http://svn.apache.org/viewcvs?rev=354996&view=rev
Log:
GC
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=354996&r1=354995&r2=354996&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java Wed Dec 7 21:28:30 2005
@@ -122,22 +122,11 @@
endpoint = connector.createEndpoint(dest);
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ // TODO: How do we fix Attachments?
writeMessage(msgContext, out);
HashMap props = createSendProperties(msgContext);
-
-// TODO: How do we fix Attachments?
-// // If the request message contains attachments, set
-// // a contentType property to go in the outgoing message header
-// String ret = null;
-// Message message = msgContext.getRequestMessage();
-// Attachments mAttachments = message.getAttachmentsImpl();
-// if (mAttachments != null && 0 != mAttachments.getAttachmentCount()) {
-// String contentType = mAttachments.getContentType();
-// if (contentType != null && !contentType.trim().equals("")) {
-// props.put("contentType", contentType);
-// }
-// }
props.put("contentType", getContentType(msgContext));
props.put("SOAPAction", getSOAPAction(msgContext));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java?rev=354996&r1=354995&r2=354996&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java Wed Dec 7 21:28:30 2005
@@ -30,13 +30,7 @@
private final static String VENDOR_PKG = "org.apache.axis2.transport.jms";
private static Loader loader = new Loader();
- static {
-// AxisProperties.setClassDefault(JMSVendorAdapter.class,
-// VENDOR_PKG + ".JNDIVendorAdapter");
- }
-
public static final JMSVendorAdapter getJMSVendorAdapter() throws Exception {
-// return (JMSVendorAdapter) AxisProperties.newInstance(JMSVendorAdapter.class);
return (JMSVendorAdapter) Loader.loadClass(VENDOR_PKG + ".JNDIVendorAdapter").newInstance();
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=354996&r1=354995&r2=354996&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Wed Dec 7 21:28:30 2005
@@ -138,8 +138,6 @@
return;
}
-// ByteArrayOutputStream baos = new ByteArrayOutputStream();
-// msgContext.setProperty(MessageContext.TRANSPORT_OUT, baos);
msgContext.setServiceGroupContextId(UUIDGenerator.getUUID());
if(soapAction != null) {
msgContext.setSoapAction(soapAction);
@@ -149,7 +147,6 @@
processJMSRequest(
msgContext,
in,
-// baos,
contentType
);
} catch (Exception e) {
@@ -157,74 +154,16 @@
e.printStackTrace();
return;
}
-
-// Message msg = null;
-// if (contentType != null && !contentType.trim().equals("")) {
-// msg = new Message(in, true, contentType, null);
-// } else {
-// msg = new Message(in);
-// }
-//
-// MessageContext msgContext = new MessageContext(server);
-// msgContext.setRequestMessage(msg);
-// try {
-// server.invoke(msgContext);
-// msg = msgContext.getResponseMessage();
-// }
-// catch (AxisFault af) {
-// msg = new Message(af);
-// msg.setMessageContext(msgContext);
-// }
-// catch (Exception e) {
-// msg = new Message(new AxisFault(e.toString()));
-// msg.setMessageContext(msgContext);
-// }
-
-// try {
-// // now we need to send the response
-// Destination destination = message.getJMSReplyTo();
-// if (destination == null)
-// return;
-// JMSEndpoint replyTo = listener.getConnector().createEndpoint(destination);
-// replyTo.send(baos.toByteArray());
-// }
-// catch (Exception e) {
-// e.printStackTrace();
-// }
-
-// if (msgContext.getProperty(MessageContext.QUIT_REQUESTED) != null)
-// // why then, quit!
-// try {
-// listener.shutdown();
-// } catch (Exception e) {
-// }
}
public static void processJMSRequest(
MessageContext msgContext,
InputStream in,
-// OutputStream out,
String contentType
)
throws AxisFault {
boolean soap11 = false;
try {
-
-// //remove the starting and trailing " from the SOAP Action
-// if (soapActionHeader != null
-// && soapActionHeader.startsWith("\"")
-// && soapActionHeader.endsWith("\"")) {
-//
-// soapActionHeader =
-// soapActionHeader.substring(
-// 1,
-// soapActionHeader.length() - 1);
-// }
-// //fill up the Message Contexts
-// msgContext.setWSAAction(soapActionHeader);
-// msgContext.setSoapAction(soapActionHeader);
-// msgContext.setTo(new EndpointReference(requestURI));
-// msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
msgContext.setServerSide(true);
SOAPEnvelope envelope = null;