Author: alessio.soldano(a)jboss.com Date: 2010-05-26 06:00:59 -0400 (Wed, 26 May 2010) New Revision: 12335 Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml Log: [JBPAPP-4384] Updating 3.1.2.SP6 tag as it's not been built yet Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 09:51:37 UTC (rev 12334) +++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 10:00:59 UTC (rev 12335) @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; +import javax.naming.Context; import javax.xml.namespace.QName; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.HandlerResolver; @@ -46,6 +47,8 @@ import org.jboss.wsf.common.handler.GenericHandler; import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.common.injection.InjectionHelper; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointAssociation; import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -168,7 +171,12 @@ if (handler instanceof GenericSOAPHandler) ((GenericSOAPHandler)handler).setHeaders(soapHeaders); - InjectionHelper.injectResources(handler, injections); + if (injections != null) + { + Endpoint ep = EndpointAssociation.getEndpoint(); + Context ctx = ep == null ? null : ep.getJNDIContext(); + InjectionHelper.injectResources(handler, injections, ctx); + } InjectionHelper.callPostConstructMethod(handler); addHandler(jaxwsMetaData, handler, type); Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml 2010-05-26 09:51:37 UTC (rev 12334) +++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml 2010-05-26 10:00:59 UTC (rev 12335) @@ -17,7 +17,7 @@ <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> - <surefire.gc.args>-XX:MaxPermSize=128m</surefire.gc.args> + <surefire.gc.args>-Xmx256m -XX:MaxPermSize=256m</surefire.gc.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> Modified: stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml 2010-05-26 09:51:37 UTC (rev 12334) +++ stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml 2010-05-26 10:00:59 UTC (rev 12335) @@ -47,9 +47,9 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.1.0.SP5</jbossws.common.version> - <jbossws.framework.version>3.1.2.SP6</jbossws.framework.version> - <jbossws.spi.version>1.1.2.SP3</jbossws.spi.version> + <jbossws.common.version>1.1.0.SP6</jbossws.common.version> + <jbossws.framework.version>3.1.2.SP7</jbossws.framework.version> + <jbossws.spi.version>1.1.2.SP4</jbossws.spi.version> <!-- [JBWS-2505] --> <!-- START --> <!--