Author: taylor
Date: Mon Feb 26 23:55:48 2007
New Revision: 512166
URL: http://svn.apache.org/viewvc?view=rev&rev=512166
Log:
fix bug with infused war files not having the correct context name
Modified:
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
Modified:
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java?view=diff&rev=512166&r1=512165&r2=512166
==============================================================================
---
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
(original)
+++
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
Mon Feb 26 23:55:48 2007
@@ -339,10 +339,18 @@
String name = file.getName();
String portletApplicationName = name;
- int index = name.lastIndexOf(".");
+ int index = name.lastIndexOf("-infused.war");
if (index > -1)
{
- portletApplicationName = name.substring(0, index);
+ portletApplicationName = name.substring(0, index);
+ }
+ else
+ {
+ index = name.lastIndexOf(".");
+ if (index > -1)
+ {
+ portletApplicationName = name.substring(0, index);
+ }
}
return portletApplicationName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
