[jboss-cvs] JBossAS SVN: r80110 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 27 12:17:00 EDT 2008
Author: emuckenhuber
Date: 2008-10-27 12:17:00 -0400 (Mon, 27 Oct 2008)
New Revision: 80110
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBFieldProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBMethodProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ProcessorUtils.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/Super.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyServiceBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyBaseInterceptor.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/RequestAttributeListener.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/ServletFilter.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/TestServlet.java
Log:
[JBMETA-137] update @EJB reference names
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBFieldProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBFieldProcessor.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBFieldProcessor.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -50,8 +50,9 @@
protected String getName(Field element)
{
String name = element.getName();
- return name;
+ return element.getDeclaringClass().getName() + "/" + name;
}
+
@Override
protected Class getType(Field element)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBMethodProcessor.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/EJBMethodProcessor.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -58,8 +58,9 @@
{
name = name.toLowerCase();
}
- return name;
+ return element.getDeclaringClass().getName() + "/" + name;
}
+
@Override
protected Class getType(Method element)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ProcessorUtils.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ProcessorUtils.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ProcessorUtils.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -147,7 +147,7 @@
public static Collection<Class<? extends Annotation>> createAnnotationSet(Class<? extends Annotation> annotation)
{
- Set<Class<? extends Annotation>> set = new HashSet<Class<? extends Annotation>>();
+ Set<Class<? extends Annotation>> set = new HashSet<Class<? extends Annotation>>(1);
set.add(annotation);
return set;
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -117,7 +117,7 @@
ApplicationClient5MetaData clientMD = creator.create(classes);
assertEquals(3, clientMD.getAnnotatedEjbReferences().size());
- AnnotatedEJBReferenceMetaData resourceMethodBean = clientMD.getAnnotatedEjbReferences().get("resourceMethodBean");
+ AnnotatedEJBReferenceMetaData resourceMethodBean = clientMD.getAnnotatedEjbReferences().get(classMainName + "/resourceMethodBean");
assertNotNull(resourceMethodBean);
assertEquals(ResourceIF.class, resourceMethodBean.getBeanInterface());
assertEquals("ResourceOnMethodBean", resourceMethodBean.getLink());
@@ -128,7 +128,7 @@
assertEquals(Client.class.getName(), method.getInjectionTargetClass());
assertEquals("setResourceMethodBean", method.getInjectionTargetName());
- AnnotatedEJBReferenceMetaData resourceFieldBean = clientMD.getAnnotatedEjbReferences().get("resourceFieldBean");
+ AnnotatedEJBReferenceMetaData resourceFieldBean = clientMD.getAnnotatedEjbReferences().get(classMainName + "/resourceFieldBean");
assertNotNull(resourceFieldBean);
assertEquals("ResourceOnFieldBean", resourceFieldBean.getLink());
Set<ResourceInjectionTargetMetaData> resourceFieldBeanTargets = resourceFieldBean.getInjectionTargets();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/Super.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/Super.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/Super.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -44,13 +44,13 @@
@WebServiceRef(name="service/somewebservice")
static DefaultWebServiceService service = null;
- @EJB(beanName = "ResourceOnFieldBean")
+ @EJB(name = "resourceFieldBean", beanName = "ResourceOnFieldBean")
private static ResourceIF resourceFieldBean;
@EJB(name="ejb/resourceClassBean", beanName = "ResourcesOnClassBean", mappedName="refs/resources/ResourcesOnClassBean")
private static ResourceIF resourceClassBean;
- @EJB(beanName = "ResourceOnMethodBean")
+ @EJB(name = "resourceMethodBean", beanName = "ResourceOnMethodBean")
private static void setResourceMethodBean(ResourceIF rif)
{
resourceMethodBean = rif;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyServiceBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyServiceBean.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyServiceBean.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -74,7 +74,7 @@
@AspectDomain("myAspectDomain")
public class MyServiceBean implements MyServiceManagement
{
- @EJB
+ @EJB(name = "injectedField")
private MyStatelessLocal injectedField;
@Resource(description="SessionContext-resource-env-ref")
private SessionContext context;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -72,7 +72,7 @@
@ExcludeDefaultInterceptors
public class MyStatelessBean implements MyStatelessLocal, MyStatelessRemote
{
- @EJB
+ @EJB(name = "injectedField")
private MyStatelessLocal injectedField;
@Resource(description="SessionContext-resource-env-ref")
private SessionContext context;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyBaseInterceptor.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyBaseInterceptor.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyBaseInterceptor.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -40,7 +40,7 @@
*/
public class MyBaseInterceptor
{
- @EJB MyStatelessLocal baseSession2;
+ @EJB(name = "baseSession2") MyStatelessLocal baseSession2;
@Resource(mappedName="java:/TransactionManager") TransactionManager baseTm;
@Resource(name="DefaultDS", mappedName="java:DefaultDS") DataSource baseDs;
@PersistenceContext(unitName="interceptors-test") EntityManager baseEm;
@@ -52,7 +52,7 @@
EntityManager baseEmMethod;
EntityManagerFactory baseFactoryMethod;
- @EJB
+ @EJB(name = "baseSession2Method")
public void setBaseSession2Method(MyStatelessLocal session2Method)
{
this.baseSession2Method = session2Method;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/MyStatelessBean.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -71,7 +71,7 @@
@ExcludeDefaultInterceptors
public class MyStatelessBean implements MyStatelessLocal, MyStatelessRemote
{
- @EJB
+ @EJB(name = "injectedField")
private MyStatelessLocal injectedField;
@Resource(description="SessionContext-resource-env-ref")
private SessionContext context;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -111,7 +111,7 @@
// @EJB
AnnotatedEJBReferencesMetaData ejbRefs = env.getAnnotatedEjbReferences();
assertEquals(4, ejbRefs.size());
- AnnotatedEJBReferenceMetaData injectedField = ejbRefs.get("injectedField");
+ AnnotatedEJBReferenceMetaData injectedField = ejbRefs.get(MyServlet.class.getName() + "/injectedField");
assertNotNull(injectedField);
assertEquals(MyStatelessLocal.class, injectedField.getBeanInterface());
AnnotatedEJBReferenceMetaData injectedFieldWithOverridenName = ejbRefs.get("overrideName");
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/RequestAttributeListener.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/RequestAttributeListener.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/RequestAttributeListener.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -36,10 +36,10 @@
*/
public class RequestAttributeListener
{
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulIF.class)
+ @EJB(name = "statefulTestBean", beanName="StatefulTestBean", beanInterface=StatefulIF.class)
private StatefulIF statefulTestBean;
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
+ @EJB(name = "statefulTestLocalBean", beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
private StatefulLocalIF statefulTestLocalBean;
@WebServiceRef
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/ServletFilter.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/ServletFilter.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/ServletFilter.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -36,10 +36,10 @@
public class ServletFilter
{
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulIF.class)
+ @EJB(name = "statefulTestBean", beanName="StatefulTestBean", beanInterface=StatefulIF.class)
private StatefulIF statefulTestBean;
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
+ @EJB(name = "statefulTestLocalBean", beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
private StatefulLocalIF statefulTestLocalBean;
@WebServiceRef
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/TestServlet.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/TestServlet.java 2008-10-27 14:52:05 UTC (rev 80109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/TestServlet.java 2008-10-27 16:17:00 UTC (rev 80110)
@@ -35,10 +35,10 @@
*/
public class TestServlet
{
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulIF.class)
+ @EJB(name = "statefulTestBean", beanName="StatefulTestBean", beanInterface=StatefulIF.class)
private StatefulIF statefulTestBean;
- @EJB(beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
+ @EJB(name = "statefulTestLocalBean", beanName="StatefulTestBean", beanInterface=StatefulLocalIF.class)
private StatefulLocalIF statefulTestLocalBean;
@WebServiceRef
More information about the jboss-cvs-commits
mailing list