[jboss-svn-commits] JBoss Portal SVN: r5207 - trunk/server/src/main/org/jboss/portal/server/deployment

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

Author: julien at jboss.com
Date: 2006-09-15 05:14:04 -0400 (Fri, 15 Sep 2006)
New Revision: 5207

Modified:
   trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
try to handle TC6 as TC5 for now.

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-09-14 23:36:20 UTC (rev 5206)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-09-15 09:14:04 UTC (rev 5207)
@@ -44,6 +44,7 @@
    private static final int UNKNOWN = 0;
    private static final int TOMCAT4 = 1;
    private static final int TOMCAT5 = 2;
+   private static final int TOMCAT6 = 3;
 
    private final MBeanServer server;
 
@@ -65,6 +66,9 @@
             return new PortalWebTomcat4App(webApp);
          case TOMCAT5:
             return new PortalWebTomcat5App(webApp, server);
+         case TOMCAT6:
+            // For now trying to build TC6 with TC5 web app
+            return new PortalWebTomcat5App(webApp, server);
          default:
             throw new CannotCreatePortletWebAppException("JBossWeb cannot handle it");
       }
@@ -84,8 +88,12 @@
          String result = (String)getServerInfoMethod.invoke(null, EMPTY_OBJECT_ARRAY);
          if (result != null)
          {
-            if (result.startsWith("Apache Tomcat/5"))
+            if (result.startsWith("Apache Tomcat/6"))
             {
+               return TOMCAT6;
+            }
+            else if (result.startsWith("Apache Tomcat/6"))
+            {
                return TOMCAT5;
             }
             else if (result.startsWith("Apache Tomcat/4"))