Author: dims
Date: Thu May 31 11:45:22 2007
New Revision: 543211
URL: http://svn.apache.org/viewvc?view=rev&rev=543211
Log:
Fix for AXIS2-2745 - Allow for a different EndpointDispatcherFactory
implementation to be plugged-in.
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/factory/EndpointDispatcherFactory.java
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java?view=diff&rev=543211&r1=543210&r2=543211
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
Thu May 31 11:45:22 2007
@@ -34,6 +34,7 @@
import org.apache.axis2.jaxws.message.impl.MessageFactoryImpl;
import org.apache.axis2.jaxws.message.impl.XMLPartFactoryImpl;
import org.apache.axis2.jaxws.message.util.impl.SAAJConverterFactoryImpl;
+import
org.apache.axis2.jaxws.server.dispatcher.factory.EndpointDispatcherFactory;
import
org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.EndpointLifecycleManagerFactory;
import java.util.Hashtable;
@@ -56,6 +57,7 @@
table.put(SAAJConverterFactory.class, new SAAJConverterFactoryImpl());
table.put(EndpointLifecycleManagerFactory.class, new
EndpointLifecycleManagerFactory());
table.put(ClassFinderFactory.class, new ClassFinderFactory());
+ table.put(EndpointDispatcherFactory.class, new
EndpointDispatcherFactory());
}
/** FactoryRegistry is currently a static singleton */
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java?view=diff&rev=543211&r1=543210&r2=543211
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
Thu May 31 11:45:22 2007
@@ -213,8 +213,9 @@
*/
private EndpointDispatcher getEndpointDispatcher(Class serviceImplClass,
Object serviceInstance)
throws Exception {
- return EndpointDispatcherFactory
- .createEndpointDispatcher(serviceImplClass, serviceInstance);
+ EndpointDispatcherFactory factory =
+
(EndpointDispatcherFactory)FactoryRegistry.getFactory(EndpointDispatcherFactory.class);
+ return factory.createEndpointDispatcher(serviceImplClass,
serviceInstance);
}
/*
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/factory/EndpointDispatcherFactory.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/factory/EndpointDispatcherFactory.java?view=diff&rev=543211&r1=543210&r2=543211
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/factory/EndpointDispatcherFactory.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/factory/EndpointDispatcherFactory.java
Thu May 31 11:45:22 2007
@@ -28,11 +28,10 @@
public EndpointDispatcherFactory() {
super();
-
}
- public static EndpointDispatcher createEndpointDispatcher(Class
serviceImplClass,
- Object
serviceInstance) {
+ public EndpointDispatcher createEndpointDispatcher(Class serviceImplClass,
+ Object serviceInstance)
{
// TODO: This check should be based on the
EndpointDescription processing of annotations
// It is left this way for now because some tests have an
@WebService annotation on
// Provider-based endpoints as a pre-existing workaround.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
