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

Monday, 8 January 2007


Author: julien(a)jboss.com
Date: 2007-01-08 08:07:21 -0500 (Mon, 08 Jan 2007)
New Revision: 5963

Modified:
   trunk/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:
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
---
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2007-01-08
13:07:09 UTC (rev 5962)
+++
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2007-01-08
13:07:21 UTC (rev 5963)
@@ -104,10 +104,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)


    