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:36:27 UTC
svn commit: r354997 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms:
JMSOutTransportInfo.java JMSSender.java JMSTransport.java JMSURLHelper.java
JMSVendorAdapter.java JNDIVendorAdapter.java SimpleJMSWorker.java
Author: dims
Date: Wed Dec 7 21:35:49 2005
New Revision: 354997
URL: http://svn.apache.org/viewcvs?rev=354997&view=rev
Log:
reformat code and optimize imports
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
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/JMSTransport.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSURLHelper.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.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/JMSOutTransportInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java?rev=354997&r1=354996&r2=354997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java Wed Dec 7 21:35:49 2005
@@ -28,7 +28,7 @@
JMSOutTransportInfo(JMSConnector connector, Destination dest) {
this.connector = connector;
this.dest = dest;
-
+
}
public void setContentType(String contentType) {
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=354997&r1=354996&r2=354997&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:35:49 2005
@@ -19,31 +19,25 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.client.Options;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.transport.AbstractTransportSender;
import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.http.HTTPTransportUtils;
import javax.jms.Destination;
-import javax.xml.namespace.QName;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* This is meant to be used on a SOAP Client to call a SOAP server.
@@ -84,7 +78,7 @@
}
boolean waitForResponse = false;
- if(connector == null) {
+ if (connector == null) {
if (msgContext.getProperty(JMSConstants.WAIT_FOR_RESPONSE) != null && msgContext.getProperty(JMSConstants.WAIT_FOR_RESPONSE).equals(Boolean.TRUE))
waitForResponse =
((Boolean) msgContext.getProperty(
@@ -98,7 +92,7 @@
if (dest == null) {
Object destination = msgContext.getProperty(JMSConstants.DESTINATION);
- if(connector == null) {
+ if (connector == null) {
connector = (JMSConnector) msgContext.getProperty(JMSConstants.CONNECTOR);
}
if (destination == null && msgContext.getTo() != null) {
@@ -113,7 +107,7 @@
}
- if (destination instanceof String) {
+ if (destination instanceof String) {
endpoint = connector.createEndpoint((String) destination);
} else {
endpoint = connector.createEndpoint((Destination) destination);
@@ -132,7 +126,7 @@
props.put("SOAPAction", getSOAPAction(msgContext));
if (waitForResponse) {
long timeout = Options.DEFAULT_TIMEOUT_MILLISECONDS;
- if(msgContext.getProperty(JMSConstants.TIMEOUT_TIME) != null) {
+ if (msgContext.getProperty(JMSConstants.TIMEOUT_TIME) != null) {
timeout = ((Long) msgContext.getProperty(JMSConstants.TIMEOUT_TIME)).longValue();
}
byte[] response = endpoint.call(out.toByteArray(), timeout, props);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSTransport.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSTransport.java?rev=354997&r1=354996&r2=354997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSTransport.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSTransport.java Wed Dec 7 21:35:49 2005
@@ -17,8 +17,8 @@
package org.apache.axis2.transport.jms;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSURLHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSURLHelper.java?rev=354997&r1=354996&r2=354997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSURLHelper.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSURLHelper.java Wed Dec 7 21:35:49 2005
@@ -17,9 +17,7 @@
package org.apache.axis2.transport.jms;
import org.apache.commons.httpclient.URI;
-import org.apache.commons.httpclient.URIException;
-import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -46,7 +44,7 @@
private Vector appProperties;
public JMSURLHelper(String url) throws Exception {
- this(new URI(url), null);
+ this(new URI(url), null);
}
public JMSURLHelper(URI url) throws java.net.MalformedURLException {
@@ -69,7 +67,7 @@
// parse the query string and populate the properties table
String query = url.getEscapedQuery();
- if(query != null) {
+ if (query != null) {
StringTokenizer st = new StringTokenizer(query, "&;");
while (st.hasMoreTokens()) {
String keyValue = st.nextToken();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java?rev=354997&r1=354996&r2=354997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java Wed Dec 7 21:35:49 2005
@@ -210,7 +210,7 @@
mode = javax.jms.DeliveryMode.NON_PERSISTENT;
context.setProperty(JMSConstants.DELIVERY_MODE, new Integer(mode));
}
-
+
String prio = null;
if (jmsurl != null)
prio = jmsurl.getPropertyValue(JMSConstants._PRIORITY);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java?rev=354997&r1=354996&r2=354997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java Wed Dec 7 21:35:49 2005
@@ -37,20 +37,20 @@
public final static String _CONNECTION_FACTORY_JNDI_NAME = "ConnectionFactoryJNDIName";
public final static String CONNECTION_FACTORY_JNDI_NAME = JMSConstants.JMS_PROPERTY_PREFIX +
- _CONNECTION_FACTORY_JNDI_NAME;
+ _CONNECTION_FACTORY_JNDI_NAME;
public final static String CONNECTION_FACTORY_JNDI_VALUE = "ConnectionFactory";
public final static String _DESTINATION = "Destination";
public final static String DESTINATION = JMSConstants.JMS_PROPERTY_PREFIX +
- _DESTINATION;
+ _DESTINATION;
public final static String _USER = "User";
public final static String USER = JMSConstants.JMS_PROPERTY_PREFIX +
- _USER;
+ _USER;
public final static String _PASSWORD = "Password";
public final static String PASSWORD = JMSConstants.JMS_PROPERTY_PREFIX +
- _PASSWORD;
+ _PASSWORD;
private Context context;
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=354997&r1=354996&r2=354997&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:35:49 2005
@@ -129,7 +129,7 @@
msgContext.setProperty(
Constants.OUT_TRANSPORT_INFO,
new JMSOutTransportInfo(listener.getConnector(), message.getJMSReplyTo()));
-
+
msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
} catch (Exception e) {
@@ -139,7 +139,7 @@
}
msgContext.setServiceGroupContextId(UUIDGenerator.getUUID());
- if(soapAction != null) {
+ if (soapAction != null) {
msgContext.setSoapAction(soapAction);
}