svn commit: rev 30992 - forrest/trunk/scratchpad/eclipsePlugin/src/org/apache/forrest/eclipse/actions

[rg...@apache.org]

Author: rgardler
Date: Fri Jul 30 05:05:05 2004
New Revision: 30992

Modified:
   forrest/trunk/scratchpad/eclipsePlugin/src/org/apache/forrest/eclipse/actions/StartForrest.java
Log:
Use Jetty conf in the working directory rather than the Forrest default one

Modified: forrest/trunk/scratchpad/eclipsePlugin/src/org/apache/forrest/eclipse/actions/StartForrest.java
==============================================================================
--- forrest/trunk/scratchpad/eclipsePlugin/src/org/apache/forrest/eclipse/actions/StartForrest.java	(original)
+++ forrest/trunk/scratchpad/eclipsePlugin/src/org/apache/forrest/eclipse/actions/StartForrest.java	Fri Jul 30 05:05:05 2004
@@ -148,8 +148,8 @@
 			// specify main type and program arguments
 			workingCopy.setAttribute(ATTR_MAIN_TYPE_NAME,
 					"org.mortbay.jetty.Server");
-			workingCopy.setAttribute(ATTR_PROGRAM_ARGUMENTS, forrestHome
-					+ "/context/jettyconf.xml");
+			workingCopy.setAttribute(ATTR_PROGRAM_ARGUMENTS, workingDirectory
+					+ "/build/webapp/jettyconf.xml");
 
 			// specify classpath
 			List classpath = new ArrayList();
@@ -160,6 +160,7 @@
 					+ File.separator + "jetty");
 
 			try {
+				//FIXME: check that the search directory exists, if it doesn't eclipse throws an unhandled loop exception
 				List allfiles = Utilities.getFileListing(searchDir);
 				allfiles.addAll(Utilities.getFileListing(jettyDir));
 				Iterator filesListing = allfiles.iterator();