Author: ate
Date: Fri Jun 20 06:59:01 2008
New Revision: 669899

URL: http://svn.apache.org/viewvc?rev=669899&view=rev
Log:
Fix incorrect setting of the target contextName of portlet apps when hot 
deploying from the deploy folder.
The target contextName now needs to be exact as the DeployFactory tool no 
longer strips off a ".war" postfix.
NB: the DeployMojo already handled this, I forgot to apply the same change for 
the runtime hotdeploy functionality

Modified:
    
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java

Modified: 
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java?rev=669899&r1=669898&r2=669899&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
 (original)
+++ 
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
 Fri Jun 20 06:59:01 2008
@@ -215,8 +215,10 @@
     {
         try
         {
-            File toFile = new File(webAppDir, event.getName());
-            new JetspeedDeploy(event.getPath(), toFile.getAbsolutePath(), 
event.getName(), stripLoggers);
+            String fileName = event.getName();
+            File toFile = new File(webAppDir, fileName);
+            String contextName = fileName.substring(0, fileName.length() - 4); 
// strip ".war"
+            new JetspeedDeploy(event.getPath(), toFile.getAbsolutePath(), 
contextName, stripLoggers);
             event.setStatus(DeploymentStatus.STATUS_OKAY);
         }
         catch (Exception e)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to