[jboss-cvs] JBossAS SVN: r108870 - in branches/switchboard-integration: server and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 25 04:44:51 EDT 2010
Author: jaikiran
Date: 2010-10-25 04:44:50 -0400 (Mon, 25 Oct 2010)
New Revision: 108870
Modified:
branches/switchboard-integration/component-matrix/pom.xml
branches/switchboard-integration/server/pom.xml
branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java
branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
Log:
Upgrade to 1.0.0-alpha-3 of switchboard and disable env-entry and resource-env-ref ENC injectors from Tomcat container
Modified: branches/switchboard-integration/component-matrix/pom.xml
===================================================================
--- branches/switchboard-integration/component-matrix/pom.xml 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/component-matrix/pom.xml 2010-10-25 08:44:50 UTC (rev 108870)
@@ -132,7 +132,7 @@
<version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
- <version.org.jboss.switchboard.depchain>1.0.0-alpha-2</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-3</version.org.jboss.switchboard.depchain>
<version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.weld>1.1.0.Beta1</version.org.jboss.weld>
Modified: branches/switchboard-integration/server/pom.xml
===================================================================
--- branches/switchboard-integration/server/pom.xml 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/server/pom.xml 2010-10-25 08:44:50 UTC (rev 108870)
@@ -414,7 +414,12 @@
<artifactId>jboss-annotations-api_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-spi</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-10-25 08:44:50 UTC (rev 108870)
@@ -74,6 +74,7 @@
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.switchboard.spi.Barrier;
import org.jboss.system.metadata.ServiceAttributeMetaData;
import org.jboss.system.metadata.ServiceConstructorMetaData;
import org.jboss.system.metadata.ServiceDependencyMetaData;
@@ -154,6 +155,7 @@
public AbstractWarDeployer()
{
super(JBossWebMetaData.class);
+ addInput(Barrier.class);
setOutput(ServiceMetaData.class);
setOutput(WarDeployment.class);
}
@@ -729,62 +731,72 @@
dependencies.add(sdmd);
}
}
-
- // JBAS-6795 Add dependency on PersistenceUnit references
- PersistenceUnitReferencesMetaData puRefs = metaData.getPersistenceUnitRefs();
- if (puRefs != null)
- {
- for (PersistenceUnitReferenceMetaData puRef : metaData.getPersistenceUnitRefs())
- {
- // TODO: this is a duplication of the logic in PersistenceUnitHandler
- String persistenceUnitName = puRef.getPersistenceUnitName();
- String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
- ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
- sdmd.setIDependOn(beanName);
- dependencies.add(sdmd);
- }
- }
- // JBAS-6795 Add dependency on PersistenceContext references
- PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
- if (pcRefs != null)
+ // SwitchBoard
+ Barrier switchBoard = unit.getAttachment(Barrier.class);
+ if (switchBoard != null)
{
- for (PersistenceContextReferenceMetaData pcRef : metaData.getPersistenceContextRefs())
- {
- // TODO: this is a duplication of the logic in PersistenceContextHandler
- String persistenceUnitName = pcRef.getPersistenceUnitName();
- String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
- ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
- sdmd.setIDependOn(beanName);
- dependencies.add(sdmd);
- }
+ ServiceDependencyMetaData switchBoardDependency = new ServiceDependencyMetaData();
+ switchBoardDependency.setIDependOn(switchBoard.getId());
+ dependencies.add(switchBoardDependency);
+ log.debug("Added switchboard dependency: " + switchBoard.getId() + " for web module: " + name);
}
+
+// JBAS-6795 Add dependency on PersistenceUnit references
+// PersistenceUnitReferencesMetaData puRefs = metaData.getPersistenceUnitRefs();
+// if (puRefs != null)
+// {
+// for (PersistenceUnitReferenceMetaData puRef : metaData.getPersistenceUnitRefs())
+// {
+// // TODO: this is a duplication of the logic in PersistenceUnitHandler
+// String persistenceUnitName = puRef.getPersistenceUnitName();
+// String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
+// ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+// sdmd.setIDependOn(beanName);
+// dependencies.add(sdmd);
+// }
+// }
+//
+// // JBAS-6795 Add dependency on PersistenceContext references
+// PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
+// if (pcRefs != null)
+// {
+// for (PersistenceContextReferenceMetaData pcRef : metaData.getPersistenceContextRefs())
+// {
+// // TODO: this is a duplication of the logic in PersistenceContextHandler
+// String persistenceUnitName = pcRef.getPersistenceUnitName();
+// String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
+// ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+// sdmd.setIDependOn(beanName);
+// dependencies.add(sdmd);
+// }
+// }
+//
+// // JBAS-8406 Add dependency on @EJB(s). This is a bit of duplicacy, since the TomcatInjectionContainer
+// // through various handler would also do the same. But since the TomcatInjectionContainer comes too late
+// // in the picture and since we already have similar duplicacy for @PersistenceContext and @PersistenceUnit (see few lines
+// // above) and more importantly, since this works, let's just have it here.
+// if (metaData.getJndiEnvironmentRefsGroup() != null)
+// {
+// AnnotatedEJBReferencesMetaData annotatedEjbRefs = metaData.getJndiEnvironmentRefsGroup().getAnnotatedEjbReferences();
+// if (annotatedEjbRefs != null && !annotatedEjbRefs.isEmpty())
+// {
+// for (AnnotatedEJBReferenceMetaData annotatedEjbRef : annotatedEjbRefs)
+// {
+// // Note: @EJB(beanName="") is set as "link" in AnnotatedEJBReferenceMetadata.
+// // Hence, we use the getLink() method to get hold of the beanName during resolution.
+// String beanName = annotatedEjbRef.getLink();
+// EjbReference ejbReference = new EjbReference(beanName, annotatedEjbRef.getBeanInterface().getName(), annotatedEjbRef.getMappedName());
+// String jndiName = this.ejbRefResolver.resolveEjb(unit, ejbReference);
+// if (jndiName != null)
+// {
+// ServiceDependencyMetaData sdmd = this.createJNDIDependency(jndiName);
+// dependencies.add(sdmd);
+// }
+// }
+// }
+// }
- // JBAS-8406 Add dependency on @EJB(s). This is a bit of duplicacy, since the TomcatInjectionContainer
- // through various handler would also do the same. But since the TomcatInjectionContainer comes too late
- // in the picture and since we already have similar duplicacy for @PersistenceContext and @PersistenceUnit (see few lines
- // above) and more importantly, since this works, let's just have it here.
- if (metaData.getJndiEnvironmentRefsGroup() != null)
- {
- AnnotatedEJBReferencesMetaData annotatedEjbRefs = metaData.getJndiEnvironmentRefsGroup().getAnnotatedEjbReferences();
- if (annotatedEjbRefs != null && !annotatedEjbRefs.isEmpty())
- {
- for (AnnotatedEJBReferenceMetaData annotatedEjbRef : annotatedEjbRefs)
- {
- // Note: @EJB(beanName="") is set as "link" in AnnotatedEJBReferenceMetadata.
- // Hence, we use the getLink() method to get hold of the beanName during resolution.
- String beanName = annotatedEjbRef.getLink();
- EjbReference ejbReference = new EjbReference(beanName, annotatedEjbRef.getBeanInterface().getName(), annotatedEjbRef.getMappedName());
- String jndiName = this.ejbRefResolver.resolveEjb(unit, ejbReference);
- if (jndiName != null)
- {
- ServiceDependencyMetaData sdmd = this.createJNDIDependency(jndiName);
- dependencies.add(sdmd);
- }
- }
- }
- }
-
webModule.setDependencies(dependencies);
Modified: branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java 2010-10-25 08:44:50 UTC (rev 108870)
@@ -804,7 +804,7 @@
* element. If there was no security-domain element then the bindings are to
* NullSecurityManager instance which simply allows all access.
*/
- protected void linkSecurityDomain(String securityDomain, Context envCtx) throws NamingException
+ protected void linkSecurityDomain(String securityDomain, Context javaCompCtx) throws NamingException
{
if (securityDomain == null)
{
@@ -817,11 +817,11 @@
securityDomain = SecurityConstants.JAAS_CONTEXT_ROOT + "/" + securityDomain;
log.debug("Linking security/securityMgr to JNDI name: " + securityDomain);
- Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
- Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain + "/realmMapping"));
- Util.bind(envCtx, "security/authorizationMgr", new LinkRef(securityDomain + "/authorizationMgr"));
- Util.bind(envCtx, "security/security-domain", new LinkRef(securityDomain));
- Util.bind(envCtx, "security/subject", new LinkRef(securityDomain + "/subject"));
+ Util.bind(javaCompCtx, "env/security/securityMgr", new LinkRef(securityDomain));
+ Util.bind(javaCompCtx, "env/security/realmMapping", new LinkRef(securityDomain + "/realmMapping"));
+ Util.bind(javaCompCtx, "env/security/authorizationMgr", new LinkRef(securityDomain + "/authorizationMgr"));
+ Util.bind(javaCompCtx, "env/security/security-domain", new LinkRef(securityDomain));
+ Util.bind(javaCompCtx, "env/security/subject", new LinkRef(securityDomain + "/subject"));
}
/**
Modified: branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2010-10-25 08:44:50 UTC (rev 108870)
@@ -29,6 +29,7 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
+import org.jboss.switchboard.spi.Barrier;
import org.jboss.web.deployers.AbstractWarDeployer;
import org.jboss.web.deployers.AbstractWarDeployment;
@@ -130,6 +131,7 @@
{
this.componentInformer = componentInformer;
setInputs(componentInformer.getRequiredAttachments());
+ addInput(Barrier.class);
}
public String getName()
Modified: branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-10-25 08:44:50 UTC (rev 108870)
@@ -414,7 +414,7 @@
// TODO: The enc should be an input?
currentThread.setContextClassLoader(webLoader.getClassLoader());
metaData.setENCLoader(webLoader.getClassLoader());
- Context envCtx = component.getContext();
+ Context javaCompCtx = component.getContext();
// Add ORB/UserTransaction
ORB orb = null;
try
@@ -424,7 +424,7 @@
// Bind the orb
if (orb != null)
{
- NonSerializableFactory.rebind(envCtx, "ORB", orb);
+ NonSerializableFactory.rebind(javaCompCtx, "ORB", orb);
log.debug("Bound java:comp/ORB");
}
}
@@ -434,18 +434,18 @@
}
// JTA links
- envCtx.bind("TransactionSynchronizationRegistry", new LinkRef("java:TransactionSynchronizationRegistry"));
+ javaCompCtx.bind("TransactionSynchronizationRegistry", new LinkRef("java:TransactionSynchronizationRegistry"));
log.debug("Linked java:comp/TransactionSynchronizationRegistry to JNDI name: java:TransactionSynchronizationRegistry");
- envCtx.bind("UserTransaction", new LinkRef("UserTransaction"));
+ javaCompCtx.bind("UserTransaction", new LinkRef("UserTransaction"));
log.debug("Linked java:comp/UserTransaction to JNDI name: UserTransaction");
- envCtx = envCtx.createSubcontext("env");
+ //envCtx = envCtx.createSubcontext("env");
injectionContainer.populateEnc(webLoader.getClassLoader());
// TODO: this should be bindings in the metadata
currentThread.setContextClassLoader(webLoader.getClassLoader());
String securityDomain = metaData.getSecurityDomain();
log.debug("linkSecurityDomain");
- linkSecurityDomain(securityDomain, envCtx);
+ linkSecurityDomain(securityDomain, javaCompCtx);
}
catch (Throwable t)
Modified: branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
===================================================================
--- branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/injection/WebResourceHandler.java 2010-10-25 05:18:10 UTC (rev 108869)
+++ branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/injection/WebResourceHandler.java 2010-10-25 08:44:50 UTC (rev 108870)
@@ -322,12 +322,12 @@
return;
if (xml.getMessageDestinationReferences() != null)
loadXmlMessageDestinationRefs(container, xml.getMessageDestinationReferences());
- if (xml.getResourceEnvironmentReferences() != null)
- loadXmlResourceEnvRefs(container, xml.getResourceEnvironmentReferences());
+// if (xml.getResourceEnvironmentReferences() != null)
+// loadXmlResourceEnvRefs(container, xml.getResourceEnvironmentReferences());
if (xml.getResourceReferences() != null)
loadXmlResourceRefs(container, xml.getResourceReferences());
- if (xml.getEnvironmentEntries() != null)
- loadEnvEntry(container, xml.getEnvironmentEntries());
+// if (xml.getEnvironmentEntries() != null)
+// loadEnvEntry(container, xml.getEnvironmentEntries());
}
public void handleClassAnnotations(Class<?> clazz, InjectionContainer container)
More information about the jboss-cvs-commits
mailing list