[jbossws-commits] JBossWS SVN: r9959 - in stack/native/trunk/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.
Author: richard.opalka(a)jboss.com
Date: 2009-05-05 08:10:07 -0400 (Tue, 05 May 2009)
New Revision: 9959
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
[JBWS-2074][JBWS-2634] refactoring momma
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2009-05-05
12:08:31 UTC (rev 9958)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2009-05-05
12:10:07 UTC (rev 9959)
@@ -45,7 +45,7 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.wsf.common.handler.GenericHandler;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
-import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.injection.InjectionHelper;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -168,8 +168,8 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler)handler).setHeaders(soapHeaders);
- JavaxAnnotationHelper.injectResources(handler, injections);
- JavaxAnnotationHelper.callPostConstructMethod(handler);
+ InjectionHelper.injectResources(handler, injections);
+ InjectionHelper.callPostConstructMethod(handler);
addHandler(jaxwsMetaData, handler, type);
}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2009-05-05
12:08:31 UTC (rev 9958)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2009-05-05
12:10:07 UTC (rev 9959)
@@ -27,8 +27,8 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
-import org.jboss.wsf.common.javax.PreDestroyHolder;
+import org.jboss.wsf.common.injection.InjectionHelper;
+import org.jboss.wsf.common.injection.PreDestroyHolder;
import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
import javax.servlet.ServletConfig;
@@ -84,7 +84,7 @@
{
try
{
- JavaxAnnotationHelper.callPreDestroyMethod(holder.getObject());
+ InjectionHelper.callPreDestroyMethod(holder.getObject());
}
catch (Exception exception)
{