[jboss-cvs] JBossAS SVN: r80150 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-10-28 11:49:00 -0400 (Tue, 28 Oct 2008)
New Revision: 80150

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractEJBProcessor.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/TestClientUnitTestCase.java
Log:
[JBMETA-137] revert my injectionTarget name changes

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractEJBProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractEJBProcessor.java	2008-10-28 15:18:41 UTC (rev 80149)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractEJBProcessor.java	2008-10-28 15:49:00 UTC (rev 80150)
@@ -81,10 +81,10 @@
    protected AnnotatedEJBReferenceMetaData createEJB(EJB annotation, E element)
    {
       AnnotatedEJBReferenceMetaData ref = new AnnotatedEJBReferenceMetaData();
-      String name = annotation.name(); 
-      if(name.length() == 0)
-         name = getName(element);
-      ref.setEjbRefName(name);
+      if(annotation.name().length() > 0)
+         ref.setEjbRefName(annotation.name());
+      else
+         ref.setEjbRefName(getName(element));
       if(annotation.beanInterface() != Object.class)
          ref.setBeanInterface(annotation.beanInterface());
       else
@@ -102,6 +102,7 @@
       if(annotation.mappedName().length() > 0)
          ref.setMappedName(annotation.mappedName());
 
+      String name = ProcessorUtils.getName(element);
       Set<ResourceInjectionTargetMetaData> injectionTargets = ProcessorUtils.getInjectionTargets(name, element);
       if(injectionTargets != null)
          ref.setInjectionTargets(injectionTargets);

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-28 15:18:41 UTC (rev 80149)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java	2008-10-28 15:49:00 UTC (rev 80150)
@@ -85,7 +85,7 @@
  */
 public class AnnotationClientUnitTestCase extends AbstractJavaEEMetaDataTest
 {
-   private static final String mainClassName = "org.jboss.test.metadata.annotation.client.basic.Client"; 
+   private static final String classMainName = "org.jboss.test.metadata.annotation.client.basic.Client"; 
    
    public static SchemaBindingResolver initResolver()
    {
@@ -113,11 +113,11 @@
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       
       Collection<Class<?>> classes = PackageScanner.loadClasses();
-      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, mainClassName);
+      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, classMainName);
       ApplicationClient5MetaData clientMD = creator.create(classes);
       assertEquals(3, clientMD.getAnnotatedEjbReferences().size());
 
-      AnnotatedEJBReferenceMetaData resourceMethodBean = clientMD.getAnnotatedEjbReferences().get(mainClassName + "/resourceMethodBean");
+      AnnotatedEJBReferenceMetaData resourceMethodBean = clientMD.getAnnotatedEjbReferences().get(classMainName + "/resourceMethodBean");
       assertNotNull(resourceMethodBean);
       assertEquals(ResourceIF.class, resourceMethodBean.getBeanInterface());
       assertEquals("ResourceOnMethodBean", resourceMethodBean.getLink());
@@ -126,9 +126,9 @@
       assertEquals(1, resourceMethodBeanTargets.size());
       ResourceInjectionTargetMetaData method = resourceMethodBeanTargets.iterator().next();
       assertEquals(Client.class.getName(), method.getInjectionTargetClass());
-      assertEquals(mainClassName + "/resourceMethodBean", method.getInjectionTargetName());
+      assertEquals("setResourceMethodBean", method.getInjectionTargetName());
 
-      AnnotatedEJBReferenceMetaData resourceFieldBean = clientMD.getAnnotatedEjbReferences().get(mainClassName + "/resourceFieldBean");
+      AnnotatedEJBReferenceMetaData resourceFieldBean = clientMD.getAnnotatedEjbReferences().get(classMainName + "/resourceFieldBean");
       assertNotNull(resourceFieldBean);
       assertEquals("ResourceOnFieldBean", resourceFieldBean.getLink());
       Set<ResourceInjectionTargetMetaData> resourceFieldBeanTargets = resourceFieldBean.getInjectionTargets();
@@ -136,7 +136,7 @@
       assertEquals(1, resourceFieldBeanTargets.size());
       ResourceInjectionTargetMetaData field = resourceFieldBeanTargets.iterator().next();
       assertEquals(Client.class.getName(), field.getInjectionTargetClass());
-      assertEquals(mainClassName + "/resourceFieldBean", field.getInjectionTargetName());
+      assertEquals("resourceFieldBean", field.getInjectionTargetName());
 
       AnnotatedEJBReferenceMetaData resourceClassBean = clientMD.getAnnotatedEjbReferences().get("ejb/resourceClassBean");
       assertNotNull(resourceClassBean);
@@ -227,7 +227,7 @@
    {
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       Collection<Class<?>> classes = PackageScanner.loadClasses();
-      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, mainClassName);
+      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, classMainName);
       ApplicationClient5MetaData clientMD = creator.create(classes);
       
       ApplicationClient5MetaData xmlMD = super.unmarshal(ApplicationClient5MetaData.class);
@@ -293,7 +293,7 @@
    {
          AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
          Collection<Class<?>> classes = PackageScanner.loadClasses();
-         ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, mainClassName);
+         ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, classMainName);
          ApplicationClient5MetaData clientMD = creator.create(classes);         
          
          ApplicationClient5MetaData xmlMD = super.unmarshal("AnnotationClient_testXmlMerge.xml", ApplicationClient5MetaData.class);
@@ -442,7 +442,7 @@
    {
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       Collection<Class<?>> classes = PackageScanner.loadClasses();
-      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, mainClassName);
+      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, classMainName);
       
       ApplicationClient5MetaData annotatedMetaData = creator.create(classes);         
       ApplicationClient5MetaData specMetaData = super.unmarshal("AnnotationClient_testAnnotatedEnv.xml", ApplicationClient5MetaData.class);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/TestClientUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/TestClientUnitTestCase.java	2008-10-28 15:18:41 UTC (rev 80149)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/TestClientUnitTestCase.java	2008-10-28 15:49:00 UTC (rev 80150)
@@ -72,7 +72,7 @@
       assertEquals(1, resourceMethodBeanTargets.size());
       ResourceInjectionTargetMetaData method = resourceMethodBeanTargets.iterator().next();
       assertEquals(Super.class.getName(), method.getInjectionTargetClass());
-      assertEquals("resourceMethodBean", method.getInjectionTargetName());
+      assertEquals("setResourceMethodBean", method.getInjectionTargetName());
 
       AnnotatedEJBReferenceMetaData resourceFieldBean = clientMD.getAnnotatedEjbReferences().get("resourceFieldBean");
       assertNotNull(resourceFieldBean);