[jboss-cvs] JBossAS SVN: r109537 - in trunk: server/src/etc/deployers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 29 09:37:14 EST 2010
Author: jaikiran
Date: 2010-11-29 09:37:10 -0500 (Mon, 29 Nov 2010)
New Revision: 109537
Added:
trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceEnvRefResourceProvider.java
trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceRefResourceProvider.java
Removed:
trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
Log:
JBAS-8548 (1) Resource provider for ORB resource-ref and resource-env-ref (2) Removed the redundant switchboard-clustering-jboss-beans.xml
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-11-29 14:09:27 UTC (rev 109536)
+++ trunk/build/build.xml 2010-11-29 14:37:10 UTC (rev 109537)
@@ -250,11 +250,6 @@
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
- <!-- Use switchboard-clustered-jboss-beans.xml in all -->
- <delete file="${install.all}/deployers/switchboard-jboss-beans.xml"/>
- <!-- Use switchboard-jboss-beans.xml in default -->
- <delete file="${install.default}/deployers/switchboard-clustered-jboss-beans.xml"/>
-
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
<mkdir dir="${install.minimal.deployers}"/>
Deleted: trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-29 14:09:27 UTC (rev 109536)
+++ trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-29 14:37:10 UTC (rev 109537)
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Deployers -->
- <bean name="org.jboss.switchboard.WebEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentSwitchBoardDeployer">
- <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
- </bean>
- <bean name="org.jboss.switchboard.EJBEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.EJBEnvironmentSwitchBoardDeployer">
- <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
- </bean>
-
- <!-- Resource providers -->
-
- <!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.EnvEntryResourceProvider" class="org.jboss.switchboard.mc.resource.provider.EnvEntryResourceProvider"/>
-
- <!-- Resource provider for resource-env-ref of type javax.ejb.EJBContext, javax.ejb.SessionContext -->
- <bean name="org.jboss.switchboard.EJBContextResEnvRefProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.EJBContextResourceEnvRefResourceProvider">
- <constructor>
- <parameter class="java.lang.String"><value>EJBContextBinder</value></parameter>
- </constructor>
- </bean>
-
- <!-- processes resource-env-ref resources (EE.5.8 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.ResourceEnvRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceEnvRefProvider">
- <property name="typedResourceEnvRefResourceProviders">
- <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
- <entry>
- <key>javax.xml.ws.WebServiceContext</key>
- <value><inject bean="org.jboss.switchboard.WebServiceContextResourceProvider"/></value>
- </entry>
- <entry>
- <key>javax.ejb.EJBContext</key>
- <value><inject bean="org.jboss.switchboard.EJBContextResEnvRefProvider"/></value>
- </entry>
- <entry>
- <key>javax.ejb.SessionContext</key>
- <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">
- <constructor>
- <parameter class="java.lang.String"><value>TimerServiceBinder</value></parameter>
- </constructor>
- </bean>
- </value>
- </entry>
- <entry>
- <key>javax.transaction.UserTransaction</key>
- <value>
- <bean name="org.jboss.switchboard.UserTransactionResEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionResourceEnvRefResourceProvider"/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- processes resource-ref resources (EE.5.7 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.ResourceRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceRefResourceProviderDelegator">
- <property name="typedResourceRefResourceProviders">
- <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
- <entry>
- <key>java.net.URL</key>
- <value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
- </entry>
- </map>
- </property>
- <property name="fallbackResourceRefResourceProviders">
- <list>
- <inject bean="org.jboss.switchboard.ManagedBeanResourceRefResourceProvider"/>
- </list>
- </property>
- </bean>
-
- <!-- ResourceProvider for java:comp/ORB (EE.5.12 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.ORBRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBRefResourceProvider"/>
-
- <!-- ResourceProvider for java:comp/UserTransaction (EE.5.10 of Java EE 6 spec) -->
- <bean name="org.jboss.switchboard.UserTransactionRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionRefResourceProvider"/>
-
- <!-- ResourceProvider for java:comp/TransactionSynchronizationRegistry (EE.5.11 of Java EE 6 spec) -->
- <bean name="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationRefResourceProvider"/>
-
- <!-- ResourceProvider for java:comp/EJBContext -->
- <bean name="org.jboss.switchboard.EJBContextResourceProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.EJBContextResourceProvider">
- <constructor>
- <parameter class="java.lang.String"><value>EJBContextBinder</value></parameter>
- </constructor>
- </bean>
-
- <!-- ResourceProvider for java:comp/TimerService -->
- <bean name="org.jboss.switchboard.TimerServiceResourceProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.TimerServiceResourceProvider">
- <constructor>
- <parameter class="java.lang.String"><value>TimerServiceBinder</value></parameter>
- </constructor>
- </bean>
-
- <!-- Resource provider registry -->
- <bean name="org.jboss.switchboard.ResourceProviderRegistry" class="org.jboss.switchboard.mc.resource.provider.ResourceProviderRegistry">
- <property name="resourceProviders">
- <list>
- <inject bean="org.jboss.switchboard.EnvEntryResourceProvider"/>
- <inject bean="org.jboss.switchboard.ResourceEnvRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
- <!-- Disabled till we resolve the transient failures with EJB jndi dependencies
- <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
- -->
- <inject bean="org.jboss.switchboard.BeanManagerResourceProvider"/>
- <inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
- <inject bean="org.jboss.switchboard.EJBContextResourceProvider"/>
- <inject bean="org.jboss.switchboard.TimerServiceResourceProvider"/>
- <!-- Disabled till https://jira.jboss.org/browse/JBAS-8465 is fixed
- <inject bean="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider"/>
- -->
- </list>
- </property>
-
- </bean>
-
- <!-- JNDI environment processor -->
- <bean name="org.jboss.switchboard.JndiEnvironmentProcessor" class="org.jboss.switchboard.mc.JndiEnvironmentProcessor">
- <constructor><parameter><inject bean="org.jboss.switchboard.ResourceProviderRegistry"/></parameter></constructor>
- </bean>
-
-
-</deployment>
\ No newline at end of file
Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-29 14:09:27 UTC (rev 109536)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-29 14:37:10 UTC (rev 109537)
@@ -13,6 +13,13 @@
<!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
<bean name="org.jboss.switchboard.EnvEntryResourceProvider" class="org.jboss.switchboard.mc.resource.provider.EnvEntryResourceProvider"/>
+
+ <!-- ResourceProvider for java:comp/ORB (EE.5.12 of Java EE6 spec) -->
+ <bean name="org.jboss.switchboard.ORBRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBRefResourceProvider">
+ <constructor>
+ <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+ </constructor>
+ </bean>
<!-- Resource provider for resource-env-ref of type javax.ejb.EJBContext, javax.ejb.SessionContext -->
<bean name="org.jboss.switchboard.EJBContextResEnvRefProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.EJBContextResourceEnvRefResourceProvider">
@@ -57,6 +64,17 @@
<bean name="org.jboss.switchboard.UserTransactionResEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionResourceEnvRefResourceProvider"/>
</value>
</entry>
+ <entry>
+ <key>org.omg.CORBA.ORB</key>
+ <value>
+ <!-- Resource provider for res-env-ref of type ORB -->
+ <bean name="org.jboss.switchboard.ORBResourceEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBResourceEnvRefResourceProvider">
+ <constructor>
+ <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+ </constructor>
+ </bean>
+ </value>
+ </entry>
</map>
</property>
</bean>
@@ -69,6 +87,17 @@
<key>java.net.URL</key>
<value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
</entry>
+ <entry>
+ <key>org.omg.CORBA_2_3.ORB</key>
+ <value>
+ <!-- Resource provider for res-ref of type ORB -->
+ <bean name="org.jboss.switchboard.ORBResourceRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBResourceRefResourceProvider">
+ <constructor>
+ <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+ </constructor>
+ </bean>
+ </value>
+ </entry>
</map>
</property>
<property name="fallbackResourceRefResourceProviders">
@@ -78,10 +107,12 @@
</property>
</bean>
- <!-- ResourceProvider for java:comp/UserTransaction (EE.5.10 of Java EE 6 spec) -->
+ <!-- ResourceProvider for java:comp/UserTransaction (EE.5.10 of Java EE 6 spec)
+-->
<bean name="org.jboss.switchboard.UserTransactionRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionRefResourceProvider"/>
- <!-- ResourceProvider for java:comp/TransactionSynchronizationRegistry (EE.5.11 of Java EE 6 spec) -->
+ <!-- ResourceProvider for java:comp/TransactionSynchronizationRegistry (EE.5.11 of Java EE 6 spec)
+-->
<bean name="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationRefResourceProvider"/>
<!-- ResourceProvider for java:comp/EJBContext -->
@@ -113,6 +144,7 @@
<inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
-->
<inject bean="org.jboss.switchboard.BeanManagerResourceProvider"/>
+ <inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBContextResourceProvider"/>
<inject bean="org.jboss.switchboard.TimerServiceResourceProvider"/>
Modified: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java 2010-11-29 14:09:27 UTC (rev 109536)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java 2010-11-29 14:37:10 UTC (rev 109537)
@@ -10,7 +10,7 @@
import org.jboss.switchboard.spi.Resource;
/**
- * ORBRefResourceProvider
+ * Provides {@link Resource} for java:comp/ORB
*
* @author Jaikiran Pai
* @version $Revision: $
@@ -18,14 +18,32 @@
public class ORBRefResourceProvider implements MCBasedResourceProvider<ORBRefType>
{
+ private String corbaJndiName;
+
+ public ORBRefResourceProvider(String corbaJndiName)
+ {
+ if (corbaJndiName == null || corbaJndiName.trim().isEmpty())
+ {
+ throw new IllegalArgumentException("Corba JNDI name cannot be null or empty");
+ }
+ this.corbaJndiName = corbaJndiName;
+ }
+
public Class<ORBRefType> getEnvironmentEntryType()
{
return ORBRefType.class;
}
+ /**
+ * Returns a {@link Resource resource} for java:comp/ORB
+ *
+ */
public Resource provide(DeploymentUnit context, ORBRefType type)
{
- return new LinkRefResource("java:/JBossCorbaORB");
+ // As per JavaEE 6 spec, section EE.9.6, java:comp/ORB is optional.
+ // So let's create a LinkRefResource with ignoreDependency = true, so
+ // that the deployment doesn't fail in the absence of ORB
+ return new LinkRefResource(this.corbaJndiName, true);
}
}
Added: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceEnvRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceEnvRefResourceProvider.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceEnvRefResourceProvider.java 2010-11-29 14:37:10 UTC (rev 109537)
@@ -0,0 +1,67 @@
+/*
+ * 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.switchboard.resource.provider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+import org.omg.CORBA.ORB;
+
+/**
+ * Provides {@link Resource} for resource-env-ref corresponding to type {@link ORB}
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class ORBResourceEnvRefResourceProvider implements MCBasedResourceProvider<JBossResourceEnvRefType>
+{
+
+ private String corbaJndiName;
+
+ public ORBResourceEnvRefResourceProvider(String corbaJndiName)
+ {
+ if (corbaJndiName == null || corbaJndiName.trim().isEmpty())
+ {
+ throw new IllegalArgumentException("Corba JNDI name cannot be null or empty");
+ }
+ this.corbaJndiName = corbaJndiName;
+ }
+
+ @Override
+ public Class<JBossResourceEnvRefType> getEnvironmentEntryType()
+ {
+ return JBossResourceEnvRefType.class;
+ }
+
+ /**
+ * Returns a {@link Resource resource} for {@link ORB} resource-env-ref
+ *
+ */
+ @Override
+ public Resource provide(DeploymentUnit context, JBossResourceEnvRefType type)
+ {
+ return new LinkRefResource(this.corbaJndiName);
+ }
+
+}
Added: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceRefResourceProvider.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBResourceRefResourceProvider.java 2010-11-29 14:37:10 UTC (rev 109537)
@@ -0,0 +1,66 @@
+/*
+ * 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.switchboard.resource.provider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.jboss.environment.JBossResourceRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+import org.omg.CORBA_2_3.ORB;
+
+/**
+ * Provides {@link Resource} for resource-env-ref corresponding to type {@link ORB}
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class ORBResourceRefResourceProvider implements MCBasedResourceProvider<JBossResourceRefType>
+{
+
+ private String corbaJndiName;
+
+ public ORBResourceRefResourceProvider(String corbaJndiName)
+ {
+ if (corbaJndiName == null || corbaJndiName.trim().isEmpty())
+ {
+ throw new IllegalArgumentException("Corba JNDI name cannot be null or empty");
+ }
+ this.corbaJndiName = corbaJndiName;
+ }
+
+ @Override
+ public Class<JBossResourceRefType> getEnvironmentEntryType()
+ {
+ return JBossResourceRefType.class;
+ }
+
+ /**
+ * Returns a {@link Resource resource} for {@link ORB} resource-ref
+ */
+ @Override
+ public Resource provide(DeploymentUnit context, JBossResourceRefType type)
+ {
+ return new LinkRefResource(this.corbaJndiName);
+ }
+
+}
More information about the jboss-cvs-commits
mailing list