AS7-6782 JAX-RS EJB integration does not generate component name corr…

…ectly
silveringsea · Mar 25, 2013 · bf86bc8 · bf86bc8
1 parent 7a398ac
commit bf86bc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsComponentDeployer.java b/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsComponentDeployer.java
@@ -85,7 +85,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
                 final String jndiName;
                 if (component.getViews().size() == 1) {
                     //only 1 view, just use the simple JNDI name
-                    jndiName = "java:app/" + moduleDescription.getModuleName() + "/" + componentClass.getSimpleName();
+                    jndiName = "java:app/" + moduleDescription.getModuleName() + "/" + component.getComponentName();
                 } else {
                     boolean found = false;
                     String foundType = null;
@@ -104,7 +104,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
                     if (!found) {
                         throw JaxrsMessages.MESSAGES.typeNameNotAnEjbView(Arrays.asList(jaxrsType), component.getComponentName());
                     }
-                    jndiName = "java:app/" + moduleDescription.getModuleName() + "/" + componentClass.getSimpleName() + "!" + foundType;
+                    jndiName = "java:app/" + moduleDescription.getModuleName() + "/" + component.getComponentName() + "!" + foundType;
                 }
 
                 JAXRS_LOGGER.debugf("Found JAX-RS Managed Bean: %s local jndi jaxRsTypeName: %s", component.getComponentClassName(), jndiName);

diff --git a/.../basic/src/test/java/org/jboss/as/test/integration/jaxrs/integration/ejb/EJBResource.java b/.../basic/src/test/java/org/jboss/as/test/integration/jaxrs/integration/ejb/EJBResource.java
@@ -33,7 +33,7 @@
 
 @Path("ejbInterceptor")
 @Produces({"text/plain"})
-@Stateless
+@Stateless(name = "CustomName")
 @Interceptors(EjbInterceptor.class)
 public class EJBResource implements EjbInterface {