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 di...@apache.org on 2007/02/25 21:14:45 UTC
svn commit: r511588 [4/8] - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./
addressing/ addressing/wsdl/ builder/ client/ context/ dataretrieval/
dataretrieval/client/ deployment/ deployment/resolver/ deployment/util/
descripti...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java Sun Feb 25 12:14:38 2007
@@ -135,7 +135,6 @@
* @param projectName The name of the project to which the class belongs.
* It must be a proper prefix of the caller's package.
* @param caller The calling class.
- *
* @param resourceName The name of the resource without the
* ".properties" extension
* @throws MissingResourceException if projectName is not a prefix of
@@ -160,7 +159,6 @@
* @param projectName The name of the project to which the class belongs.
* It must be a proper prefix of the caller's package.
* @param packageName The package name to construct base name.
- *
* @param resourceName The name of the resource without the
* ".properties" extension
* @param locale The locale
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/RB.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/RB.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/RB.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/RB.java Sun Feb 25 12:14:38 2007
@@ -648,11 +648,12 @@
boolean didNull = false;
if (caller != null) {
- if (caller instanceof Class)
+ if (caller instanceof Class) {
curClass = (Class) caller;
- else
+ } else {
curClass = caller.getClass();
}
+ }
while (msg == null) {
@@ -688,16 +689,18 @@
// Get the superclass
curClass = curClass.getSuperclass();
if (curClass == null) {
- if (didNull)
+ if (didNull) {
throw firstEx;
+ }
didNull = true;
caller = null;
} else {
String cname = curClass.getName();
if (cname.startsWith("java.") ||
cname.startsWith("javax.")) {
- if (didNull)
+ if (didNull) {
throw firstEx;
+ }
didNull = true;
caller = null;
curClass = null;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.java.security;
-import java.lang.SecurityManager;
import java.security.AccessControlContext;
import java.security.AccessControlException;
import java.security.Permission;
@@ -34,10 +33,10 @@
* accessing the system resources (ie, read/write files, opening ports, and etc).
* This class also improve performance no matther Security Manager is being enabled
* or not.
- *
+ * <p/>
* Note: This utility should be used properly, otherwise might introduce
* security holes.
- *
+ * <p/>
* Usage Example:
* <code>
* public void changePassword() {
@@ -46,7 +45,7 @@
* public Object run() {
* f = Util.openPasswordFile();
* ...
- *
+ * <p/>
* }
* });
* ...
@@ -60,7 +59,7 @@
/**
* Performs the specified <code>PrivilegedAction</code> with privileges
* enabled if a security manager is present.
- * <p>
+ * <p/>
* If the action's <code>run</code> method throws an (unchecked) exception,
* it will propagate through this method.
*
@@ -86,8 +85,8 @@
* possessed by the caller's protection domain, and those possessed
* by the domains represented by the specified
* <code>AccessControlContext</code> if a security manager is present.
- * <p>
- *
+ * <p/>
+ * <p/>
* If the action's <code>run</code> method throws an (unchecked) exception,
* it will propagate through this method.
*
@@ -112,7 +111,7 @@
* Performs the specified <code>PrivilegedExceptionAction</code> with
* privileges enabled. The action is performed with <i>all</i> of the
* permissions possessed by the caller's protection domain.
- * <p>
+ * <p/>
* If the action's <code>run</code> method throws an <i>unchecked</i>
* exception, it will propagate through this method.
*
@@ -146,7 +145,7 @@
* intersection of the the permissions possessed by the caller's
* protection domain, and those possessed by the domains represented by the
* specified <code>AccessControlContext</code>.
- * <p>
+ * <p/>
* If the action's <code>run</code> method throws an <i>unchecked</i>
* exception, it will propagate through this method.
*
@@ -184,9 +183,8 @@
* and places it in an AccessControlContext object. This context may then
* be checked at a later point, possibly in another thread.
*
- * @see AccessControlContext
- *
* @return the AccessControlContext based on the current context.
+ * @see AccessControlContext
*/
public static AccessControlContext getContext() {
return java.security.AccessController.getContext();
@@ -200,8 +198,7 @@
* is permitted, or throws a suitable AccessControlException otherwise.
*
* @param perm the requested permission.
- *
- * @exception AccessControlException if the specified permission
+ * @throws AccessControlException if the specified permission
* is not permitted, based on the current security policy.
*/
public static void checkPermission(Permission perm) throws AccessControlException {
@@ -211,5 +208,6 @@
/**
* No instantiation allowed
*/
- private AccessController() {}
+ private AccessController() {
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/Module.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/Module.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/Module.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/Module.java Sun Feb 25 12:14:38 2007
@@ -21,7 +21,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
@@ -48,6 +47,7 @@
* When engaging this module to some service or operation , module will be notify by calling this
* method there module author can validate , add policy and do any thing that he want , and he can
* refuce the engage as well
+ *
* @param axisDescription
* @throws AxisFault
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java Sun Feb 25 12:14:38 2007
@@ -16,12 +16,11 @@
package org.apache.axis2.modules;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+import java.util.List;
public interface PolicyExtension {
public void addMethodsToStub(Document document, Element element, QName methodName, List assertions);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java Sun Feb 25 12:14:38 2007
@@ -60,7 +60,9 @@
"http://schemas.xmlsoap.org/soap/actor/next" ;
public static final String URI_SOAP12_NEXT_ROLE =
"http://www.w3.org/2003/05/soap-envelope/role/next";
- /** @deprecated use URI_SOAP12_NEXT_ROLE */
+ /**
+ * @deprecated use URI_SOAP12_NEXT_ROLE
+ */
public static final String URI_SOAP12_NEXT_ACTOR = URI_SOAP12_NEXT_ROLE;
public static final String URI_SOAP12_RPC =
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -19,8 +19,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* This is takes care of the IN-OUT sync MEP in the server side
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -21,7 +21,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -117,8 +117,9 @@
Method method = serviceObjectMaker.
getMethod("getServiceObject",
new Class[]{AxisService.class});
- if (method != null)
+ if (method != null) {
return method.invoke(serviceObjectMaker.newInstance(), new Object[]{service});
+ }
}
Parameter implInfoParam = service.getParameter(Constants.SERVICE_CLASS);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -19,8 +19,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* This is takes care of the IN-OUT sync MEP in the server side
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -6,7 +6,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
import org.apache.axis2.i18n.Messages;
import java.lang.reflect.Method;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Sun Feb 25 12:14:38 2007
@@ -23,7 +23,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java Sun Feb 25 12:14:38 2007
@@ -15,15 +15,15 @@
*/
package org.apache.axis2.transport;
-import java.io.OutputStream;
-import java.net.URL;
-
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import java.io.OutputStream;
+import java.net.URL;
+
/**
- * <p>
+ * <p/>
* MessageFormatter implementations are used by Axis2 to support serialization
* of messages to different message formats. (Eg: JSON). Users can register
* MessageFormatter implementations against a message type using the axis2.xml.
@@ -31,7 +31,7 @@
* property in the MessageContext. This can also be given as a parameter in the
* service.xml/axis2.xml for a per service based/engine wide configuration.
* </p>
- * <p>
+ * <p/>
* <messageFormatters>
* <messageFormatter contentType="application/soap+xml"
* class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
@@ -50,7 +50,7 @@
/**
* To support deffered writing transports as in http chunking.. Axis2 was
* doing this for some time..
- *
+ * <p/>
* Preserve flag can be used to preserve the envelope for later use. This is
* usefull when implementing authentication machnisms like NTLM.
*
@@ -64,6 +64,7 @@
/**
* Different message formats can set their own content types
* Eg: JSONFormatter can set the content type as application/json
+ *
* @param messageContext
* @param format
* @param soapAction
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java Sun Feb 25 12:14:38 2007
@@ -28,8 +28,7 @@
* enables both of those scenarios by allowing the transport to expose
* controls to the rest of the engine via a callback.
*/
-public interface RequestResponseTransport
-{
+public interface RequestResponseTransport {
/*This is the name of the property that is to be stored on the
MessageContext*/
@@ -70,6 +69,7 @@
/**
* This gives the current status of an RequestResponseTransport object.
+ *
* @return
*/
public RequestResponseTransportStatus getStatus ();
@@ -99,8 +99,7 @@
this.value = value;
}
- public int hashCode()
- {
+ public int hashCode() {
return value;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java Sun Feb 25 12:14:38 2007
@@ -16,10 +16,6 @@
package org.apache.axis2.transport;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.engine.ListenerManager;
@@ -30,6 +26,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
public class SimpleAxis2Server {
private static final Log log = LogFactory.getLog(SimpleHTTPServer.class);
@@ -56,8 +56,7 @@
}
});
- if ((invalidOptionsList.size()>0)||(args.length>4))
- {
+ if ((invalidOptionsList.size() > 0) || (args.length > 4)) {
printUsage();
return;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java Sun Feb 25 12:14:38 2007
@@ -20,8 +20,8 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.TransportInDescription;
/**
@@ -40,11 +40,11 @@
void stop() throws AxisFault;
/**
- * @deprecated Transport listener can expose more than EPRs. So this method should return an array of EPRs.
- * Deprecating this method for now and please use getEPRsForServices instead.
* @param serviceName
* @param ip
* @throws AxisFault
+ * @deprecated Transport listener can expose more than EPRs. So this method should return an array of EPRs.
+ * Deprecating this method for now and please use getEPRsForServices instead.
*/
EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault;
@@ -53,6 +53,7 @@
/**
* To get the sessionContext transport dependent manner. So that transport listener
* can return its own implementation of session managment
+ *
* @param messageContext : MessageContext which has all the relavent data
* @return SessionContext
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Sun Feb 25 12:14:38 2007
@@ -17,12 +17,6 @@
package org.apache.axis2.transport;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
@@ -46,6 +40,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
public class TransportUtils {
private static final Log log = LogFactory.getLog(TransportUtils.class);
@@ -135,16 +134,14 @@
charsetEncoding = builder.getDocument().getCharsetEncoding();
// } else if (soapNamespaceURI!=null){
// builder = Builder.getBuilder(inStream, charSetEnc,soapNamespaceURI);
- }else if (contentType!=null)
- {
+ } else if (contentType != null) {
OMBuilder builder = Builder.getBuilderFromSelector(contentType, msgContext);
if (builder != null) {
documentElement = builder.processDocument(inStream, msgContext);
// charsetEncoding = builder.getCharsetEncoding();
}
}
- if (documentElement==null)
- {
+ if (documentElement == null) {
//FIXME making soap defualt for the moment..might effect the performance
StAXBuilder builder = Builder.getSOAPBuilder(inStream, charSetEnc,soapNamespaceURI);
documentElement = builder.getDocumentElement();
@@ -253,6 +250,7 @@
/**
* Initial work for a builder selector which selects the builder for a given message format based on the the content type of the recieved message.
* content-type to builder mapping can be specified through the Axis2.xml.
+ *
* @param msgContext
* @return the builder registered against the given content-type
* @throws AxisFault
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java Sun Feb 25 12:14:38 2007
@@ -18,21 +18,20 @@
package org.apache.axis2.transport.http;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* The AbstractAgent acts as a simple dispatcher for http requests.
* It delegates incoming requests to processXyz methods while Xyz
@@ -86,7 +85,6 @@
}
/**
- *
* Callback method for index page. Forwards to {@link DEFAULT_INDEX_JSP} by default.
*
* @param httpServletRequest The incoming request.
@@ -98,7 +96,6 @@
}
/**
- *
* Callback method for unknown/unsupported requests. Returns HTTP Status 404 by default.
*
* @param httpServletRequest The incoming request.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Sun Feb 25 12:14:38 2007
@@ -25,8 +25,6 @@
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.WSDL20DefaultValueHolder;
-import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.Utils;
@@ -45,15 +43,11 @@
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.woden.wsdl20.extensions.http.HTTPLocation;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java Sun Feb 25 12:14:38 2007
@@ -18,19 +18,6 @@
package org.apache.axis2.transport.http;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
@@ -40,12 +27,26 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.commons.fileupload.*;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.RequestContext;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
/**
* Provides methods to process axis2 admin requests.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java Sun Feb 25 12:14:38 2007
@@ -15,20 +15,20 @@
*/
package org.apache.axis2.transport.http;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.transport.http.util.URLTemplatingUtil;
import javax.xml.stream.XMLStreamException;
-import java.io.OutputStream;
-import java.io.IOException;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import java.net.URL;
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java Sun Feb 25 12:14:38 2007
@@ -15,16 +15,15 @@
*/
package org.apache.axis2.transport.http;
-import java.io.IOException;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.ConfigurationContext;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
+import java.io.IOException;
/**
*
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java Sun Feb 25 12:14:38 2007
@@ -18,13 +18,6 @@
package org.apache.axis2.transport.http;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.zip.GZIPOutputStream;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -32,6 +25,11 @@
import org.apache.axis2.util.JavaUtils;
import org.apache.commons.httpclient.methods.RequestEntity;
+import javax.xml.stream.FactoryConfigurationError;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.GZIPOutputStream;
+
/**
* This Request Entity is used by the HTTPCommonsTransportSender. This wraps the
* Axis2 message formatter object.
@@ -102,8 +100,7 @@
}
public long getContentLength() {
- if (chunked)
- {
+ if (chunked) {
return -1;
}
if (bytes == null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Sun Feb 25 12:14:38 2007
@@ -27,9 +27,19 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.deployment.WarBasedAxisConfigurator;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisBindingMessage;
+import org.apache.axis2.description.AxisBindingOperation;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.Handler.InvocationResponse;
@@ -49,7 +59,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.SocketException;
import java.util.Map;
@@ -119,8 +133,9 @@
Object contextWritten = null;
OperationContext operationContext = msgContext.getOperationContext();
- if (operationContext != null)
+ if (operationContext != null) {
contextWritten = operationContext.getProperty(Constants.RESPONSE_WRITTEN);
+ }
response.setContentType("text/xml; charset="
+ msgContext
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Sun Feb 25 12:14:38 2007
@@ -16,11 +16,7 @@
package org.apache.axis2.transport.http;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.MIMEOutputUtils;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -43,10 +39,8 @@
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
@@ -170,8 +164,9 @@
if (transportOut!=null) {
Parameter param = transportOut.getParameter(HTTPConstants.OMIT_SOAP_12_ACTION);
Object value = null;
- if (param!=null)
+ if (param != null) {
value = param.getValue();
+ }
if (value!=null && JavaUtils.isTrueExplicitly(value)) {
if (msgContext.isSOAP11()!=true) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java Sun Feb 25 12:14:38 2007
@@ -16,12 +16,12 @@
package org.apache.axis2.transport.http;
+import org.apache.commons.httpclient.Header;
+
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
-import org.apache.commons.httpclient.Header;
public class CommonsTransportHeaders implements Map {
private Header[] headers;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.transport.http;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
@@ -28,12 +27,12 @@
import org.apache.axis2.transport.TransportUtils;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.HttpVersion;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
import java.io.IOException;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java Sun Feb 25 12:14:38 2007
@@ -17,18 +17,18 @@
package org.apache.axis2.transport.http;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.AxisConfiguration;
+
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
/**
* Class HTTPTransportReceiver
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sun Feb 25 12:14:38 2007
@@ -17,16 +17,6 @@
package org.apache.axis2.transport.http;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
@@ -52,6 +42,15 @@
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.Utils;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
public class HTTPTransportUtils {
@@ -206,8 +205,7 @@
if (headers != null) {
if (HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING)) ||
- HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING_LOWERCASE)))
- {
+ HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING_LOWERCASE))) {
in = new GZIPInputStream(in);
}
}
@@ -343,6 +341,7 @@
/**
* Detect the REST using the WSDL 2.0 constants
+ *
* @param contentType
* @return
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java Sun Feb 25 12:14:38 2007
@@ -16,12 +16,6 @@
package org.apache.axis2.transport.http;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.URI;
-
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -29,8 +23,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.Handler.InvocationResponse;
import org.apache.axis2.transport.RequestResponseTransport;
import org.apache.axis2.transport.http.server.HttpUtils;
@@ -44,7 +36,6 @@
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.MethodNotSupportedException;
-import org.apache.http.StatusLine;
import org.apache.http.entity.ContentProducer;
import org.apache.http.entity.EntityTemplate;
import org.apache.http.entity.StringEntity;
@@ -52,6 +43,12 @@
import org.apache.http.message.BasicStatusLine;
import org.apache.ws.commons.schema.XmlSchema;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
public class HTTPWorker implements Worker {
public HTTPWorker() {
@@ -227,14 +224,11 @@
Boolean holdResponse = (Boolean) msgContext.getProperty(RequestResponseTransport.HOLD_RESPONSE);
- if (pi.equals(InvocationResponse.SUSPEND) || (holdResponse!=null && Boolean.TRUE.equals(holdResponse)))
- {
- try
- {
+ if (pi.equals(InvocationResponse.SUSPEND) || (holdResponse != null && Boolean.TRUE.equals(holdResponse))) {
+ try {
((RequestResponseTransport)msgContext.getProperty(RequestResponseTransport.TRANSPORT_CONTROL)).awaitResponse();
}
- catch (InterruptedException e)
- {
+ catch (InterruptedException e) {
throw new IOException("We were interrupted, so this may not function correctly:"+ e.getMessage());
}
}
@@ -279,26 +273,22 @@
return HttpUtils.getIpAddress();
}
- class SimpleHTTPRequestResponseTransport implements RequestResponseTransport
- {
+ class SimpleHTTPRequestResponseTransport implements RequestResponseTransport {
private CountDownLatch responseReadySignal = new CountDownLatch(1);
RequestResponseTransportStatus status = RequestResponseTransportStatus.INITIAL;
- public void acknowledgeMessage(MessageContext msgContext) throws AxisFault
- {
+ public void acknowledgeMessage(MessageContext msgContext) throws AxisFault {
//TODO: Once the core HTTP API allows us to return an ack before unwinding, then the should be fixed
signalResponseReady();
}
- public void awaitResponse() throws InterruptedException
- {
+ public void awaitResponse() throws InterruptedException {
status = RequestResponseTransportStatus.WAITING;
responseReadySignal.await();
}
- public void signalResponseReady()
- {
+ public void signalResponseReady() {
status = RequestResponseTransportStatus.SIGNALLED;
responseReadySignal.countDown();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java Sun Feb 25 12:14:38 2007
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import java.util.List;
-import java.util.Properties;
-
import org.apache.commons.httpclient.HttpVersion;
import org.apache.commons.httpclient.auth.AuthPolicy;
import org.apache.commons.httpclient.auth.AuthScope;
+
+import java.util.List;
+import java.util.Properties;
/**
* Utility bean for setting transport properties in runtime.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java Sun Feb 25 12:14:38 2007
@@ -17,31 +17,13 @@
package org.apache.axis2.transport.http;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisService;
@@ -52,6 +34,23 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyRegistry;
import org.apache.ws.commons.schema.XmlSchema;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class ListingAgent extends AbstractAgent {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java Sun Feb 25 12:14:38 2007
@@ -16,18 +16,17 @@
package org.apache.axis2.transport.http;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.httpclient.methods.RequestEntity;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
public class RESTRequestEntity implements RequestEntity {
private byte[] bytes;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java Sun Feb 25 12:14:38 2007
@@ -16,10 +16,10 @@
package org.apache.axis2.transport.http;
+import org.apache.commons.httpclient.methods.RequestEntity;
+
import java.io.IOException;
import java.io.OutputStream;
-
-import org.apache.commons.httpclient.methods.RequestEntity;
public class RESTRequestEntity2 implements RequestEntity {
private String contentType;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java Sun Feb 25 12:14:38 2007
@@ -16,15 +16,6 @@
package org.apache.axis2.transport.http;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.MIMEOutputUtils;
@@ -35,6 +26,13 @@
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.http.util.URLTemplatingUtil;
import org.apache.axis2.util.JavaUtils;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.net.URL;
public class SOAPMessageFormatter implements MessageFormatter{
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java Sun Feb 25 12:14:38 2007
@@ -17,9 +17,9 @@
package org.apache.axis2.transport.http;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.axis2.transport.OutTransportInfo;
+
+import javax.servlet.http.HttpServletResponse;
public class ServletBasedOutTransportInfo implements OutTransportInfo {
private HttpServletResponse response;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Sun Feb 25 12:14:38 2007
@@ -17,32 +17,31 @@
package org.apache.axis2.transport.http;
-import java.io.File;
-import java.io.IOException;
-import java.net.SocketException;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.server.HttpFactory;
import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.transport.http.server.SimpleHttpServer;
import org.apache.axis2.transport.http.server.SessionManager;
+import org.apache.axis2.transport.http.server.SimpleHttpServer;
import org.apache.axis2.util.OptionsParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.net.SocketException;
+import java.util.Iterator;
+
/**
* This is a simple implementation of an HTTP server for processing
* SOAP requests via Apache's xml-axis2.
@@ -103,17 +102,20 @@
this.configurationContext = axisConf;
Parameter param = transprtIn.getParameter(PARAM_PORT);
- if (param != null)
+ if (param != null) {
this.port = Integer.parseInt((String) param.getValue());
+ }
- if (httpFactory == null)
+ if (httpFactory == null) {
httpFactory = new HttpFactory(configurationContext, port);
+ }
param = transprtIn.getParameter(HOST_ADDRESS);
- if (param != null)
+ if (param != null) {
hostAddress = ((String) param.getValue()).trim();
- else
+ } else {
hostAddress = httpFactory.getHostAddress();
+ }
} catch (Exception e1) {
throw new AxisFault(e1);
}
@@ -142,15 +144,11 @@
boolean startAllTransports = "all".equals(optionsParser.isValueSet('t'));
String repository= optionsParser.isValueSet('r');
- if (repository ==null)
- {
+ if (repository == null) {
args = optionsParser.getRemainingArgs();
- if (args!=null && args[0]!=null && args[0]!="")
- {
+ if (args != null && args[0] != null && args[0] != "") {
repository = args[0];
- }
- else
- {
+ } else {
printUsage();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java Sun Feb 25 12:14:38 2007
@@ -16,13 +16,12 @@
package org.apache.axis2.transport.http;
+import javax.servlet.http.HttpServletRequest;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
/**
* Pass-Thru / delayed get of the values from HttpServletRequest
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java Sun Feb 25 12:14:38 2007
@@ -15,20 +15,16 @@
*/
package org.apache.axis2.transport.http;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.http.util.URLTemplatingUtil;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMElement;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.net.URL;
-import java.net.MalformedURLException;
import java.util.Iterator;
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Sun Feb 25 12:14:38 2007
@@ -27,26 +27,16 @@
*/
package org.apache.axis2.transport.http.server;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.ConnectionReuseStrategy;
@@ -65,6 +55,13 @@
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpService;
+
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.util.HashMap;
+import java.util.Iterator;
/**
* This class is an extension of the defaulf HTTP service responsible for
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java Sun Feb 25 12:14:38 2007
@@ -31,14 +31,18 @@
public interface ConnectionListenerFailureHandler {
- /** The associated connection listener IOProcessor has failed
+ /**
+ * The associated connection listener IOProcessor has failed
+ *
* @param connectionListener the associated connection listener
* @param cause cause of failure
* @return true if the listener should attempt to re-establish itself, false if it should terminate.
*/
public boolean failed(IOProcessor connectionListener, Throwable cause);
- /** The associated connection listener IOProcessor is terminating abnormally
+ /**
+ * The associated connection listener IOProcessor is terminating abnormally
+ *
* @param connectionListener the associated connection listener
* @param message explanation of termination
* @param cause last exception that is causing termination
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java Sun Feb 25 12:14:38 2007
@@ -29,14 +29,14 @@
package org.apache.axis2.transport.http.server;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpServerConnection;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
public class DefaultConnectionListener implements IOProcessor {
private static Log LOG = LogFactory.getLog(DefaultConnectionListener.class);
@@ -49,22 +49,29 @@
private ServerSocket serversocket = null;
private final ConnectionListenerFailureHandler failureHandler;
- /** Default constructor called by HttpFactory. A custom HttpFactory subclass can call the other constructor to provide a custom ConnectionListenerErrorHandler */
+ /**
+ * Default constructor called by HttpFactory. A custom HttpFactory subclass can call the other constructor to provide a custom ConnectionListenerErrorHandler
+ */
public DefaultConnectionListener(int port, HttpConnectionFactory connfactory, HttpConnectionManager connmanager) throws IOException {
this(port, connfactory, connmanager, new DefaultConnectionListenerFailureHandler());
}
- /** Use this constructor to provide a custom ConnectionListenerFailureHandler, e.g. by subclassing DefaultConnectionListenerFailureHandler */
+ /**
+ * Use this constructor to provide a custom ConnectionListenerFailureHandler, e.g. by subclassing DefaultConnectionListenerFailureHandler
+ */
public DefaultConnectionListener(int port, HttpConnectionFactory connfactory, HttpConnectionManager connmanager,
ConnectionListenerFailureHandler failureHandler)
throws IOException {
super();
- if (connfactory == null)
+ if (connfactory == null) {
throw new IllegalArgumentException("Connection factory may not be null");
- if (connmanager == null)
+ }
+ if (connmanager == null) {
throw new IllegalArgumentException("Connection manager may not be null");
- if (failureHandler == null)
+ }
+ if (failureHandler == null) {
throw new IllegalArgumentException("Failure handler may not be null");
+ }
this.port = port;
this.connmanager = connmanager;
this.connfactory = connfactory;
@@ -91,11 +98,13 @@
HttpServerConnection conn = this.connfactory.newConnection(socket);
this.connmanager.process(conn);
} catch (Throwable ex) {
- if (Thread.interrupted())
+ if (Thread.interrupted()) {
break;
- if (!failureHandler.failed(this, ex))
+ }
+ if (!failureHandler.failed(this, ex)) {
break;
}
+ }
}
} finally {
destroy();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java Sun Feb 25 12:14:38 2007
@@ -32,7 +32,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-/** Default hander for failures in connection listener IOProcessors.
+/**
+ * Default hander for failures in connection listener IOProcessors.
* Supports configuration of number retries, delay per retry, and uptime interval considered a success (resets number retries to zero).
*/
public class DefaultConnectionListenerFailureHandler implements ConnectionListenerFailureHandler {
@@ -47,14 +48,17 @@
private long lastFirstFailure;
private int numRetries;
- /** Create a new DefaultConnectionListenerFailureHandler with default settings.
+ /**
+ * Create a new DefaultConnectionListenerFailureHandler with default settings.
* retryDelay is 1 second, successInterval is 60 seconds, maxRetries is 10
*/
public DefaultConnectionListenerFailureHandler() {
this(1000, 60000, 10);
}
- /** Create a new DefaultConnectionListenerFailureHandler
+ /**
+ * Create a new DefaultConnectionListenerFailureHandler
+ *
* @param retryDelay millis to wait before retrying
* @param successInterval millis after which an initial or retry attempt will be deemed a success, resetting retry count to 0
* @param maxRetries maximum number of retries allowed without a success, after which the listener will terminate
@@ -67,7 +71,8 @@
this.numRetries = 0;
}
- /** Default behavior is to log a warning and attempt retry per constructor config, eventually failing with a logged error and notification.
+ /**
+ * Default behavior is to log a warning and attempt retry per constructor config, eventually failing with a logged error and notification.
* May subclass and override this method to change the behavior.
*/
public boolean failed(IOProcessor connectionListener, Throwable cause) {
@@ -85,14 +90,16 @@
return false;
} else {
numRetries++;
- if (LOG.isWarnEnabled())
+ if (LOG.isWarnEnabled()) {
LOG.warn("Attempt number " + numRetries + " of " + maxRetries + " to reestalish connection listener " + connectionListener + " due to failure ",
cause);
+ }
return true;
}
}
- /** Default bevarior is to log the error.
+ /**
+ * Default bevarior is to log the error.
* May subclass and override this method to change behavior.
*/
public void notifyAbnormalTermination(IOProcessor connectionListener, String message, Throwable cause) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java Sun Feb 25 12:14:38 2007
@@ -29,12 +29,12 @@
package org.apache.axis2.transport.http.server;
-import java.io.IOException;
-import java.net.Socket;
-
import org.apache.http.HttpServerConnection;
import org.apache.http.impl.DefaultHttpServerConnection;
import org.apache.http.params.HttpParams;
+
+import java.io.IOException;
+import java.net.Socket;
public class DefaultHttpConnectionFactory implements HttpConnectionFactory {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java Sun Feb 25 12:14:38 2007
@@ -29,10 +29,6 @@
package org.apache.axis2.transport.http.server;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
@@ -49,6 +45,10 @@
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class DefaultHttpConnectionManager implements HttpConnectionManager {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionFactory.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionFactory.java Sun Feb 25 12:14:38 2007
@@ -29,10 +29,10 @@
package org.apache.axis2.transport.http.server;
+import org.apache.http.HttpServerConnection;
+
import java.io.IOException;
import java.net.Socket;
-
-import org.apache.http.HttpServerConnection;
public interface HttpConnectionFactory {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org