[jboss-cvs] JBossAS SVN: r102625 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2010-03-19 10:22:56 -0400 (Fri, 19 Mar 2010)
New Revision: 102625

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/TomcatDeployment.java
Log:
- JBCTS-973: Only partially fixed last time.

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-19 13:13:11 UTC (rev 102624)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-03-19 14:22:56 UTC (rev 102625)
@@ -892,13 +892,6 @@
       
       ArrayList<TagLibraryInfo> tagLibraries = new ArrayList<TagLibraryInfo>();
 
-      String base = deploymentUnitLocal.get().getName();
-      int pos = base.indexOf(':');
-      if (pos > 0)
-      {
-         base = base.substring(pos);
-      }
-      
       Iterator<String> locationInterator = tldMetaDataMap.keySet().iterator();
       while (locationInterator.hasNext())
       {
@@ -906,18 +899,13 @@
          String jarPath = null;
          
          String location = locationInterator.next();
-         if (location.equals(TldMetaData.class.getName()))
-         {
-            // If there is only one TLD, it will also get mapped as this attachement
-            continue;
-         }
          TldMetaData tldMetaData = tldMetaDataMap.get(location);
-         if (location.startsWith(TldMetaData.class.getName() + ":"))
+         if (!location.startsWith("shared:"))
          {
             relativeLocation = "/" + location.substring(TldMetaData.class.getName().length() + 1);
             if (relativeLocation.startsWith("/WEB-INF/lib/"))
             {
-               pos = relativeLocation.indexOf('/', "/WEB-INF/lib/".length());
+               int pos = relativeLocation.indexOf('/', "/WEB-INF/lib/".length());
                if (pos > 0)
                {
                   jarPath = relativeLocation.substring(pos);

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-03-19 13:13:11 UTC (rev 102624)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-03-19 14:22:56 UTC (rev 102625)
@@ -180,14 +180,15 @@
       while (attachementNames.hasNext()) {
          String name = attachementNames.next();
          Object attachement = depUnit.getAttachment(name);
-         if (attachement != null && attachement instanceof TldMetaData)
+         if (attachement != null && attachement instanceof TldMetaData
+               && name.startsWith(TldMetaData.class.getName() + ":"))
          {
             tldMetaDataMap.put(name, (TldMetaData) attachement);
          }
       }
       for (TldMetaData tldMetaData : config.getSharedTldMetaData())
       {
-         tldMetaDataMap.put(tldMetaData.toString(), tldMetaData);
+         tldMetaDataMap.put("shared:" + tldMetaData.toString(), tldMetaData);
       }
       
       TomcatInjectionContainer injectionContainer =