JBossWS SVN: r9889 - in container/jboss50/branches: jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 02:11:57 -0400 (Tue, 28 Apr 2009)
New Revision: 9889
Modified:
container/jboss50/branches/jboss500/pom.xml
container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
container/jboss50/branches/jboss501/pom.xml
container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
Log:
[JBWS-2074][JBWS-2631] fixing AS integration layer
Modified: container/jboss50/branches/jboss500/pom.xml
===================================================================
--- container/jboss50/branches/jboss500/pom.xml 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss500/pom.xml 2009-04-28 06:11:57 UTC (rev 9889)
@@ -24,8 +24,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.10.GA</jbossws.common.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -27,6 +27,7 @@
import java.util.List;
import javax.management.ObjectName;
+import javax.naming.Context;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -140,6 +141,11 @@
{
return ejbMetaData.determineContainerName();
}
+
+ public Context getContext()
+ {
+ return ejbContainer.getEnc();
+ }
public String getComponentName()
{
Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -28,17 +28,24 @@
import java.util.Set;
import javax.jws.WebService;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.xml.ws.WebServiceProvider;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
@@ -50,6 +57,9 @@
public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect
{
+ private static final String EJB3_JNDI_PREFIX = "java:env/";
+ private static final String POJO_JNDI_PREFIX = "java:comp/env/";
+
@Override
public void create(Deployment dep)
{
@@ -59,23 +69,36 @@
if (webMD == null)
throw new IllegalStateException("JBossWebMetaData not found");
+ DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+ if (unit == null)
+ throw new IllegalStateException("DeploymentUnit not found");
+
List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
DeploymentType deploymentType = dep.getType();
if (deploymentType == DeploymentType.JAXWS_JSE)
{
injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
+ try
+ {
+ final Context ctx = new InitialContext();
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, POJO_JNDI_PREFIX);
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+ }
+ }
+ catch (NamingException ne)
+ {
+ throw new RuntimeException(ne);
+ }
}
else if (deploymentType == DeploymentType.JAXWS_EJB3)
{
- // [JBWS-2074] see comment in JIRA
- log.warn("Both @Resource annotated methods/fields and descriptor specified injections don't work in handlers associated with EJB3 endpoints");
- /*
JBossMetaData jbossMD = unit.getAttachment(JBossMetaData.class);
JBossEnterpriseBeansMetaData jebMDs = jbossMD.getEnterpriseBeans();
WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
- EnvironmentEntriesMetaData attachment = new EnvironmentEntriesMetaData();
Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
@@ -83,16 +106,16 @@
WebServiceDeclaration container = it.next();
if (isWebServiceBean(container))
{
+ Context ctx = container.getContext();
String ejbName = container.getComponentName();
EnvironmentEntriesMetaData ejbEnvEntries = jebMDs.get(ejbName).getEnvironmentEntries();
- attachment.addAll(ejbEnvEntries);
injectionMD.addAll(buildInjectionMetaData(ejbEnvEntries));
+ Endpoint endpoint = dep.getService().getEndpointByName(ejbName);
+ InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, EJB3_JNDI_PREFIX);
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
}
}
- */
}
-
- dep.getService().addAttachment(InjectionsMetaData.class, new InjectionsMetaData(injectionMD));
}
@Override
@@ -134,9 +157,7 @@
targetClass = ritMD.getInjectionTargetClass();
targetName = ritMD.getInjectionTargetName();
InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, valueClass, envEntryName, envEntryValue != null);
-
retVal.add(injectionMD);
- log.debug(injectionMD);
}
}
}
Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -82,7 +82,7 @@
throw new IllegalStateException("Cannot get target bean instance", ex);
}
- JavaxAnnotationHelper.injectResources(targetBean, ep.getService().getAttachment(InjectionsMetaData.class));
+ JavaxAnnotationHelper.injectResources(targetBean, ep.getAttachment(InjectionsMetaData.class));
JavaxAnnotationHelper.callPostConstructMethod(targetBean);
ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
Modified: container/jboss50/branches/jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jboss501/pom.xml 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss501/pom.xml 2009-04-28 06:11:57 UTC (rev 9889)
@@ -24,8 +24,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.10.GA</jbossws.common.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -27,6 +27,7 @@
import java.util.List;
import javax.management.ObjectName;
+import javax.naming.Context;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -140,6 +141,11 @@
{
return ejbMetaData.determineContainerName();
}
+
+ public Context getContext()
+ {
+ return ejbContainer.getEnc();
+ }
public String getComponentName()
{
Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -28,17 +28,24 @@
import java.util.Set;
import javax.jws.WebService;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.xml.ws.WebServiceProvider;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
@@ -50,6 +57,9 @@
public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect
{
+ private static final String EJB3_JNDI_PREFIX = "java:env/";
+ private static final String POJO_JNDI_PREFIX = "java:comp/env/";
+
@Override
public void create(Deployment dep)
{
@@ -59,23 +69,36 @@
if (webMD == null)
throw new IllegalStateException("JBossWebMetaData not found");
+ DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+ if (unit == null)
+ throw new IllegalStateException("DeploymentUnit not found");
+
List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
DeploymentType deploymentType = dep.getType();
if (deploymentType == DeploymentType.JAXWS_JSE)
{
injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
+ try
+ {
+ final Context ctx = new InitialContext();
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, POJO_JNDI_PREFIX);
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+ }
+ }
+ catch (NamingException ne)
+ {
+ throw new RuntimeException(ne);
+ }
}
else if (deploymentType == DeploymentType.JAXWS_EJB3)
{
- // [JBWS-2074] see comment in JIRA
- log.warn("Both @Resource annotated methods/fields and descriptor specified injections don't work in handlers associated with EJB3 endpoints");
- /*
JBossMetaData jbossMD = unit.getAttachment(JBossMetaData.class);
JBossEnterpriseBeansMetaData jebMDs = jbossMD.getEnterpriseBeans();
WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
- EnvironmentEntriesMetaData attachment = new EnvironmentEntriesMetaData();
Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
@@ -83,16 +106,16 @@
WebServiceDeclaration container = it.next();
if (isWebServiceBean(container))
{
+ Context ctx = container.getContext();
String ejbName = container.getComponentName();
EnvironmentEntriesMetaData ejbEnvEntries = jebMDs.get(ejbName).getEnvironmentEntries();
- attachment.addAll(ejbEnvEntries);
injectionMD.addAll(buildInjectionMetaData(ejbEnvEntries));
+ Endpoint endpoint = dep.getService().getEndpointByName(ejbName);
+ InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, EJB3_JNDI_PREFIX);
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
}
}
- */
}
-
- dep.getService().addAttachment(InjectionsMetaData.class, new InjectionsMetaData(injectionMD));
}
@Override
@@ -134,9 +157,7 @@
targetClass = ritMD.getInjectionTargetClass();
targetName = ritMD.getInjectionTargetName();
InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, valueClass, envEntryName, envEntryValue != null);
-
retVal.add(injectionMD);
- log.debug(injectionMD);
}
}
}
Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2009-04-28 05:59:21 UTC (rev 9888)
+++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2009-04-28 06:11:57 UTC (rev 9889)
@@ -82,7 +82,7 @@
throw new IllegalStateException("Cannot get target bean instance", ex);
}
- JavaxAnnotationHelper.injectResources(targetBean, ep.getService().getAttachment(InjectionsMetaData.class));
+ JavaxAnnotationHelper.injectResources(targetBean, ep.getAttachment(InjectionsMetaData.class));
JavaxAnnotationHelper.callPostConstructMethod(targetBean);
ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
15 years
JBossWS SVN: r9887 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 01:56:46 -0400 (Tue, 28 Apr 2009)
New Revision: 9887
Added:
container/jboss50/branches/jboss501/
Log:
creating user branch
Copied: container/jboss50/branches/jboss501 (from rev 9886, container/jboss50/tags/jbossws-jboss501-3.1.1.GA)
15 years
JBossWS SVN: r9886 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 01:56:24 -0400 (Tue, 28 Apr 2009)
New Revision: 9886
Added:
container/jboss50/branches/jboss500/
Log:
creating user branch
Copied: container/jboss50/branches/jboss500 (from rev 9885, container/jboss50/tags/jbossws-jboss500-3.1.1.GA)
15 years
JBossWS SVN: r9885 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/core/jaxws/handler and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 01:54:42 -0400 (Tue, 28 Apr 2009)
New Revision: 9885
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/native/trunk/pom.xml
Log:
[JBWS-2074][JBWS-2631] fixing Native + enabling tests
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-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2009-04-28 05:54:42 UTC (rev 9885)
@@ -288,7 +288,7 @@
if (endpointConfigMD.getEndpointMetaData() instanceof ServerEndpointMetaData)
{
ServerEndpointMetaData endpointMD = ((ServerEndpointMetaData)endpointConfigMD.getEndpointMetaData());
- return endpointMD.getEndpoint().getService().getAttachment(InjectionsMetaData.class);
+ return endpointMD.getEndpoint().getAttachment(InjectionsMetaData.class);
}
else
{
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-28 05:54:42 UTC (rev 9885)
@@ -9,6 +9,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2631] Fix resource injection in JAX-WS handlers associated with EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-28 05:54:42 UTC (rev 9885)
@@ -6,6 +6,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2631] Fix resource injection in JAX-WS handlers associated with EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-28 05:54:42 UTC (rev 9885)
@@ -6,6 +6,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2631] Fix resource injection in JAX-WS handlers associated with EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-28 05:54:42 UTC (rev 9885)
@@ -6,6 +6,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2631] Fix resource injection in JAX-WS handlers associated with EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-04-28 05:47:58 UTC (rev 9884)
+++ stack/native/trunk/pom.xml 2009-04-28 05:54:42 UTC (rev 9885)
@@ -50,13 +50,13 @@
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.1.2-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.jboss600.version>3.1.2-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
15 years
JBossWS SVN: r9884 - in common/trunk: src/main/java/org/jboss/wsf/common/javax and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 01:47:58 -0400 (Tue, 28 Apr 2009)
New Revision: 9884
Modified:
common/trunk/pom.xml
common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
Log:
[JBWS-2074][JBWS-2631] fixing helper
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2009-04-28 05:42:12 UTC (rev 9883)
+++ common/trunk/pom.xml 2009-04-28 05:47:58 UTC (rev 9884)
@@ -26,7 +26,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jboss.common.version>2.2.7.GA</jboss.common.version>
<jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
</properties>
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-28 05:42:12 UTC (rev 9883)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-28 05:47:58 UTC (rev 9884)
@@ -26,7 +26,7 @@
import java.util.Collection;
import javax.annotation.Resource;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import javax.xml.ws.WebServiceContext;
import org.jboss.logging.Logger;
@@ -49,7 +49,6 @@
{
private static final Logger LOG = Logger.getLogger(JavaxAnnotationHelper.class);
- private static final String JNDI_PREFIX = "java:comp/env/";
private static final ClassProcessor<Method> POST_CONSTRUCT_METHOD_FINDER = new PostConstructMethodFinder();
private static final ClassProcessor<Method> PRE_DESTROY_METHOD_FINDER = new PreDestroyMethodFinder();
private static final ClassProcessor<Method> RESOURCE_METHOD_FINDER = new ResourceMethodFinder(WebServiceContext.class, false);
@@ -80,47 +79,48 @@
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
+
+ if (injections == null)
+ return;
Class<?> instanceClass = instance.getClass();
- InitialContext ctx = new InitialContext();
+ // inject descriptor driven annotations
+ final Context ctx = injections.getContext();
+ final String envPrefix = injections.getContextRoot();
- // inject descriptor driven annotations
- if (injections != null)
+ Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
- for (InjectionMetaData injectionMD : injectionMDs)
+ Method method = getMethod(injectionMD, instanceClass);
+ if (method != null)
{
- Method method = getMethod(injectionMD, instanceClass);
- if (method != null)
+ try
{
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx, envPrefix);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject method (descriptor driven injection): " + injectionMD, e);
+ }
+ }
+ else
+ {
+ Field field = getField(injectionMD, instanceClass);
+ if (field != null)
+ {
try
{
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx, envPrefix);
}
catch (Exception e)
{
- LOG.warn("Cannot inject method (descriptor driven injection): " + injectionMD, e);
+ LOG.warn("Cannot inject field (descriptor driven injection): " + injectionMD, e);
}
}
else
{
- Field field = getField(injectionMD, instanceClass);
- if (field != null)
- {
- try
- {
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- LOG.warn("Cannot inject field (descriptor driven injection): " + injectionMD, e);
- }
- }
- else
- {
- LOG.warn("Cannot find injection target for: " + injectionMD);
- }
+ LOG.warn("Cannot find injection target for: " + injectionMD);
}
}
}
@@ -131,7 +131,7 @@
{
try
{
- inject(instance, method, method.getAnnotation(Resource.class).name(), ctx);
+ inject(instance, method, method.getAnnotation(Resource.class).name(), ctx, envPrefix);
}
catch (Exception e)
{
@@ -145,7 +145,7 @@
{
try
{
- inject(instance, field, field.getAnnotation(Resource.class).name(), ctx);
+ inject(instance, field, field.getAnnotation(Resource.class).name(), ctx, envPrefix);
}
catch (Exception e)
{
@@ -250,18 +250,19 @@
/**
* Injects @Resource annotated method.
*
+ * @param instance to invoke method on
* @param method to invoke
- * @param instance to invoke method on
* @param resourceName resource name
* @param cxt JNDI context
+ * @param envPrefix JNDI environment prefix
* @throws Exception if any error occurs
* @see org.jboss.wsf.common.javax.finders.ResourceMethodFinder
*/
- private static void inject(final Object instance, final Method method, final String resourceName, final InitialContext ctx)
+ private static void inject(final Object instance, final Method method, final String resourceName, final Context ctx, final String envPrefix)
throws Exception
{
final String beanName = convertToBeanName(method.getName());
- final Object value = ctx.lookup(getName(resourceName, beanName));
+ final Object value = ctx.lookup(envPrefix + getName(resourceName, beanName));
LOG.debug("Injecting method: " + method);
invokeMethod(instance, method, new Object[] {value});
@@ -274,14 +275,15 @@
* @param instance to modify field on
* @param resourceName resource name
* @param cxt JNDI context
+ * @param envPrefix JNDI environment prefix
* @throws Exception if any error occurs
* @see org.jboss.wsf.common.javax.finders.ResourceFieldFinder
*/
- private static void inject(final Object instance, final Field field, final String resourceName, final InitialContext ctx)
+ private static void inject(final Object instance, final Field field, final String resourceName, final Context ctx, final String envPrefix)
throws Exception
{
final String beanName = field.getName();
- final Object value = ctx.lookup(getName(resourceName, beanName));
+ final Object value = ctx.lookup(envPrefix + getName(resourceName, beanName));
LOG.debug("Injecting field: " + field);
setField(instance, field, value);
@@ -307,7 +309,7 @@
*/
private static String getName(final String resourceName, final String beanName)
{
- return JNDI_PREFIX + (resourceName.length() > 0 ? resourceName : beanName);
+ return resourceName.length() > 0 ? resourceName : beanName;
}
/**
15 years
JBossWS SVN: r9883 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/injection and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-28 01:42:12 -0400 (Tue, 28 Apr 2009)
New Revision: 9883
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java
Log:
[JBWS-2074][JBWS-2631] extending SPI
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2009-04-27 16:41:45 UTC (rev 9882)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2009-04-28 05:42:12 UTC (rev 9883)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.spi.deployment.integration;
+import javax.naming.Context;
+
/**
* A minimum web service meta data representation that offers a generic
* way to access more fine grained meta data through {@link #getAnnotation(Class)}
@@ -47,6 +49,12 @@
* @return
*/
String getComponentClassName();
+
+ /**
+ * Returns JNDI context associated with EJB container.
+ * @return
+ */
+ Context getContext();
/**
* Get a unified meta data view represented by an annotation.
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2009-04-27 16:41:45 UTC (rev 9882)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2009-04-28 05:42:12 UTC (rev 9883)
@@ -25,6 +25,8 @@
import java.util.Collection;
import java.util.LinkedList;
+import javax.naming.Context;
+
/**
* Injections metadata container.
*
@@ -42,23 +44,58 @@
* Injections metadata.
*/
private final Collection<InjectionMetaData> injections;
+
+ /**
+ * JNDI context.
+ */
+ private final Context ctx;
+
+ /**
+ * Environment context root.
+ */
+ private final String envCtx;
/**
* Constructor.
*
* @param injections injection definitions list
+ * @param ctx JNDI context
*/
- public InjectionsMetaData(Collection<InjectionMetaData> injections)
+ public InjectionsMetaData(Collection<InjectionMetaData> injections, Context ctx, String envCtx)
{
super();
if (injections == null)
throw new IllegalArgumentException("injections metadata list cannot be null");
+ if (ctx == null)
+ throw new IllegalArgumentException("JNDI context cannot be null");
+ if (envCtx == null)
+ throw new IllegalArgumentException("Environment JNDI context name cannot be null");
this.injections = injections;
+ this.ctx = ctx;
+ this.envCtx = envCtx;
}
/**
+ * Returns associated JNDI context.
+ * @return associated JNDI context
+ */
+ public Context getContext()
+ {
+ return this.ctx;
+ }
+
+ /**
+ * Returns JNDI context root.
+ * @return JNDI context root
+ */
+ public String getContextRoot()
+ {
+ return this.envCtx;
+ }
+
+ /**
* Returns all descriptor driven injections metadata for particular class.
*
* @param clazz class to return injection definitions for
15 years
JBossWS SVN: r9882 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-27 12:41:45 -0400 (Mon, 27 Apr 2009)
New Revision: 9882
Added:
stack/native/branches/dlofthouse/JBWS-2633/
Log:
Branch to work on test case.
Copied: stack/native/branches/dlofthouse/JBWS-2633 (from rev 9881, stack/native/trunk)
15 years
JBossWS SVN: r9881 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-25 09:39:56 -0400 (Sat, 25 Apr 2009)
New Revision: 9881
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2582][JBWS-2584][JBWS-2591][JBWS-2593] Enabling tests (thanks to update to CXF 2.2.1)
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-25 13:30:50 UTC (rev 9880)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-25 13:39:56 UTC (rev 9881)
@@ -52,16 +52,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
-# used when wsdl contains mutiple schemas
-org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
-org/jboss/test/ws/jaxws/jbws2591/**
-
-# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
-org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-25 13:30:50 UTC (rev 9880)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-25 13:39:56 UTC (rev 9881)
@@ -52,16 +52,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
-# used when wsdl contains mutiple schemas
-org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
-org/jboss/test/ws/jaxws/jbws2591/**
-
-# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
-org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-25 13:30:50 UTC (rev 9880)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-25 13:39:56 UTC (rev 9881)
@@ -52,16 +52,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
-# used when wsdl contains mutiple schemas
-org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
-org/jboss/test/ws/jaxws/jbws2591/**
-
-# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
-org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-25 13:30:50 UTC (rev 9880)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-25 13:39:56 UTC (rev 9881)
@@ -52,16 +52,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
-# used when wsdl contains mutiple schemas
-org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
-org/jboss/test/ws/jaxws/jbws2591/**
-
-# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
-org/jboss/test/ws/jaxws/jbws2593/**
15 years
JBossWS SVN: r9880 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-25 09:30:50 -0400 (Sat, 25 Apr 2009)
New Revision: 9880
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
Log:
[CXF-2117] Removing fixme
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2009-04-25 13:30:36 UTC (rev 9879)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2009-04-25 13:30:50 UTC (rev 9880)
@@ -71,27 +71,13 @@
System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
}
}
- if (!isIntegrationCXF())
- {
- expStr.append(":Inbound:PortHandler");
- }
- else
- {
- System.out.println("FIXME: [CXF-2117] method AnnotationHandlerChainBuilder.patternMatches() causes CXF portability issues with other JAX-WS stacks");
- }
+ expStr.append(":Inbound:PortHandler");
expStr.append(":Inbound:ProtocolHandler");
expStr.append(":Inbound:LogicalSourceHandler");
expStr.append(":endpoint");
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
- if (!isIntegrationCXF())
- {
- expStr.append(":Outbound:PortHandler");
- }
- else
- {
- System.out.println("FIXME: [CXF-2117] method AnnotationHandlerChainBuilder.patternMatches() causes CXF portability issues with other JAX-WS stacks");
- }
+ expStr.append(":Outbound:PortHandler");
if (isIntegrationNative())
{
expStr.append(":Inbound:PortHandler");
@@ -140,27 +126,13 @@
System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
}
}
- if (!isIntegrationCXF())
- {
- expStr.append(":Inbound:PortHandler");
- }
- else
- {
- System.out.println("FIXME: [CXF-2117] method AnnotationHandlerChainBuilder.patternMatches() causes CXF portability issues with other JAX-WS stacks");
- }
+ expStr.append(":Inbound:PortHandler");
expStr.append(":Inbound:ProtocolHandler");
expStr.append(":Inbound:LogicalSourceHandler");
expStr.append(":endpoint");
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
- if (!isIntegrationCXF())
- {
- expStr.append(":Outbound:PortHandler");
- }
- else
- {
- System.out.println("FIXME: [CXF-2117] method AnnotationHandlerChainBuilder.patternMatches() causes CXF portability issues with other JAX-WS stacks");
- }
+ expStr.append(":Outbound:PortHandler");
if (isIntegrationNative())
{
expStr.append(":Inbound:PortHandler");
15 years