[jboss-cvs] JBossAS SVN: r102417 - in trunk: server/src/main/java/org/jboss/web/deployers and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2010-03-15 12:44:19 -0400 (Mon, 15 Mar 2010)
New Revision: 102417

Modified:
   trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
   trunk/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- JBCTS-973: After the VFS/deployer update, my attachment name hack no longer works for the setAllowMultipleFiles parsing deployers.
- Attachment name cleanup using VirtualFile.getPathNameRelativeTo(VFSDeploymentUnit.getRoot()).
- Shared TLDs not tested again.

Modified: trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2010-03-15 16:39:24 UTC (rev 102416)
+++ trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2010-03-15 16:44:19 UTC (rev 102417)
@@ -50,7 +50,7 @@
    
    protected void init(VFSDeploymentUnit unit, TldMetaData metaData, VirtualFile file) throws Exception
    {
-      unit.addAttachment(file.toURL().toString(), metaData, getOutput());
+      unit.addAttachment(TldMetaData.class.getName() + ":" + file.getPathNameRelativeTo(unit.getRoot()), metaData, getOutput());
    }
 
    protected TldMetaData parse(VirtualFile file) throws Exception {

Modified: trunk/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java	2010-03-15 16:39:24 UTC (rev 102416)
+++ trunk/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java	2010-03-15 16:44:19 UTC (rev 102417)
@@ -74,7 +74,7 @@
 
    protected void init(VFSDeploymentUnit unit, WebFragmentMetaData metaData, VirtualFile file) throws Exception
    {
-      unit.addAttachment(file.toURL().toString(), metaData, getOutput());
+      unit.addAttachment(WebFragmentMetaData.class.getName() + ":" + file.getPathNameRelativeTo(unit.getRoot()), metaData, getOutput());
    }
    
    protected void createMetaData(DeploymentUnit unit, Set<String> names, String suffix, String key) throws DeploymentException

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-03-15 16:39:24 UTC (rev 102416)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-03-15 16:44:19 UTC (rev 102417)
@@ -176,17 +176,12 @@
                Object attachement = unit.getAttachment(location);
                if (attachement != null && attachement instanceof WebFragmentMetaData)
                {
-                  pos = location.indexOf(':');
-                  if (pos > 0)
+                  if (!location.startsWith(WebFragmentMetaData.class.getName() + ":"))
                   {
-                     location = location.substring(pos);
-                  }
-                  if (!location.startsWith(base))
-                  {
                      // If there is only one fragment, it will also get mapped as this attachement
                      continue;
                   }
-                  String relativeLocation = "/" + location.substring(base.length());
+                  String relativeLocation = "/" + location.substring(WebFragmentMetaData.class.getName().length() + 1);
                   String jarName = null;
                   if (relativeLocation.startsWith("/WEB-INF/lib/"))
                   {

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-03-15 16:39:24 UTC (rev 102416)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-03-15 16:44:19 UTC (rev 102417)
@@ -912,14 +912,9 @@
             continue;
          }
          TldMetaData tldMetaData = tldMetaDataMap.get(location);
-         pos = location.indexOf(':');
-         if (pos > 0)
+         if (location.startsWith(TldMetaData.class.getName() + ":"))
          {
-            location = location.substring(pos);
-         }
-         if (location.startsWith(base))
-         {
-            relativeLocation = "/" + location.substring(base.length());
+            relativeLocation = "/" + location.substring(TldMetaData.class.getName().length() + 1);
             if (relativeLocation.startsWith("/WEB-INF/lib/"))
             {
                pos = relativeLocation.indexOf('/', "/WEB-INF/lib/".length());