[portal-commits] JBoss Portal SVN: r5962 - branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2007-01-08 08:07:09 -0500 (Mon, 08 Jan 2007)
New Revision: 5962

Modified:
   branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
more JBPORTAL-1178 : Make JBoss Web 1.0.x deployment accepted by the portal deployer

Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2007-01-08 11:02:18 UTC (rev 5961)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2007-01-08 13:07:09 UTC (rev 5962)
@@ -103,10 +103,14 @@
             {
                return TOMCAT4;
             }
-            else if (result.startsWith("JBoss Web Server/1.0"))
+            else if (result.startsWith("JBoss Web Server/1"))
             {
                return TOMCAT5;
             }
+            else if (result.startsWith("JBoss Web Server/2"))
+            {
+               return TOMCAT6;
+            }
          }
       }
       catch (ClassNotFoundException e)