You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/05/24 20:45:08 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl DeployPortletAppEventListener.java
ate 2005/05/24 11:45:08
Modified: portal/src/java/org/apache/jetspeed/deployment/impl
DeployPortletAppEventListener.java
Log:
Small sanity check added to prevent non-app directories to be registered as local app (like the CVS folder when running testcases)
Revision Changes Path
1.24 +17 -7 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
Index: DeployPortletAppEventListener.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DeployPortletAppEventListener.java 23 Mar 2005 22:48:43 -0000 1.23
+++ DeployPortletAppEventListener.java 24 May 2005 18:45:08 -0000 1.24
@@ -111,15 +111,25 @@
});
for (int i = 0; i < localApps.length; i++)
{
- DirectoryHelper paDirHelper = new DirectoryHelper(localApps[i]);
- try
+ // Check for at least WEB-INF/portlet.xml
+ // This will also prevent the src/webapps/WEB-INF/apps/CVS folder
+ // to be seen as local app from testcases resulting in an exception
+ if ( ! new File(localApps[i],"META-INF/portlet.xml").exists() )
{
- pam.startLocalPortletApplication(localApps[i].getName(), paDirHelper,
- createLocalPAClassLoader(localApps[i]));
+ log.warn("Not a local application " + localApps[i].getName());
}
- catch (Exception e)
+ else
{
- log.error("Failed to start Local Portlet Application " + localApps[i], e);
+ DirectoryHelper paDirHelper = new DirectoryHelper(localApps[i]);
+ try
+ {
+ pam.startLocalPortletApplication(localApps[i].getName(), paDirHelper,
+ createLocalPAClassLoader(localApps[i]));
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to start Local Portlet Application " + localApps[i], e);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org