[jboss-cvs] JBossAS SVN: r93099 - in trunk: tomcat/src/main/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-09-01 18:23:44 -0400 (Tue, 01 Sep 2009)
New Revision: 93099

Modified:
   trunk/component-matrix/pom.xml
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Update to new web build to fix smoke test.
- Remove workaround for TransportGuarantee annotation.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-09-01 22:18:23 UTC (rev 93098)
+++ trunk/component-matrix/pom.xml	2009-09-01 22:23:44 UTC (rev 93099)
@@ -42,7 +42,7 @@
     <version.jboss.jbossws>3.2.0.GA</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-2</version.jboss.web>
+    <version.jboss.web>3.0.0.alpha-3</version.jboss.web>
     <version.jgroups>2.6.12.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/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-01 22:18:23 UTC (rev 93098)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-01 22:23:44 UTC (rev 93099)
@@ -619,59 +619,6 @@
 
    }
 
-   /**
-    * @deprecated Temporary override to disable annotation scanning which uses EE6 classes
-    */
-   protected void completeConfig() {
-      // Called from StandardContext.start()
-
-      // Scan all Servlet API related annotations
-      /*
-      if (ok && !context.getIgnoreAnnotations()) {
-         try {
-          org.apache.catalina.startup.WebAnnotationSet.loadApplicationAnnotations(context);
-         } catch (Throwable t) {
-            log.error("Error: " + t.getMessage());
-         }
-      }*/
-      if (ok) {
-          validateSecurityRoles();
-      }
-
-      // Configure an authenticator if we need one
-      if (ok) {
-          authenticatorConfig();
-      }
-
-      // Find and configure overlays
-      if (ok) {
-          JarRepository jarRepository = context.getJarRepository();
-          JarFile[] jars = jarRepository.findJars();
-          for (int i = 0; i < jars.length; i++) {
-              if (jars[i].getEntry(org.apache.catalina.Globals.OVERLAY_PATH) != null) {
-                  if (context.getResources() instanceof ProxyDirContext) {
-                      ProxyDirContext resources = (ProxyDirContext) context.getResources();
-                      JARDirContext overlay = new JARDirContext();
-                      overlay.setJarFile(jars[i], org.apache.catalina.Globals.OVERLAY_PATH);
-                      resources.addOverlay(overlay);
-                  } else {
-                      // Error, overlays need a ProxyDirContext to compose results
-                      log.error(sm.getString("contextConfig.noOverlay", jars[i].getName()));
-                      ok = false;
-                  }
-                  overlays.add(jars[i].getName());
-              }
-          }
-      }
-
-      // Make our application unavailable if problems were encountered
-      if (!ok) {
-          log.error(sm.getString("contextConfig.unavailable"));
-          context.setConfigured(false);
-      }
-
-  }
-
    protected void processContextConfig(String resourceName, boolean local)
    {
       ContextMetaData contextMetaData = null;