[jboss-cvs] JBossAS SVN: r109442 - in trunk/server/src: main/java/org/jboss/as/naming/javaee and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 24 03:30:00 EST 2010
Author: jaikiran
Date: 2010-11-24 03:29:59 -0500 (Wed, 24 Nov 2010)
New Revision: 109442
Added:
trunk/server/src/main/java/org/jboss/as/naming/javaee/JavaEEModuleIdentifier.java
Modified:
trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java
Log:
JBAS-8548 (1) Configure resource provider for resource-env-ref of type javax.ejb.MessageDrivenContext (2) Fix for org.jboss.test.entityexc.test.EntityExcUnitTestCase test failure which was introduced after switchboard integration
Modified: trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/core-naming-jboss-beans.xml 2010-11-24 06:56:19 UTC (rev 109441)
+++ trunk/server/src/etc/deployers/core-naming-jboss-beans.xml 2010-11-24 08:29:59 UTC (rev 109442)
@@ -14,7 +14,7 @@
<bean name="NameSpaces" class="org.jboss.reloaded.naming.service.NameSpaces"/>
- <bean name="JavaEEModuleIdentifier" class="org.jboss.as.javaee.SimpleJavaEEModuleIdentifier"/>
+ <bean name="JavaEEModuleIdentifier" class="org.jboss.as.naming.javaee.JavaEEModuleIdentifier"/>
<bean name="NamingJavaEEApplicationInformer" class="org.jboss.as.naming.javaee.NamingJavaEEApplicationInformer"/>
<bean name="NamingJavaEEModuleInformer" class="org.jboss.as.naming.javaee.NamingJavaEEModuleInformer">
Modified: trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-24 06:56:19 UTC (rev 109441)
+++ trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-24 08:29:59 UTC (rev 109442)
@@ -38,6 +38,10 @@
<value><inject bean="org.jboss.switchboard.EJBContextResEnvRefProvider"/></value>
</entry>
<entry>
+ <key>javax.ejb.MessageDrivenContext</key>
+ <value><inject bean="org.jboss.switchboard.EJBContextResEnvRefProvider"/></value>
+ </entry>
+ <entry>
<key>javax.ejb.TimerService</key>
<value>
<bean name="org.jboss.switchboard.TimerServiceResEnvRefProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.TimerServiceResourceEnvRefResourceProvider">
Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-24 06:56:19 UTC (rev 109441)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-24 08:29:59 UTC (rev 109442)
@@ -38,6 +38,10 @@
<value><inject bean="org.jboss.switchboard.EJBContextResEnvRefProvider"/></value>
</entry>
<entry>
+ <key>javax.ejb.MessageDrivenContext</key>
+ <value><inject bean="org.jboss.switchboard.EJBContextResEnvRefProvider"/></value>
+ </entry>
+ <entry>
<key>javax.ejb.TimerService</key>
<value>
<bean name="org.jboss.switchboard.TimerServiceResEnvRefProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.TimerServiceResourceEnvRefResourceProvider">
Added: trunk/server/src/main/java/org/jboss/as/naming/javaee/JavaEEModuleIdentifier.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/naming/javaee/JavaEEModuleIdentifier.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/JavaEEModuleIdentifier.java 2010-11-24 08:29:59 UTC (rev 109442)
@@ -0,0 +1,63 @@
+/*
+ * 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.as.naming.javaee;
+
+import org.jboss.as.javaee.SimpleJavaEEModuleIdentifier;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.client.jboss.JBossClientMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
+import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer.ModuleType;
+
+/**
+ * @see #getModuleType(DeploymentUnit) to see why we have this class instead
+ * of just using {@link SimpleJavaEEModuleIdentifier}
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class JavaEEModuleIdentifier extends SimpleJavaEEModuleIdentifier
+{
+
+ /**
+ * The original {@link SimpleJavaEEModuleIdentifier#getModuleType(DeploymentUnit)} has a hackish way of
+ * identifying the Module type for a EJB deployment. That original implementation doesn't consider a unit
+ * to be of type {@link ModuleType#EJB} if the deployment only contains (EJB2.x) entity beans.
+ * <p>
+ * Unlike that original implementation, in this overridden implementation, we consider a unit to be
+ * of type {@link ModuleType#EJB} if it contains {@link JBossMetaData} attachment and we don't do any additional
+ * checks.
+ * </p>
+ */
+ @Override
+ public org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer.ModuleType getModuleType(DeploymentUnit unit)
+ {
+ if(unit.isAttachmentPresent(JBossClientMetaData.class))
+ return JavaEEModuleInformer.ModuleType.APP_CLIENT;
+ if(unit.isAttachmentPresent(JBossMetaData.class))
+ return JavaEEModuleInformer.ModuleType.EJB;
+ if(unit.isAttachmentPresent(JBossWebMetaData.class))
+ return JavaEEModuleInformer.ModuleType.WEB;
+ return JavaEEModuleInformer.ModuleType.JAVA;
+ }
+}
Modified: trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java 2010-11-24 06:56:19 UTC (rev 109441)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java 2010-11-24 08:29:59 UTC (rev 109442)
@@ -21,19 +21,19 @@
*/
package org.jboss.as.naming.javaee;
+import java.lang.reflect.Array;
+
import org.jboss.as.javaee.SimpleJavaEEModuleIdentifier;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
-import java.lang.reflect.Array;
-
/**
* @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
*/
public class NamingJavaEEModuleInformer extends NamingJavaEEApplicationInformer implements JavaEEModuleInformer
{
// TODO: for now we delegate to the former JPA SPI informer. This informer should be merged with that one into one integration component
- private SimpleJavaEEModuleIdentifier identifier;
+ private SimpleJavaEEModuleIdentifier identifier = new JavaEEModuleIdentifier();
private String[] requiredAttachments;
@@ -93,4 +93,5 @@
this.identifier = identifier;
this.requiredAttachments = concat(super.getRequiredAttachments(), identifier.getRequiredAttachments());
}
+
}
More information about the jboss-cvs-commits
mailing list