[jboss-cvs] JBossAS SVN: r75502 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/ejb3 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 8 12:52:42 EDT 2008
Author: emuckenhuber
Date: 2008-07-08 12:52:42 -0400 (Tue, 08 Jul 2008)
New Revision: 75502
Added:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteHomeInterface.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteInterface.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.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/jbas5124/StatefulBean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatelessBean.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMergeGenericMetaData.xml
Log:
[JBMETA-71] also merge homeJndiName
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2008-07-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -1085,6 +1085,8 @@
this.portComponent = generic.getPortComponent();
if(generic.getJndiName() != null)
this.jndiName = generic.getJndiName();
+ if(generic.getHomeJndiName() != null)
+ this.homeJndiName = generic.getHomeJndiName();
}
}
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-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -796,10 +796,12 @@
JBossSessionBeanMetaData ssbean = (JBossSessionBeanMetaData) mergedMetaData.getEnterpriseBean("StatelessBean");
assertNotNull(ssbean);
assertEquals("StatelessBean-jndi-name", ssbean.getJndiName());
+ assertEquals("StatelessBean-home-jndi-name", ssbean.getHomeJndiName());
assertTrue(ssbean.isStateless());
JBossSessionBeanMetaData sfbean = (JBossSessionBeanMetaData) mergedMetaData.getEnterpriseBean("StatefulBean");
assertNotNull(sfbean);
assertEquals("StatefulBean-jndi-name", sfbean.getJndiName());
+ assertEquals("StatefulBean-home-jndi-name", sfbean.getHomeJndiName());
assertTrue(sfbean.isStateful());
}
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-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -535,10 +535,12 @@
JBossSessionBeanMetaData ssbean = (JBossSessionBeanMetaData) mergedMetaData.getEnterpriseBean("StatelessBean");
assertNotNull(ssbean);
assertEquals("StatelessBean-jndi-name", ssbean.getJndiName());
+ assertEquals("StatelessBean-home-jndi-name", ssbean.getHomeJndiName());
assertTrue(ssbean.isStateless());
JBossSessionBeanMetaData sfbean = (JBossSessionBeanMetaData) mergedMetaData.getEnterpriseBean("StatefulBean");
assertNotNull(sfbean);
assertEquals("StatefulBean-jndi-name", sfbean.getJndiName());
+ assertEquals("StatefulBean-home-jndi-name", sfbean.getHomeJndiName());
assertTrue(sfbean.isStateful());
}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteHomeInterface.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteHomeInterface.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteHomeInterface.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.test.metadata.annotation.ejb3.jbas5124;
+
+import javax.ejb.EJBHome;
+
+/**
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public interface RemoteHomeInterface extends EJBHome
+{
+ public RemoteInterface create();
+}
+
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteInterface.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteInterface.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/RemoteInterface.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.test.metadata.annotation.ejb3.jbas5124;
+
+import javax.ejb.EJBObject;
+
+/**
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public interface RemoteInterface extends EJBObject
+{
+
+}
+
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatefulBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatefulBean.java 2008-07-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatefulBean.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -24,6 +24,7 @@
import java.util.Properties;
import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
/**
@@ -32,6 +33,7 @@
*/
@Stateful(name="StatefulBean", mappedName="refs/StatefulBean")
@Remote({StatefulIF.class})
+ at RemoteHome(RemoteHomeInterface.class)
public class StatefulBean implements StatefulIF
{
public void init(Properties prop) throws Exception
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatelessBean.java 2008-07-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/jbas5124/StatelessBean.java 2008-07-08 16:52:42 UTC (rev 75502)
@@ -23,7 +23,9 @@
import java.util.Properties;
+import javax.ejb.LocalHome;
import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
@@ -34,6 +36,7 @@
*/
@Stateless(name="StatelessBean", mappedName="refs/StatelessBean")
@Remote({StatelessIF.class})
+ at RemoteHome(RemoteHomeInterface.class)
@TransactionManagement(TransactionManagementType.CONTAINER)
public class StatelessBean implements StatelessIF
{
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMergeGenericMetaData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMergeGenericMetaData.xml 2008-07-08 16:30:57 UTC (rev 75501)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testMergeGenericMetaData.xml 2008-07-08 16:52:42 UTC (rev 75502)
@@ -7,10 +7,12 @@
<ejb>
<ejb-name>StatefulBean</ejb-name>
<jndi-name>StatefulBean-jndi-name</jndi-name>
+ <home-jndi-name>StatefulBean-home-jndi-name</home-jndi-name>
</ejb>
<ejb>
<ejb-name>StatelessBean</ejb-name>
<jndi-name>StatelessBean-jndi-name</jndi-name>
+ <home-jndi-name>StatelessBean-home-jndi-name</home-jndi-name>
</ejb>
</enterprise-beans>
</jboss>
More information about the jboss-cvs-commits
mailing list