You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by di...@apache.org on 2004/10/29 23:10:04 UTC
svn commit: rev 55995 - in incubator/beehive/trunk/wsm: external samples/dropInDeployment/AddressBook/client/lib src/runtime/org/apache/beehive/wsm/axis src/runtime/org/apache/beehive/wsm/axis/util
Author: dims
Date: Fri Oct 29 14:10:03 2004
New Revision: 55995
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/JavaArchiveFilter.java
Modified:
incubator/beehive/trunk/wsm/external/axis-ant.jar
incubator/beehive/trunk/wsm/external/axis.jar
incubator/beehive/trunk/wsm/external/jaxrpc.jar
incubator/beehive/trunk/wsm/external/saaj.jar
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/axis-ant.jar
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/axis.jar
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/jaxrpc.jar
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/saaj.jar
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
Log:
- Cleanup HandlerHandler
- Move ClasspathUtils to Axis itself (duplicate code)
- Update to latest Axis
Modified: incubator/beehive/trunk/wsm/external/axis-ant.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/external/axis.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/external/jaxrpc.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/external/saaj.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/axis-ant.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/axis.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/jaxrpc.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/lib/saaj.jar
==============================================================================
Binary files. No diff available.
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java Fri Oct 29 14:10:03 2004
@@ -126,8 +126,8 @@
throws Exception {
SOAPService rpc = null;
if (null != wsm) {
- HandlerHandler hh = new HandlerHandler();
- hh.init(wsm);
+ HandlerHandler hh = new HandlerHandler(wsm);
+ hh.init();
rpc = new SOAPService(hh, new ControlProvider(), hh);
rpc.setName(wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName());
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java Fri Oct 29 14:10:03 2004
@@ -47,7 +47,7 @@
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.XMLUtils;
-import org.apache.beehive.wsm.axis.util.ClasspathUtils;
+import org.apache.axis.utils.ClasspathUtils;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
import org.apache.commons.logging.Log;
@@ -142,8 +142,8 @@
throws Exception {
SOAPService rpc = null;
if (null != wsm) {
- HandlerHandler hh = new HandlerHandler();
- hh.init(wsm);
+ HandlerHandler hh = new HandlerHandler(wsm);
+ hh.init();
rpc = new SOAPService(hh, new ControlProvider(), hh);
rpc.setName(wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName());
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java Fri Oct 29 14:10:03 2004
@@ -19,10 +19,7 @@
*/
package org.apache.beehive.wsm.axis;
-import org.apache.axis.AxisFault;
-import org.apache.axis.MessageContext;
-import org.apache.axis.handlers.BasicHandler;
-import org.apache.axis.handlers.HandlerChainImpl;
+import org.apache.axis.handlers.JAXRPCHandler;
import org.apache.beehive.wsm.jsr181.model.SOAPMessageHandlerInfo;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
@@ -34,39 +31,27 @@
* name like HandlerManager or something.
*
* @author Jonathan Colwell
- * All but the init method was copied from org.apache.axis.handlers.JAXRPCHandler
- * written by Davanum Srinivas (dims@yahoo.com) but the JAXRPCHandler only
- * allowed a single handler to be added to the HandlerChain. Subclassing would
- * have be preferable but the internal HandlerChainImpl was package private.
*/
-public class HandlerHandler extends BasicHandler {
+public class HandlerHandler extends JAXRPCHandler {
- private HandlerChainImpl impl;
+ private WebServiceTYPEMetadata wsm;
+
+ /**
+ * Constructor with WebServiceTYPEMetadata parameter
+ *
+ * @param wsm
+ */
+ public HandlerHandler(WebServiceTYPEMetadata wsm) {
+ this.wsm = wsm;
+ }
/**
* Uses the soap handler configuration information in the metadata to
* configure the HandlerChain.
*/
public void init(WebServiceTYPEMetadata wsm) {
- impl = new HandlerChainImpl();
for (SOAPMessageHandlerInfo info : wsm.getSoapHandlers()) {
- impl.addNewHandler(info.getClassName(), info.getParameterMap());
+ addNewHandler(info.getClassName(), info.getParameterMap());
}
- }
-
- public void invoke(MessageContext msgContext) throws AxisFault {
- if (!msgContext.getPastPivot()) {
- impl.handleRequest(msgContext);
- } else {
- impl.handleResponse(msgContext);
- }
- }
-
- public void onFault(MessageContext msgContext) {
- impl.handleFault(msgContext);
- }
-
- public void cleanup() {
- impl.destroy();
}
}