[jboss-cvs] JBossAS SVN: r76126 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/annotation/creator/jboss and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 23 06:13:24 EDT 2008
Author: emuckenhuber
Date: 2008-07-23 06:13:23 -0400 (Wed, 23 Jul 2008)
New Revision: 76126
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PostConstructMethodProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PreDestroyMethodProcessor.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefsClassProcessor.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/MyStatefulBean.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/jbmeta80/unit/SessionContextAddedToMetadataUnitTestCase.java
Log:
[JBMETA-80] processing of RemoteEnvironmentRefsGroups
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -29,7 +29,6 @@
import org.jboss.metadata.annotation.creator.DeclareRolesProcessor;
import org.jboss.metadata.annotation.creator.Processor;
-import org.jboss.metadata.annotation.creator.AbstractProcessor.Scope;
import org.jboss.metadata.annotation.creator.jboss.AbstractComponentProcessor;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -31,6 +31,8 @@
import org.jboss.metadata.annotation.creator.PersistenceContextClassProcessor;
import org.jboss.metadata.annotation.creator.PersistenceContextFieldProcessor;
import org.jboss.metadata.annotation.creator.PersistenceContextMethodProcessor;
+import org.jboss.metadata.annotation.creator.PostConstructMethodProcessor;
+import org.jboss.metadata.annotation.creator.PreDestroyMethodProcessor;
import org.jboss.metadata.annotation.creator.ResourceClassProcessor;
import org.jboss.metadata.annotation.creator.ResourceFieldProcessor;
import org.jboss.metadata.annotation.creator.ResourceMethodProcessor;
@@ -43,7 +45,6 @@
import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.jboss.JBossServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
@@ -98,7 +99,7 @@
public void process(RemoteEnvironmentRefsGroupMetaData metaData, Class<?> type)
{
// @Resources/@Resource
- processClass(metaData, type, JBossEnvironmentRefsGroupMetaData.class);
+ processClass(metaData, type, RemoteEnvironmentRefsGroupMetaData.class);
// @EJBs/@EJB
AnnotatedEJBReferencesMetaData aejbRefs = metaData.getAnnotatedEjbReferences();
@@ -133,7 +134,7 @@
* @param metaData
* @param type
*/
- public void process(EnvironmentRefsGroupMetaData metaData, Class<?> type)
+ public void process(JBossEnvironmentRefsGroupMetaData metaData, Class<?> type)
{
this.process((RemoteEnvironmentRefsGroupMetaData)metaData, type);
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PostConstructMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PostConstructMethodProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PostConstructMethodProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.annotation.creator.jboss;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-import javax.annotation.PostConstruct;
-
-import org.jboss.metadata.annotation.creator.AbstractLifeCycleMethodProcessor;
-import org.jboss.metadata.annotation.creator.Processor;
-import org.jboss.metadata.annotation.creator.ProcessorUtils;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-
-/**
- * Translate @PostConstruct into LifecycleCallbackMetaData for
- * EnvironmentRefsGroupMetaData
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 72364 $
- */
-public class PostConstructMethodProcessor
- extends AbstractLifeCycleMethodProcessor
- implements Processor<JBossEnvironmentRefsGroupMetaData, Method>
-{
- /**
- * @param finder
- */
- public PostConstructMethodProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- public void process(JBossEnvironmentRefsGroupMetaData metaData, Method element)
- {
- PostConstruct annotation = finder.getAnnotation(element, PostConstruct.class);
- if(annotation == null)
- return;
-
- LifecycleCallbackMetaData callback = super.create(element);
- LifecycleCallbacksMetaData postConstructs = metaData.getPostConstructs();
- if(postConstructs == null)
- {
- postConstructs = new LifecycleCallbacksMetaData();
- metaData.setPostConstructs(postConstructs);
- }
- postConstructs.add(callback);
- }
-
- public Collection<Class<? extends Annotation>> getAnnotationTypes()
- {
- return ProcessorUtils.createAnnotationSet(PostConstruct.class);
- }
-
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PreDestroyMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PreDestroyMethodProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/PreDestroyMethodProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.annotation.creator.jboss;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-import javax.annotation.PreDestroy;
-
-import org.jboss.metadata.annotation.creator.AbstractLifeCycleMethodProcessor;
-import org.jboss.metadata.annotation.creator.Processor;
-import org.jboss.metadata.annotation.creator.ProcessorUtils;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-
-/**
- * Translate @PreDestroy into LifecycleCallbackMetaData for
- * EnvironmentRefsGroupMetaData
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 72364 $
- */
-public class PreDestroyMethodProcessor
- extends AbstractLifeCycleMethodProcessor
- implements Processor<JBossEnvironmentRefsGroupMetaData, Method>
-{
- /**
- * @param finder
- */
- public PreDestroyMethodProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- public void process(JBossEnvironmentRefsGroupMetaData metaData, Method element)
- {
- PreDestroy annotation = finder.getAnnotation(element, PreDestroy.class);
- if(annotation == null)
- return;
-
- LifecycleCallbackMetaData callback = super.create(element);
- LifecycleCallbacksMetaData preDestroys = metaData.getPreDestroys();
- if(preDestroys == null)
- {
- preDestroys = new LifecycleCallbacksMetaData();
- metaData.setPreDestroys(preDestroys);
- }
- preDestroys.add(callback);
- }
-
- public Collection<Class<? extends Annotation>> getAnnotationTypes()
- {
- return ProcessorUtils.createAnnotationSet(PreDestroy.class);
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -32,7 +32,6 @@
import org.jboss.metadata.annotation.creator.AbstractFinderUser;
import org.jboss.metadata.annotation.creator.ProcessorUtils;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
@@ -60,7 +59,7 @@
handlerChainProcessor = new WebServiceHandlerChainProcessor<E>(finder);
}
- public void process(RemoteEnvironmentRefsGroupMetaData refs, E element)
+ public void process(ServiceReferencesMetaData refs, E element)
{
WebServiceRef annotation = finder.getAnnotation(element, WebServiceRef.class);
if(annotation == null)
@@ -68,7 +67,7 @@
process(refs, element, annotation);
}
- protected void process(RemoteEnvironmentRefsGroupMetaData refs, E element, WebServiceRef annotation)
+ protected void process(ServiceReferencesMetaData refs, E element, WebServiceRef annotation)
{
boolean trace = log.isTraceEnabled();
String type = annotation.type().getName();
@@ -76,14 +75,10 @@
type = getType(element);
if(trace)
log.trace("process: "+annotation+", type="+type);
- ServiceReferencesMetaData srefs = refs.getServiceReferences();
- if(srefs == null)
- {
- srefs = new ServiceReferencesMetaData();
- refs.setServiceReferences(srefs);
- }
+
ServiceReferenceMetaData ref = createServiceRef(annotation, element);
- srefs.add(ref);
+ refs.add(ref);
+
if(trace)
log.trace("created service-ref: "+ref);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -25,7 +25,7 @@
import org.jboss.metadata.annotation.creator.Processor;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -33,7 +33,7 @@
*/
public class WebServiceRefClassProcessor
extends AbstractWebServiceRefProcessor<Class<?>>
- implements Processor<RemoteEnvironmentRefsGroupMetaData, Class<?>>
+ implements Processor<ServiceReferencesMetaData, Class<?>>
{
public WebServiceRefClassProcessor(AnnotationFinder<AnnotatedElement> finder)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -26,7 +26,7 @@
import org.jboss.metadata.annotation.creator.Processor;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
/**
* @author Scott.Stark at jboss.org
@@ -34,7 +34,7 @@
*/
public class WebServiceRefFieldProcessor
extends AbstractWebServiceRefProcessor<Field>
- implements Processor<RemoteEnvironmentRefsGroupMetaData, Field>
+ implements Processor<ServiceReferencesMetaData, Field>
{
/**
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -26,7 +26,7 @@
import org.jboss.metadata.annotation.creator.Processor;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -34,7 +34,7 @@
*/
public class WebServiceRefMethodProcessor
extends AbstractWebServiceRefProcessor<Method>
- implements Processor<RemoteEnvironmentRefsGroupMetaData, Method>
+ implements Processor<ServiceReferencesMetaData, Method>
{
public WebServiceRefMethodProcessor(AnnotationFinder<AnnotatedElement> finder)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefsClassProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefsClassProcessor.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefsClassProcessor.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -31,7 +31,7 @@
import org.jboss.metadata.annotation.creator.Processor;
import org.jboss.metadata.annotation.creator.ProcessorUtils;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
/**
* @WebServiceRefs processor
@@ -41,7 +41,7 @@
*/
public class WebServiceRefsClassProcessor
extends WebServiceRefClassProcessor
- implements Processor<RemoteEnvironmentRefsGroupMetaData, Class<?>>
+ implements Processor<ServiceReferencesMetaData, Class<?>>
{
public WebServiceRefsClassProcessor(AnnotationFinder<AnnotatedElement> finder)
@@ -50,7 +50,7 @@
}
@Override
- public void process(RemoteEnvironmentRefsGroupMetaData refsMetaData, Class<?> type)
+ public void process(ServiceReferencesMetaData refsMetaData, Class<?> type)
{
WebServiceRefs annotation = finder.getAnnotation(type, WebServiceRefs.class);
if(annotation == null)
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-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -91,9 +91,14 @@
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.annotation.ejb3.defaultinterface.DefaultInterface;
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview3Remote;
@@ -216,6 +221,24 @@
assertEquals(1, removeMethods.size());
RemoveMethodMetaData removeMethod = removeMethods.get(0);
assertEquals("remove", removeMethod.getBeanMethod().getMethodName());
+ // @Resource
+ ResourceEnvironmentReferencesMetaData resource = bean.getResourceEnvironmentReferences();
+ assertNotNull(resource);
+ assertEquals(1, resource.size());
+ ResourceEnvironmentReferenceMetaData ref = resource.get("context");
+ assertNotNull(ref);
+ assertNotNull(ref.getInjectionTargets());
+ // @PersistenceContext
+ PersistenceContextReferenceMetaData persistence = bean.getPersistenceContextReferenceByName("string");
+ assertNotNull(persistence);
+ assertNotNull(persistence.getInjectionTargets());
+ // @WebServiceRef
+ ServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
+ assertNotNull(serviceRefs);
+ assertEquals(1, serviceRefs.size());
+ ServiceReferenceMetaData serviceRef = serviceRefs.get(bean.getEjbClass() + "/webserviceRef");
+ assertNotNull(serviceRef);
+ assertNotNull(serviceRef.getInjectionTargets());
}
private void assertMyStateless21Bean(IEnterpriseBeanMetaData enterpriseBean)
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-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -95,9 +95,14 @@
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.annotation.ejb3.defaultinterface.DefaultInterface;
import org.jboss.test.metadata.annotation.ejb3.defaultinterface.ParentInterface;
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
@@ -168,6 +173,7 @@
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
+ assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
// There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
{
@@ -620,6 +626,24 @@
assertEquals(1, removeMethods.size());
RemoveMethodMetaData removeMethod = removeMethods.get(0);
assertEquals("remove", removeMethod.getBeanMethod().getMethodName());
+ // @Resource
+ ResourceEnvironmentReferencesMetaData resource = bean.getResourceEnvironmentReferences();
+ assertNotNull(resource);
+ assertEquals(1, resource.size());
+ ResourceEnvironmentReferenceMetaData ref = resource.get("context");
+ assertNotNull(ref);
+ assertNotNull(ref.getInjectionTargets());
+ // @PersistenceContext
+ PersistenceContextReferenceMetaData persistence = bean.getPersistenceContextReferenceByName("string");
+ assertNotNull(persistence);
+ assertNotNull(persistence.getInjectionTargets());
+ // @WebServiceRef
+ ServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
+ assertNotNull(serviceRefs);
+ assertEquals(1, serviceRefs.size());
+ ServiceReferenceMetaData serviceRef = serviceRefs.get(bean.getEjbClass() + "/webserviceRef");
+ assertNotNull(serviceRef);
+ assertNotNull(serviceRef.getInjectionTargets());
// @RemoteBindings
assertNotNull(bean.getRemoteBindings());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatefulBean.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -23,6 +23,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.EJBs;
import javax.ejb.Init;
@@ -31,7 +32,10 @@
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Remove;
+import javax.ejb.SessionContext;
import javax.ejb.Stateful;
+import javax.persistence.PersistenceContext;
+import javax.xml.ws.WebServiceRef;
import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
@@ -78,6 +82,16 @@
@Clustered(homeLoadBalancePolicy = "home", loadBalancePolicy = "bean", partition = "partition")
public class MyStatefulBean
{
+
+ @Resource
+ private SessionContext context;
+
+ @PersistenceContext
+ private String string;
+
+ @WebServiceRef
+ private MyStateful webserviceRef;
+
@PostConstruct
public void setUp()
{
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-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -274,6 +274,10 @@
SecurityRoleMetaData role2 = securityRoles.get("Role2");
assertNotNull(role2);
assertEquals("Role2", role2.getRoleName());
+ // @PostConstruct
+ assertEquals("setUp", metaData.getPostConstructs().get(0).getMethodName());
+ // @PreDestroy
+ assertEquals("tearDown", metaData.getPreDestroys().get(0).getMethodName());
}
public void testAnnotationRead() throws Exception
@@ -360,6 +364,11 @@
JBossServletMetaData jbossServletMetaData = mergedJBossWebMD.getServlets().get("MyServlet");
assertEquals("InternalUser", jbossServletMetaData.getRunAs().getRoleName());
assertEquals("javajoe", jbossServletMetaData.getRunAsPrincipal());
+
+ // @PostConstruct
+ assertEquals("setUp", merged.getPostConstructs().get(0).getMethodName());
+ // @PreDestroy
+ assertEquals("tearDown", merged.getPreDestroys().get(0).getMethodName());
}
/**
@@ -413,6 +422,11 @@
assertEquals("InternalUser", jbossServletMetaData.getRunAs().getRoleName());
assertEquals("javajoe", jbossServletMetaData.getRunAsPrincipal());
+ // @PostConstruct
+ assertEquals("setUp", merged.getPostConstructs().get(0).getMethodName());
+ // @PreDestroy
+ assertEquals("tearDown", merged.getPreDestroys().get(0).getMethodName());
+
assertAnnotationContext(creator.getAnnotationContext());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/unit/SessionContextAddedToMetadataUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/unit/SessionContextAddedToMetadataUnitTestCase.java 2008-07-23 10:08:06 UTC (rev 76125)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta80/unit/SessionContextAddedToMetadataUnitTestCase.java 2008-07-23 10:13:23 UTC (rev 76126)
@@ -36,8 +36,6 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.test.metadata.jbmeta80.SessionContextAnnotatedResourceBean;
/**
@@ -85,26 +83,14 @@
// Get Environment
Environment env = slsb.getJndiEnvironmentRefsGroup();
-
- // Look in Resource References
- ResourceReferencesMetaData refs = env.getResourceReferences();
- if (refs != null)
- {
- for (ResourceReferenceMetaData ref : refs)
- {
- log.info(ref);
- }
- }
// Look in Resource Env References
ResourceEnvironmentReferencesMetaData envRefs = env.getResourceEnvironmentReferences();
- if (envRefs != null)
- {
- for (ResourceEnvironmentReferenceMetaData envRef : envRefs)
- {
- log.info(envRef);
- }
- }
-
+ assertNotNull(envRefs);
+ assertEquals(1, envRefs.size());
+ ResourceEnvironmentReferenceMetaData envRef = envRefs.get("context");
+ assertNotNull(envRef);
+ assertNotNull(envRef.getInjectionTargets());
+ assertTrue(envRef.getInjectionTargets().size() > 0);
}
}
More information about the jboss-cvs-commits
mailing list