[jboss-cvs] JBossAS SVN: r75530 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/annotation/creator/ejb/jboss and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 9 04:16:28 EDT 2008
Author: emuckenhuber
Date: 2008-07-09 04:16:27 -0400 (Wed, 09 Jul 2008)
New Revision: 75530
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EntityProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/EntityProcessor.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.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
Log:
[JBMETA-69] don't create entity meta data for JPA entity beans
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java 2008-07-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -52,7 +52,6 @@
processors.add(new StatefulProcessor(finder));
processors.add(new StatelessProcessor(finder));
processors.add(new MessageDrivenProcessor(finder));
- processors.add(new EntityProcessor(finder));
processors.add(new ApplicationExceptionProcessor(finder));
}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EntityProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EntityProcessor.java 2008-07-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EntityProcessor.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -1,68 +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.ejb;
-
-import java.lang.reflect.AnnotatedElement;
-
-import javax.persistence.Entity;
-
-import org.jboss.metadata.annotation.creator.Creator;
-import org.jboss.metadata.annotation.creator.Processor;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class EntityProcessor
- extends AbstractEnterpriseBeanProcessor<EntityBeanMetaData>
- implements Creator<Class<?>, EntityBeanMetaData>,
- Processor<EjbJar3xMetaData, Class<?>>
-{
-
- /**
- * @param finder
- */
- public EntityProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- @Override
- public EntityBeanMetaData create(Class<?> beanClass)
- {
- Entity annotation = finder.getAnnotation(beanClass, Entity.class);
- if(annotation == null)
- return null;
-
- EntityBeanMetaData metaData = new EntityBeanMetaData();
- if(annotation.name().length() > 0)
- metaData.setEjbName(annotation.name());
- else
- metaData.setEjbName(beanClass.getSimpleName());
- metaData.setEjbClass(beanClass.getName());
- return metaData;
- }
-
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/EntityProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/EntityProcessor.java 2008-07-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/EntityProcessor.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.ejb.jboss;
-
-import java.lang.reflect.AnnotatedElement;
-
-import javax.persistence.Entity;
-
-import org.jboss.metadata.annotation.creator.Creator;
-import org.jboss.metadata.annotation.creator.Processor;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-
-
-/**
- * A EntityProcessor.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class EntityProcessor
- extends AbstractEnterpriseBeanProcessor<JBossEntityBeanMetaData>
- implements Creator<Class<?>, JBossEntityBeanMetaData>, Processor<JBossMetaData, Class<?>>
-{
- protected EntityProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- @Override
- public JBossEntityBeanMetaData create(Class<?> beanClass)
- {
- Entity annotation = finder.getAnnotation(beanClass, Entity.class);
- if(annotation == null)
- return null;
-
- JBossEntityBeanMetaData metaData = new JBossEntityBeanMetaData();
- if(annotation.name().length() > 0)
- metaData.setEjbName(annotation.name());
- else
- metaData.setEjbName(beanClass.getSimpleName());
- metaData.setEjbClass(beanClass.getName());
- return metaData;
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-07-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -55,7 +55,6 @@
processors.add(new JBossServiceProcessor(finder));
processors.add(new JBossConsumerProcessor(finder));
processors.add(new MessageDrivenProcessor(finder));
- processors.add(new EntityProcessor(finder));
processors.add(new ApplicationExceptionProcessor(finder));
}
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-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -303,15 +303,7 @@
assertEquals(1, parameters.size());
assertEquals(Timer.class.getName(), parameters.get(0));
}
-
- private void assertMyEntity(IEnterpriseBeanMetaData enterpriseBean)
- {
- assertTrue(enterpriseBean instanceof EntityBeanMetaData);
- EntityBeanMetaData bean = (EntityBeanMetaData) enterpriseBean;
- assertEquals(MyEntityBean.class.getName(), bean.getEjbClass());
- assertEquals("MyEntity", bean.getEjbName());
- }
-
+
private void assertMyMDB(IEnterpriseBeanMetaData enterpriseBean)
{
assertTrue(enterpriseBean instanceof MessageDrivenBeanMetaData);
@@ -411,12 +403,11 @@
System.out.println(transaction);
}
- assertEquals(8, metaData.getEnterpriseBeans().size());
+ assertEquals(6, metaData.getEnterpriseBeans().size());
assertMyStatefulBean(metaData.getEnterpriseBean("AnotherName")); // MyStatefulBean
assertMyStateless21Bean(metaData.getEnterpriseBean("MyStateless21Bean"));
assertMyStatelessBean(metaData.getEnterpriseBean("MyStatelessBean"));
- assertMyEntity(metaData.getEnterpriseBean("MyEntity"));
assertMyMDB(metaData.getEnterpriseBean("MailMDB"));
AssemblyDescriptorMetaData assembly = metaData.getAssemblyDescriptor();
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-09 08:10:44 UTC (rev 75529)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-07-09 08:16:27 UTC (rev 75530)
@@ -168,12 +168,11 @@
System.out.println(transaction);
}
- assertEquals(8, metaData.getEnterpriseBeans().size());
+ assertEquals(6, metaData.getEnterpriseBeans().size());
assertMyStatefulBean(metaData.getEnterpriseBean("AnotherName")); // MyStatefulBean
assertMyStateless21Bean(metaData.getEnterpriseBean("MyStateless21Bean"));
assertMyStatelessBean(metaData.getEnterpriseBean("MyStatelessBean"));
- assertMyEntity(metaData.getEnterpriseBean("MyEntity"));
assertMyMDB(metaData.getEnterpriseBean("MailMDB"));
JBossAssemblyDescriptorMetaData assembly = metaData.getAssemblyDescriptor();
@@ -756,14 +755,6 @@
assertEquals("RemoteBinding", remoteBinding.getJndiName());
}
- private void assertMyEntity(IEnterpriseBeanMetaData enterpriseBean)
- {
- assertTrue(enterpriseBean instanceof JBossEntityBeanMetaData);
- JBossEntityBeanMetaData bean = (JBossEntityBeanMetaData) enterpriseBean;
- assertEquals(MyEntityBean.class.getName(), bean.getEjbClass());
- assertEquals("MyEntity", bean.getEjbName());
- }
-
private void assertMyMDB(IEnterpriseBeanMetaData enterpriseBean)
{
assertTrue(enterpriseBean instanceof JBossMessageDrivenBeanMetaData);
More information about the jboss-cvs-commits
mailing list