[jboss-cvs] JBossAS SVN: r80151 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 12:32:05 EDT 2008
Author: emuckenhuber
Date: 2008-10-28 12:32:05 -0400 (Tue, 28 Oct 2008)
New Revision: 80151
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.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
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/InterMediateBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.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
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/SessionContextAnnotatedResourceBean.java
Log:
[JBMETA-140] use the class in the default name for @Resource annotations
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -48,7 +48,7 @@
protected String getName(Field element)
{
String name = element.getName();
- return name;
+ return element.getDeclaringClass().getName() + "/" + name;
}
@Override
protected String getInjectionName(Field element)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -56,7 +56,7 @@
{
name = name.toLowerCase();
}
- return name;
+ return element.getDeclaringClass().getName() + "/" + name;
}
@Override
protected String getInjectionName(Method element)
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:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -157,7 +157,7 @@
assertEquals("sendQueue", sendQueueField.getInjectionTargetName());
// ORB maps to a resource-env-ref
- ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName("orb");
+ ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName(Client.class.getName() + "/orb");
assertNotNull(orbRes);
Set<ResourceInjectionTargetMetaData> orbResTargets = orbRes.getInjectionTargets();
assertNotNull(orbResTargets);
@@ -259,7 +259,7 @@
assertEquals("org.jboss.ejb3.test.applicationclient.client.TestCallbackHandler", merged.getCallbackHandler());
// ORB maps to a resource-env-ref
- ResourceEnvironmentReferenceMetaData orbRes = merged.getResourceEnvironmentReferenceByName("orb");
+ ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName(Client.class.getName() + "/orb");
assertNotNull(orbRes);
assertEquals(ORB.class.getName(), orbRes.getType());
ResourceEnvironmentReferenceMetaData messageReplier = merged.getResourceEnvironmentReferenceByName("messageReplier");
@@ -351,7 +351,7 @@
assertEquals("queueConnectionFactory", qcfRefField.getInjectionTargetName());
// ORB maps to a resource-env-ref
- ResourceEnvironmentReferenceMetaData orbRes = mergedMetaData.getResourceEnvironmentReferenceByName("orb");
+ ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName(Client.class.getName() + "/orb");
assertNotNull(orbRes);
assertEquals(ORB.class.getName(), orbRes.getType());
ResourceEnvironmentReferenceMetaData messageReplier = mergedMetaData.getResourceEnvironmentReferenceByName("messageReplier");
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:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/jbmeta95/TestClientUnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -103,7 +103,7 @@
assertEquals("sendQueue", sendQueueField.getInjectionTargetName());
// ORB maps to a resource-env-ref
- ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName("orb");
+ ResourceEnvironmentReferenceMetaData orbRes = clientMD.getResourceEnvironmentReferenceByName(Super.class.getName() + "/orb");
assertNotNull(orbRes);
Set<ResourceInjectionTargetMetaData> orbResTargets = orbRes.getInjectionTargets();
assertNotNull(orbResTargets);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -225,7 +225,7 @@
ResourceEnvironmentReferencesMetaData resource = bean.getResourceEnvironmentReferences();
assertNotNull(resource);
assertEquals(1, resource.size());
- ResourceEnvironmentReferenceMetaData ref = resource.get("context");
+ ResourceEnvironmentReferenceMetaData ref = resource.get(bean.getEjbClass() + "/context");
assertNotNull(ref);
assertNotNull(ref.getInjectionTargets());
// @PersistenceContext
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -639,7 +639,7 @@
ResourceEnvironmentReferencesMetaData resource = bean.getResourceEnvironmentReferences();
assertNotNull(resource);
assertEquals(1, resource.size());
- ResourceEnvironmentReferenceMetaData ref = resource.get("context");
+ ResourceEnvironmentReferenceMetaData ref = resource.get(bean.getEjbClass() + "/context");
assertNotNull(ref);
assertNotNull(ref.getInjectionTargets());
// @PersistenceContext
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/InterMediateBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/InterMediateBean.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/InterMediateBean.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -70,7 +70,7 @@
{
}
- @Resource
+ @Resource(name = "sessionContext")
public void setSessionContext(SessionContext sc)
{
sctx = sc;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -330,7 +330,7 @@
ResourceEnvironmentReferencesMetaData resource = bean.getResourceEnvironmentReferences();
assertNotNull(resource);
assertEquals(1, resource.size());
- ResourceEnvironmentReferenceMetaData ref = resource.get("context");
+ ResourceEnvironmentReferenceMetaData ref = resource.get(bean.getEjbClass() + "/context");
assertNotNull(ref);
assertNotNull(ref.getInjectionTargets());
// @PersistenceContext
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -55,6 +55,7 @@
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.test.metadata.annotation.ejb3.MyStatelessBean;
import org.jboss.test.metadata.annotation.ejb3.MyStatelessLocal;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
@@ -111,7 +112,7 @@
ResourceReferencesMetaData resRefs = sbeanMD.getResourceReferences();
//
assertEquals(3, resRefs.size());
- ResourceReferenceMetaData homePageRef = resRefs.get("homePage");
+ ResourceReferenceMetaData homePageRef = resRefs.get(MyStatelessBean.class.getName() + "/homePage");
assertNotNull(homePageRef);
assertEquals("java.net.URL", homePageRef.getType());
Set<ResourceInjectionTargetMetaData> homePageRefTargets = homePageRef.getInjectionTargets();
@@ -130,7 +131,7 @@
ResourceEnvironmentReferencesMetaData resEnvRefs = sbeanMD.getResourceEnvironmentReferences();
assertEquals(1, resEnvRefs.size());
- ResourceEnvironmentReferenceMetaData contextRef = resEnvRefs.get("context");
+ ResourceEnvironmentReferenceMetaData contextRef = resEnvRefs.get(sbeanMD.getEjbClass() + "/context");
assertNotNull(contextRef);
assertEquals("javax.ejb.SessionContext", contextRef.getType());
Set<ResourceInjectionTargetMetaData> contextRefTargets = contextRef.getInjectionTargets();
@@ -141,14 +142,14 @@
EnvironmentEntriesMetaData envEntries = sbeanMD.getEnvironmentEntries();
assertEquals(2, envEntries.size());
- EnvironmentEntryMetaData pi = envEntries.get("pi");
+ EnvironmentEntryMetaData pi = envEntries.get(sbeanMD.getEjbClass() + "/pi");
assertEquals("3.14159", pi.getValue());
// TODO: should this be java.lang.Double?
assertEquals("double", pi.getType());
MessageDestinationReferencesMetaData msgRefs = sbeanMD.getMessageDestinationReferences();
assertEquals(1, msgRefs.size());
- MessageDestinationReferenceMetaData mailQueue = msgRefs.get("mailQueue");
+ MessageDestinationReferenceMetaData mailQueue = msgRefs.get(sbeanMD.getEjbClass() + "/mailQueue");
assertNotNull(mailQueue);
assertEquals("javax.jms.Queue", mailQueue.getType());
}
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-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -135,7 +135,7 @@
ResourceReferencesMetaData resRefs = env.getResourceReferences();
//
assertEquals(3, resRefs.size());
- ResourceReferenceMetaData homePageRef = resRefs.get("homePage");
+ ResourceReferenceMetaData homePageRef = resRefs.get(MyServlet.class.getName() + "/homePage");
assertNotNull(homePageRef);
assertEquals("java.net.URL", homePageRef.getType());
Set<ResourceInjectionTargetMetaData> homePageRefTargets = homePageRef.getInjectionTargets();
@@ -154,7 +154,7 @@
ResourceEnvironmentReferencesMetaData resEnvRefs = env.getResourceEnvironmentReferences();
assertEquals(1, resEnvRefs.size());
- ResourceEnvironmentReferenceMetaData contextRef = resEnvRefs.get("utx");
+ ResourceEnvironmentReferenceMetaData contextRef = resEnvRefs.get(MyServlet.class.getName() + "/utx");
assertNotNull(contextRef);
assertEquals(UserTransaction.class.getName(), contextRef.getType());
Set<ResourceInjectionTargetMetaData> contextRefTargets = contextRef.getInjectionTargets();
@@ -165,14 +165,14 @@
EnvironmentEntriesMetaData envEntries = env.getEnvironmentEntries();
assertEquals(2, envEntries.size());
- EnvironmentEntryMetaData pi = envEntries.get("pi");
+ EnvironmentEntryMetaData pi = envEntries.get(MyServlet.class.getName()+ "/pi");
assertEquals("3.14159", pi.getValue());
// TODO: should this be java.lang.Double?
assertEquals("double", pi.getType());
MessageDestinationReferencesMetaData msgRefs = env.getMessageDestinationReferences();
assertEquals(1, msgRefs.size());
- MessageDestinationReferenceMetaData mailQueue = msgRefs.get("mailQueue");
+ MessageDestinationReferenceMetaData mailQueue = msgRefs.get(MyServlet.class.getName() + "/mailQueue");
assertNotNull(mailQueue);
assertEquals("javax.jms.Queue", mailQueue.getType());
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-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/RequestAttributeListener.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -45,19 +45,19 @@
@WebServiceRef
private StatefulIF webServiceRef;
- @Resource
+ @Resource(name = "string" )
private String string;
- @Resource
+ @Resource(name = "webService")
private Service webService;
- @Resource
+ @Resource(name = "connectionFactory")
private ConnectionFactory connectionFactory;
- @Resource
+ @Resource(name = "queue")
private Queue queue;
- @Resource
+ @Resource(name = "somethingElse")
private StatefulIF somethingElse;
@PersistenceContext
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-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/ServletFilter.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -45,19 +45,19 @@
@WebServiceRef
private StatefulIF webServiceRef;
- @Resource
+ @Resource(name = "string" )
private String string;
- @Resource
+ @Resource(name = "webService")
private Service webService;
- @Resource
+ @Resource(name = "connectionFactory")
private ConnectionFactory connectionFactory;
- @Resource
+ @Resource(name = "queue")
private Queue queue;
- @Resource
+ @Resource(name = "somethingElse")
private StatefulIF somethingElse;
@PersistenceContext
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-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/injection/TestServlet.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -44,19 +44,19 @@
@WebServiceRef
private StatefulIF webServiceRef;
- @Resource
+ @Resource(name = "string" )
private String string;
- @Resource
+ @Resource(name = "webService")
private Service webService;
- @Resource
+ @Resource(name = "connectionFactory")
private ConnectionFactory connectionFactory;
- @Resource
+ @Resource(name = "queue")
private Queue queue;
- @Resource
+ @Resource(name = "somethingElse")
private StatefulIF somethingElse;
@PersistenceContext
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/SessionContextAnnotatedResourceBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/SessionContextAnnotatedResourceBean.java 2008-10-28 15:49:00 UTC (rev 80150)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/SessionContextAnnotatedResourceBean.java 2008-10-28 16:32:05 UTC (rev 80151)
@@ -52,7 +52,7 @@
// Instance Members ---------------------------------------------------------------||
// --------------------------------------------------------------------------------||
- @Resource
+ @Resource(name = "context")
public SessionContext context;
// --------------------------------------------------------------------------------||
More information about the jboss-cvs-commits
mailing list