[jboss-cvs] JBossAS SVN: r105815 - in trunk: testsuite and 3 other directories.

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

Author: remy.maucherat at jboss.com
Date: 2010-06-08 15:04:08 -0400 (Tue, 08 Jun 2010)
New Revision: 105815

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/pom.xml
   trunk/tomcat/pom.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- Update to web 3.0.0.beta-6.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-06-08 18:55:31 UTC (rev 105814)
+++ trunk/component-matrix/pom.xml	2010-06-08 19:04:08 UTC (rev 105815)
@@ -77,7 +77,7 @@
     <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp>
     <version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding>
-    <version.jboss.web>3.0.0-beta-5</version.jboss.web>
+    <version.jboss.web>3.0.0-beta-6</version.jboss.web>
     <version.jgroups>2.10.0.Beta2</version.jgroups>
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
@@ -1556,13 +1556,13 @@
       </dependency>
 
       <dependency>
-        <groupId>jboss.web</groupId>
+        <groupId>org.jboss.web</groupId>
         <artifactId>jasper-jdt</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
       
       <dependency>
-        <groupId>jboss.web</groupId>
+        <groupId>org.jboss.web</groupId>
         <artifactId>jbossweb</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>

Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml	2010-06-08 18:55:31 UTC (rev 105814)
+++ trunk/testsuite/pom.xml	2010-06-08 19:04:08 UTC (rev 105815)
@@ -93,7 +93,7 @@
       <artifactId>jsf-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss.web</groupId>
+      <groupId>org.jboss.web</groupId>
       <artifactId>jasper-jdt</artifactId>
     </dependency>
     <dependency>

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2010-06-08 18:55:31 UTC (rev 105814)
+++ trunk/tomcat/pom.xml	2010-06-08 19:04:08 UTC (rev 105815)
@@ -112,9 +112,9 @@
                   tofile="${output.deploy}/jbossweb.sar/web.xml"/>
                 <copy file="${output.resources}/server.xml"
                   tofile="${output.deploy}/jbossweb.sar/server.xml"/>
-                <copy file="${maven.dependency.jboss.web.jasper-jdt.jar.path}"
+                <copy file="${maven.dependency.org.jboss.web.jasper-jdt.jar.path}"
                   tofile="${output.deploy}/jbossweb.sar/jasper-jdt.jar"/>
-                <copy file="${maven.dependency.jboss.web.jbossweb.jar.path}"
+                <copy file="${maven.dependency.org.jboss.web.jbossweb.jar.path}"
                   tofile="${output.deploy}/jbossweb.sar/jbossweb.jar"/>
                 <copy file="${maven.dependency.javax.servlet.jstl.jar.path}"
                   tofile="${output.deploy}/jbossweb.sar/jstl.jar"/>                                                    
@@ -219,11 +219,11 @@
       <artifactId>jbosssx-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss.web</groupId>
+      <groupId>org.jboss.web</groupId>
       <artifactId>jbossweb</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss.web</groupId>
+      <groupId>org.jboss.web</groupId>
       <artifactId>jasper-jdt</artifactId>
     </dependency>
     <dependency>

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java	2010-06-08 18:55:31 UTC (rev 105814)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java	2010-06-08 19:04:08 UTC (rev 105815)
@@ -301,7 +301,7 @@
       } catch (Throwable t) {
          String msg = sm.getString("Unexpected error forwarding to error page");
          log.warn(msg, t);
-         request.setAttribute(org.apache.catalina.Globals.EXCEPTION_ATTR, t);
+         request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
          response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
                  msg);
       }
@@ -318,7 +318,7 @@
       } catch (Throwable t) {
          String msg = sm.getString("Unexpected error forwarding to login page");
          log.warn(msg, t);
-         request.setAttribute(org.apache.catalina.Globals.EXCEPTION_ATTR, t);
+         request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
          response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
                  msg);
       }

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java	2010-06-08 18:55:31 UTC (rev 105814)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java	2010-06-08 19:04:08 UTC (rev 105815)
@@ -45,7 +45,6 @@
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Catalina;
-import org.apache.catalina.startup.CatalinaProperties;
 import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.jboss.bootstrap.api.lifecycle.LifecycleState;