[jboss-cvs] JBossAS SVN: r99564 - branches/vfs3-int/server/src/main/java/org/jboss/as/naming/javaee.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 18 19:20:00 EST 2010
Author: johnbailey
Date: 2010-01-18 19:20:00 -0500 (Mon, 18 Jan 2010)
New Revision: 99564
Modified:
branches/vfs3-int/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java
Log:
[JBAS-7350] - Merge change to NamingJavaEEModuleInformer
Modified: branches/vfs3-int/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java
===================================================================
--- branches/vfs3-int/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java 2010-01-19 00:18:57 UTC (rev 99563)
+++ branches/vfs3-int/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEModuleInformer.java 2010-01-19 00:20:00 UTC (rev 99564)
@@ -19,10 +19,18 @@
public String getModulePath(DeploymentUnit deploymentUnit)
{
+ /*
+ * JavaEE 6 FR 8.1.1:
+ * The name can be explicitly set in the deployment descriptor for the module. If not set, the name
+ * of the module is the pathname of the module in the ear file with any filename extension (.jar, .war, .rar)
+ * removed, but with any directory names included.
+ */
+ // TODO: get the module name from the deployment descriptor
+ // FIXME: AS can't handle unique module names yet because we deploy a.jar and a.war at the same time, to counter don't strip the extension.
String path = deploymentUnit.getRelativePath();
if(path == null || path.length() == 0)
path = deploymentUnit.getSimpleName();
- return path.substring(0, path.length() - 4);
+ return path;
}
public ModuleType getModuleType(DeploymentUnit deploymentUnit)
More information about the jboss-cvs-commits
mailing list