[jboss-cvs] JBossAS SVN: r108216 - in trunk: component-matrix and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 20 06:23:42 EDT 2010
Author: wolfc
Date: 2010-09-20 06:23:41 -0400 (Mon, 20 Sep 2010)
New Revision: 108216
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/ejb3/pom.xml
trunk/server/pom.xml
trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java
trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
trunk/webservices/pom.xml
trunk/weld-int/deployer/pom.xml
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java
Log:
JBAS-7556: integrated jboss-reloaded-naming 0.2.0
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/build/build.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -2167,8 +2167,9 @@
<fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:jar"/>
<fileset refid="org.jboss.embedded:jboss-embedded-api:jar" />
<fileset refid="org.jboss.embedded:jboss-embedded-core:jar" />
- <fileset refid="org.jboss.reloaded:jboss-reloaded-naming:jar"/>
- <fileset refid="org.jboss.reloaded:jboss-reloaded-naming-deployers:jar"/>
+ <fileset refid="org.jboss.reloaded.naming:jboss-reloaded-naming-deployers:jar"/>
+ <fileset refid="org.jboss.reloaded.naming:jboss-reloaded-naming-impl:jar"/>
+ <fileset refid="org.jboss.reloaded.naming:jboss-reloaded-naming-spi:jar"/>
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar" />
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar" />
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar" />
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/component-matrix/pom.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -141,8 +141,7 @@
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
<version.org.jboss.reflect>2.2.0.Alpha9</version.org.jboss.reflect>
- <version.org.jboss.reloaded.naming>0.1.0</version.org.jboss.reloaded.naming>
- <version.org.jboss.reloaded.naming.deployers>0.1.0</version.org.jboss.reloaded.naming.deployers>
+ <version.org.jboss.reloaded.naming>0.2.0</version.org.jboss.reloaded.naming>
<version.org.jboss.resteasy>2.0.0.GA</version.org.jboss.resteasy>
<version.org.jboss.remoting>2.5.3</version.org.jboss.remoting>
<version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
@@ -1993,17 +1992,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.reloaded</groupId>
- <artifactId>jboss-reloaded-naming</artifactId>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
<version>${version.org.jboss.reloaded.naming}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.reloaded</groupId>
- <artifactId>jboss-reloaded-naming-deployers</artifactId>
- <version>${version.org.jboss.reloaded.naming.deployers}</version>
<exclusions>
<exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
@@ -2011,6 +2008,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-impl</artifactId>
+ <version>${version.org.jboss.reloaded.naming}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-spi</artifactId>
+ <version>${version.org.jboss.reloaded.naming}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.injection</groupId>
<artifactId>jboss-injection</artifactId>
<version>${version.org.jboss.injection}</version>
@@ -2023,6 +2032,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2058,6 +2071,14 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2936,7 +2957,6 @@
<version>${version.org.jboss.ejb3.embedded}</version>
</dependency>
-
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
@@ -4091,6 +4111,8 @@
<exclude>org.jboss.logging:jboss-logging-log4j</exclude>
<exclude>org.jboss.logging:jboss-logging-jdk</exclude>
<exclude>org.jboss.logging:jboss-logging-logmanager</exclude>
+ <exclude>org.jboss.reloaded:jboss-reloaded-naming</exclude>
+ <exclude>org.jboss.reloaded:jboss-reloaded-naming-deployers</exclude>
<exclude>quartz:quartz</exclude>
</excludes>
<includes>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/ejb3/pom.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -257,6 +257,14 @@
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</exclusion>
@@ -521,7 +529,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.reloaded</groupId>
+ <groupId>org.jboss.reloaded.naming</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
</dependency>
</dependencies>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/server/pom.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -283,13 +283,13 @@
</dependency>
<dependency>
- <groupId>org.jboss.reloaded</groupId>
- <artifactId>jboss-reloaded-naming</artifactId>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.reloaded</groupId>
+ <groupId>org.jboss.reloaded.naming</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
</dependency>
Modified: trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -1,14 +1,16 @@
package org.jboss.as.naming.javaee;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEApplicationInformer;
+import org.jboss.system.metadata.ServiceDeployment;
/**
* @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
*/
public class NamingJavaEEApplicationInformer implements JavaEEApplicationInformer
{
- private static final String REQUIRED_ATTACHMENTS[] = null;
+ private static final String REQUIRED_ATTACHMENTS[] = { JBossAppMetaData.class.getName(), ServiceDeployment.class.getName() };
public String getApplicationName(DeploymentUnit deploymentUnit) throws IllegalArgumentException
{
@@ -19,6 +21,11 @@
return name.substring(0, name.length() - 4);
}
+ public boolean isEnterpriseApplicationArchive(DeploymentUnit deploymentUnit)
+ {
+ return deploymentUnit.isAttachmentPresent(JBossAppMetaData.class) || isTopLevelServiceArchive(deploymentUnit);
+ }
+
public boolean isJavaEEApplication(DeploymentUnit deploymentUnit)
{
// JavaEE 6.0 FR 5.2.2
@@ -26,6 +33,14 @@
return deploymentUnit.isTopLevel();
}
+ /**
+ * In a deployment consisting of x.sar/ejbs.jar, the x.sar substitutes an EAR.
+ */
+ protected boolean isTopLevelServiceArchive(DeploymentUnit deploymentUnit)
+ {
+ return deploymentUnit.isTopLevel() && deploymentUnit.isAttachmentPresent(ServiceDeployment.class);
+ }
+
public String[] getRequiredAttachments()
{
return REQUIRED_ATTACHMENTS;
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-09-20 05:38:57 UTC (rev 108215)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -54,7 +54,7 @@
return super.getApplicationName(deploymentUnit.getTopLevel());
}
- public String getModulePath(DeploymentUnit deploymentUnit)
+ public String getModuleName(DeploymentUnit deploymentUnit)
{
// FIXME this is a hack to give the CURRENT users of this class,
// ComponentNamingDeployer and ModuleNamingDeployer, the info they actually
@@ -74,8 +74,7 @@
String path = deploymentUnit.getRelativePath();
if(path == null || path.length() == 0)
path = deploymentUnit.getSimpleName();
-// return path.substring(0, path.length() - 4);
- return path;
+ return path.substring(0, path.length() - 4);
}
public ModuleType getModuleType(DeploymentUnit deploymentUnit)
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -21,7 +21,11 @@
*/
package org.jboss.web.tomcat.service.deployers;
-import org.apache.catalina.*;
+import org.apache.catalina.Container;
+import org.apache.catalina.Engine;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Loader;
import org.apache.catalina.core.StandardContext;
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.beans.metadata.api.annotations.Inject;
@@ -58,14 +62,20 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.LinkRef;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
import java.security.CodeSource;
import java.security.cert.Certificate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* A tomcat web application deployment.
@@ -734,7 +744,7 @@
// assert ControllerState.INSTALLED
final String applicationName = componentInformer.getApplicationName(unit);
- final String moduleName = componentInformer.getModulePath(unit);
+ final String moduleName = componentInformer.getModuleName(unit);
// TODO: remove hard coded "jboss.naming" constant
final String beanName = "jboss.naming:" + (applicationName != null ? "application=" + applicationName + "," : "") + "module=" + moduleName;
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/webservices/pom.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -223,6 +223,14 @@
<artifactId>jboss-kernel</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jaspi-api</artifactId>
</exclusion>
Modified: trunk/weld-int/deployer/pom.xml
===================================================================
--- trunk/weld-int/deployer/pom.xml 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/weld-int/deployer/pom.xml 2010-09-20 10:23:41 UTC (rev 108216)
@@ -297,7 +297,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.reloaded</groupId>
+ <groupId>org.jboss.reloaded.naming</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
<scope>provided</scope>
</dependency>
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -99,7 +99,7 @@
private String getComponentBeanName(DeploymentUnit deploymentUnit)
{
String appName = informer.getApplicationName(deploymentUnit);
- String moduleName = informer.getModulePath(deploymentUnit);
+ String moduleName = informer.getModuleName(deploymentUnit);
String componentName = informer.getComponentName(deploymentUnit);
String name = "jboss.naming:";
if(appName != null)
@@ -108,4 +108,4 @@
return name;
}
-}
\ No newline at end of file
+}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -82,7 +82,7 @@
{
String applicationName = moduleInformer.getApplicationName(deploymentUnit);
String name = (applicationName == null) ? "" : applicationName + "/";
- name += moduleInformer.getModulePath(deploymentUnit);
+ name += moduleInformer.getModuleName(deploymentUnit);
NonSerializableFactory.rebind(context, name, bootstrapBean.getBootstrap().getManager(beanDeploymentArchive), true);
}
}
@@ -93,7 +93,7 @@
Map<String, BeanManager> beanManagers = new DeploymentVisitor(bootstrapBean).visit().getBeanManagers();
Context context = (Context)getBeanManagerContext();
String applicationName = moduleInformer.getApplicationName(deploymentUnit);
- String topContext = applicationName != null? applicationName: moduleInformer.getModulePath(deploymentUnit);
+ String topContext = applicationName != null? applicationName: moduleInformer.getModuleName(deploymentUnit);
try
{
Context appContext = (Context) context.lookup(topContext);
@@ -148,4 +148,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java 2010-09-20 05:38:57 UTC (rev 108215)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java 2010-09-20 10:23:41 UTC (rev 108216)
@@ -83,7 +83,7 @@
private String getModuleBeanName(DeploymentUnit deploymentUnit)
{
String appName = informer.getApplicationName(deploymentUnit);
- String moduleName = informer.getModulePath(deploymentUnit);
+ String moduleName = informer.getModuleName(deploymentUnit);
String name = "jboss.naming:";
if (appName != null)
{
@@ -94,4 +94,4 @@
}
-}
\ No newline at end of file
+}
More information about the jboss-cvs-commits
mailing list