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

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

Author: remy.maucherat at jboss.com
Date: 2009-10-22 11:40:12 -0400 (Thu, 22 Oct 2009)
New Revision: 95418

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Update to new JSP metadata.
- Simplify implicit.tld test.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-22 14:55:44 UTC (rev 95417)
+++ trunk/component-matrix/pom.xml	2009-10-22 15:40:12 UTC (rev 95418)
@@ -46,7 +46,7 @@
     <version.jboss.jbossws>3.2.1.Beta2</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
-    <version.jboss.web>3.0.0.alpha-11</version.jboss.web>
+    <version.jboss.web>3.0.0.alpha-12</version.jboss.web>
     <version.jgroups>2.6.13.GA</version.jgroups>
     <version.junit>3.8.2</version.junit>
     <version.org.hibernate.annotations>3.4.0.GA</version.org.hibernate.annotations>
@@ -97,7 +97,7 @@
     <version.org.jboss.metadata.ear>2.0.0.Alpha</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0.Alpha</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
-    <version.org.jboss.metadata.war>2.0.0.Alpha5</version.org.jboss.metadata.war>
+    <version.org.jboss.metadata.war>2.0.0.Alpha6</version.org.jboss.metadata.war>
     <version.org.jboss.microcontainer>2.0.9.GA</version.org.jboss.microcontainer>
     <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>

Modified: trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2009-10-22 14:55:44 UTC (rev 95417)
+++ trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2009-10-22 15:40:12 UTC (rev 95418)
@@ -55,7 +55,8 @@
       if (file == null)
          throw new IllegalArgumentException("Null file");
 
-      if (file.getName().equals("implicit.tld") && (file.getPathName().indexOf("/WEB-INF/tags/") != -1)) {
+      // Implicit TLDs are reserved as the "implicit.tld" name
+      if (file.getName().equals("implicit.tld")) {
          return new TldMetaData();
       } else {
          return super.parse(file);

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	2009-10-22 14:55:44 UTC (rev 95417)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 15:40:12 UTC (rev 95418)
@@ -976,7 +976,7 @@
                      tagVariableInfo.setNameGiven(variableMetaData.getNameGiven());
                      tagVariableInfo.setNameFromAttribute(variableMetaData.getNameFromAttribute());
                      tagVariableInfo.setClassName(variableMetaData.getVariableClass());
-                     tagVariableInfo.setDeclare("" + variableMetaData.getDeclare());
+                     tagVariableInfo.setDeclare(variableMetaData.getDeclare());
                      tagVariableInfo.setScope(variableMetaData.getScope().toString());
                      tagInfo.addTagVariableInfo(tagVariableInfo);
                   }
@@ -989,9 +989,9 @@
                      TagAttributeInfo tagAttributeInfo = new TagAttributeInfo();
                      tagAttributeInfo.setName(attributeMetaData.getName());
                      tagAttributeInfo.setType(attributeMetaData.getType());
-                     tagAttributeInfo.setReqTime("" + attributeMetaData.getRtexprvalue());
-                     tagAttributeInfo.setRequired("" + attributeMetaData.getRequired());
-                     tagAttributeInfo.setFragment("" + attributeMetaData.getFragment());
+                     tagAttributeInfo.setReqTime(attributeMetaData.getRtexprvalue());
+                     tagAttributeInfo.setRequired(attributeMetaData.getRequired());
+                     tagAttributeInfo.setFragment(attributeMetaData.getFragment());
                      if (attributeMetaData.getDeferredValue() != null) {
                         tagAttributeInfo.setDeferredValue("true");
                         tagAttributeInfo.setExpectedTypeName(attributeMetaData.getDeferredValue().getType());