[jboss-cvs] JBossAS SVN: r95343 - in trunk: tomcat/src/main/java/org/jboss/web/tomcat/service/deployers and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-21 17:22:43 -0400 (Wed, 21 Oct 2009)
New Revision: 95343

Modified:
   trunk/component-matrix/pom.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- New JBW build, with JSP fixes.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-21 20:57:06 UTC (rev 95342)
+++ trunk/component-matrix/pom.xml	2009-10-21 21:22:43 UTC (rev 95343)
@@ -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-10</version.jboss.web>
+    <version.jboss.web>3.0.0.alpha-11</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>

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-21 20:57:06 UTC (rev 95342)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-21 21:22:43 UTC (rev 95343)
@@ -973,10 +973,23 @@
                      tagAttributeInfo.setReqTime("" + attributeMetaData.getRtexprvalue());
                      tagAttributeInfo.setRequired("" + attributeMetaData.getRequired());
                      tagAttributeInfo.setFragment("" + attributeMetaData.getFragment());
-                     if (attributeMetaData.getDeferredValue() != null)
-                        tagAttributeInfo.setDeferredValue(attributeMetaData.getDeferredValue().getType());
+                     if (attributeMetaData.getDeferredValue() != null) {
+                        tagAttributeInfo.setDeferredValue("true");
+                        tagAttributeInfo.setExpectedTypeName(attributeMetaData.getDeferredValue().getType());
+                     }
+                     else
+                     {
+                        tagAttributeInfo.setDeferredValue("false");
+                     }
                      if (attributeMetaData.getDeferredMethod() != null)
-                        tagAttributeInfo.setDeferredMethod(attributeMetaData.getDeferredMethod().getMethodSignature());
+                     {
+                        tagAttributeInfo.setDeferredMethod("true");
+                        tagAttributeInfo.setMethodSignature(attributeMetaData.getDeferredMethod().getMethodSignature());
+                     }
+                     else
+                     {
+                        tagAttributeInfo.setDeferredMethod("false");
+                     }
                      tagInfo.addTagAttributeInfo(tagAttributeInfo);
                   }
                }