[jboss-cvs] JBossAS SVN: r66383 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 24 08:19:47 EDT 2007
Author: wolfc
Date: 2007-10-24 08:19:47 -0400 (Wed, 24 Oct 2007)
New Revision: 66383
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml
Log:
JBAS-4506: completed test of service bean
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java 2007-10-24 11:37:03 UTC (rev 66382)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java 2007-10-24 12:19:47 UTC (rev 66383)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * 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.ejb.jboss;
-
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.xb.annotations.JBossXmlModelGroup;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at JBossXmlModelGroup(name="embedded",
- propOrder={"descriptionGroup", "businessLocals", "businessRemotes", "ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity"})
-public class EmbeddedSessionBeanMetaData extends SessionBeanMetaData
-{
- private static final long serialVersionUID = 1L;
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2007-10-24 11:37:03 UTC (rev 66382)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2007-10-24 12:19:47 UTC (rev 66383)
@@ -85,37 +85,4 @@
{
this.xmBean = xmBean;
}
-
- //
-
- private EmbeddedSessionBeanMetaData embedded;
-
- public EmbeddedSessionBeanMetaData getEmbedded()
- {
- return embedded;
- }
-
- public void setEmbedded(EmbeddedSessionBeanMetaData embedded)
- {
- this.embedded = embedded;
-
- // puke
- embedded.setEjbName(getEjbName());
- }
-
- //
-
-// @Override
-// @XmlTransient
-// public SessionBeanMetaData getOverridenMetaData()
-// {
-// return getEmbedded();
-// }
-//
-// @Override
-// @XmlTransient
-// public EnterpriseBeanMetaData getOverridenMetaDataWithCheck()
-// {
-// return getEmbedded();
-// }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-24 11:37:03 UTC (rev 66382)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-24 12:19:47 UTC (rev 66383)
@@ -58,8 +58,13 @@
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SubscriptionDurability;
+import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceType;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceAuthorityType;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
@@ -235,17 +240,72 @@
assertNotNull(bean);
assertEquals("ServiceSix", bean.getEjbName());
-// // The bean must have a 'copy' inside the overriden metadata
-// SessionBeanMetaData overriden = bean.getOverridenMetaData();
-// assertNotNull(overriden);
-// assertEquals("ServiceSix", overriden.getEjbName());
+ assertEquals("service description", bean.getDescriptionGroup().getDescription());
- getLog().info(bean.getDescriptionGroup().getDescription());
-
assertEquals(1, bean.getBusinessLocals().size());
assertTrue(bean.getBusinessLocals().contains("org.jboss.ejb3.test.service.ServiceSixLocal"));
+ assertEquals(1, bean.getBusinessRemotes().size());
+ assertTrue(bean.getBusinessRemotes().contains("org.jboss.ejb3.test.service.ServiceSixRemote"));
+ assertEquals("org.jboss.ejb3.test.service.ServiceSix", bean.getEjbClass());
+ {
+ assertEquals(1, bean.getEjbReferences().size());
+ EJBReferenceMetaData ejbRef = bean.getEjbReferenceByName("ejb/StatelessBean");
+ assertNotNull(ejbRef);
+ assertEquals("test", ejbRef.getDescriptions().value()[0].value());
+ assertEquals(EJBReferenceType.Session, ejbRef.getEjbRefType());
+ assertEquals("org.jboss.ejb3.test.service.StatelessRemote", ejbRef.getRemote());
+ assertEquals("StatelessBean", ejbRef.getLink());
+ assertEquals("StatelessBean/remote", ejbRef.getJndiName());
+ assertEquals(1, ejbRef.getInjectionTargets().size());
+ ResourceInjectionTargetMetaData injectionTarget = ejbRef.getInjectionTargets().iterator().next();
+ assertNotNull(injectionTarget);
+ assertEquals("org.jboss.ejb3.test.service.ServiceSix", injectionTarget.getInjectionTargetClass());
+ assertEquals("stateless", injectionTarget.getInjectionTargetName());
+ }
- // TODO: I shouldn't have to reference via embedded
+ {
+ assertEquals(1, bean.getEjbLocalReferences().size());
+ EJBLocalReferenceMetaData ejbLocalRef = bean.getEjbLocalReferenceByName("ejb/StatelessLocal");
+ assertNotNull(ejbLocalRef);
+ assertEquals(EJBReferenceType.Session, ejbLocalRef.getEjbRefType());
+ assertEquals("org.jboss.ejb3.test.service.StatelessLocal", ejbLocalRef.getLocal());
+ assertEquals("StatelessBean", ejbLocalRef.getLink());
+ assertEquals("StatelessBean/local", ejbLocalRef.getJndiName());
+ assertEquals(1, ejbLocalRef.getInjectionTargets().size());
+ ResourceInjectionTargetMetaData injectionTarget = ejbLocalRef.getInjectionTargets().iterator().next();
+ assertNotNull(injectionTarget);
+ assertEquals("org.jboss.ejb3.test.service.ServiceSix", injectionTarget.getInjectionTargetClass());
+ assertEquals("setStatelessLocal", injectionTarget.getInjectionTargetName());
+ }
+
+ {
+ assertEquals(1, bean.getResourceReferences().size());
+ ResourceReferenceMetaData resourceRef = bean.getResourceReferenceByName("testDatasource");
+ assertNotNull(resourceRef);
+ assertEquals("javax.sql.DataSource", resourceRef.getType());
+ assertEquals(ResourceAuthorityType.Container, resourceRef.getResAuth());
+ assertEquals("java:/DefaultDS", resourceRef.getMappedName());
+ assertEquals(1, resourceRef.getInjectionTargets().size());
+ ResourceInjectionTargetMetaData injectionTarget = resourceRef.getInjectionTargets().iterator().next();
+ assertNotNull(injectionTarget);
+ assertEquals("org.jboss.ejb3.test.service.ServiceSix", injectionTarget.getInjectionTargetClass());
+ assertEquals("testDatasource", injectionTarget.getInjectionTargetName());
+ }
+
+ {
+ assertEquals(1, bean.getResourceEnvironmentReferences().size());
+ ResourceEnvironmentReferenceMetaData resourceEnvRef = bean.getResourceEnvironmentReferenceByName("res/aQueue");
+ assertEquals("javax.jms.Queue", resourceEnvRef.getType());
+ assertEquals("queue/mdbtest", resourceEnvRef.getJndiName());
+ }
+
+ {
+ assertEquals(1, bean.getMessageDestinationReferences().size());
+ MessageDestinationReferenceMetaData messageDestinationRef = bean.getMessageDestinationReferenceByName("messageDestinationRef");
+ assertNotNull(messageDestinationRef);
+ assertEquals("mappedName", messageDestinationRef.getMappedName());
+ }
+
SecurityIdentityMetaData securityIdentity = bean.getSecurityIdentity();
assertNotNull(securityIdentity);
RunAsMetaData runAs = securityIdentity.getRunAs();
@@ -253,8 +313,16 @@
assertEquals("role name", runAs.getRoleName());
assertEquals("run as principal", securityIdentity.getRunAsPrincipal());
- // TODO: see above
- assertNotNull(bean.getSecurityIdentity());
+ assertEquals("object name", bean.getObjectName());
+ assertEquals("org.jboss.ejb3.test.service.ServiceSixManagement", bean.getManagement());
+ assertEquals("xmbean", bean.getXmbean());
+ assertNotNull(bean.getRemoteBinding());
+ assertEquals("client bind url", bean.getRemoteBinding().getClientBindUrl());
+ assertEquals("serviceSix/remote", bean.getJndiName());
+ assertEquals("serviceSix/local", bean.getLocalJndiName());
+ assertEquals("security domain", bean.getSecurityDomain());
+ assertEquals(1, bean.getMethodAttributes().size());
+ assertEquals(1, bean.getMethodTransactionTimeout("test"));
}
/**
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml 2007-10-24 11:37:03 UTC (rev 66382)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml 2007-10-24 12:19:47 UTC (rev 66383)
@@ -8,7 +8,7 @@
version="3.0">
<enterprise-beans>
<service>
- <description>test</description>
+ <description>service description</description>
<ejb-name>ServiceSix</ejb-name>
<business-local>org.jboss.ejb3.test.service.ServiceSixLocal</business-local>
<business-remote>org.jboss.ejb3.test.service.ServiceSixRemote</business-remote>
More information about the jboss-cvs-commits
mailing list