You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/28 13:21:45 UTC
svn commit: r202159 - in
/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse:
ForrestPlugin.java job/ForrestBuilder.java job/ForrestManager.java
Author: rgardler
Date: Tue Jun 28 04:21:43 2005
New Revision: 202159
URL: http://svn.apache.org/viewcvs?rev=202159&view=rev
Log:
formatting only
Modified:
forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/ForrestPlugin.java
forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestBuilder.java
forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestManager.java
Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/ForrestPlugin.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/ForrestPlugin.java?rev=202159&r1=202158&r2=202159&view=diff
==============================================================================
--- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/ForrestPlugin.java (original)
+++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/ForrestPlugin.java Tue Jun 28 04:21:43 2005
@@ -31,7 +31,7 @@
* The main plugin class to be used in the desktop.
*/
public class ForrestPlugin extends AbstractUIPlugin {
- public final static String ID = "org.apache.forrest.eclipse";
+ public final static String ID = "org.apache.forrest";
//The shared instance.
private static ForrestPlugin plugin;
Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestBuilder.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestBuilder.java?rev=202159&r1=202158&r2=202159&view=diff
==============================================================================
--- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestBuilder.java (original)
+++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestBuilder.java Tue Jun 28 04:21:43 2005
@@ -71,6 +71,9 @@
sb.append(workingDir);
sb.append(" -Dbasedir=");
sb.append(fhome + File.separatorChar + "main");
+ sb.append(" ");
+ sb.append(" -Dforrest.home=");
+ sb.append(fhome);
if (this.skinName != null) {
sb.append(" -Dproject.skin=");
sb.append("plain-dev");
Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestManager.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestManager.java?rev=202159&r1=202158&r2=202159&view=diff
==============================================================================
--- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestManager.java (original)
+++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestManager.java Tue Jun 28 04:21:43 2005
@@ -39,237 +39,247 @@
* Manages instances of Forrest that are running on the local server.
*/
public class ForrestManager {
- /** Name of the skin to use for building the site without navigation */
- private static final String SKIN_PLAIN = "plain-dev";
+ /** Name of the skin to use for building the site without navigation */
+ private static final String SKIN_PLAIN = "plain-dev";
+
/**
- * Logger for this class
- */
- private static final Logger logger = Logger.getLogger(ForrestManager.class);
-
- /** The command for building the static site */
- public static final String COMMAND_BUILD = "site";
-
- /** The command for running the site server */
- public static final String COMMAND_START = "run";
-
- /** The command for stopping the site server */
- public static final String COMMAND_STOP = "stop";
-
- /** The command for building the site in HTML with no navigation */
- public static final String COMMAND_BUILD_PLAIN = "buildPlain";
-
- private static final int UNKOWN_COMMAND = 0;
-
- private static final int BUILD = 1;
-
- private static final int START = 2;
-
- private static final int STOP = 3;
-
- private static final ForrestManager INSTANCE = new ForrestManager();
-
- // FIXME: dir configuration should be in preferences and should be set by
- // reading forrest.properties and forrest.build.xml (where some defaults are set)
-
- public static final String FORREST_HOME = ForrestPlugin.getDefault()
- .getPluginPreferences().getString(ForrestPreferences.FORREST_HOME);
-
- public static final String FORREST_CORE_LIB = FORREST_HOME
- + File.separator + "lib" + File.separator + "core" + File.separator;
-
- public static final String FORREST_ENDORSED_LIB = FORREST_HOME
- + File.separator + "lib" + File.separator + "endorsed"
- + File.separator;
-
- public static final String FORREST_OPTIONAL_LIB = FORREST_HOME
- + File.separator + "lib" + File.separator + "optional"
- + File.separator;
-
- public static final String JETTY_LIB = FORREST_HOME
- + File.separator + "tools" + File.separator + "jetty"
- + File.separator;
-
- public static final String FORREST_CORE_WEBAPP = FORREST_HOME
- + File.separatorChar + "main" + File.separatorChar + "webapp";
-
- public static final String FORREST_JAR = FORREST_HOME
- + File.separatorChar + "build" + File.separatorChar + "xml-forrest.jar";
-
- public static final String FORREST_CLASSES = FORREST_CORE_WEBAPP
- + File.separator + "WEB-INF" + File.separator + "classes" + File.separator;
-
- public static final String FORREST_LIB = FORREST_HOME
- + File.separator + "build" + File.separator + "xml-forrest.jar";
-
- public static final String FORREST_ANT = FORREST_HOME
- + File.separator + "tools" + File.separator + "ant" + File.separator;
-
- public static final String FORREST_ANTTASK_CLASSES = FORREST_HOME
- + File.separator + "tools" + File.separator + "anttasks" + File.separator;
-
- public static final String FORREST_PLUGINS = FORREST_HOME
- + File.separator + "build" + File.separator + "plugins" + File.separator;
+ * Logger for this class
+ */
+ private static final Logger logger = Logger.getLogger(ForrestManager.class);
+
+ /** The command for building the static site */
+ public static final String COMMAND_BUILD = "site";
+
+ /** The command for running the site server */
+ public static final String COMMAND_START = "run";
+
+ /** The command for stopping the site server */
+ public static final String COMMAND_STOP = "stop";
+
+ /** The command for building the site in HTML with no navigation */
+ public static final String COMMAND_BUILD_PLAIN = "buildPlain";
+
+ private static final int UNKOWN_COMMAND = 0;
+
+ private static final int BUILD = 1;
+
+ private static final int START = 2;
+
+ private static final int STOP = 3;
+
+ private static final ForrestManager INSTANCE = new ForrestManager();
+
+ // FIXME: dir configuration should be in preferences and should be set by
+ // reading forrest.properties and forrest.build.xml (where some defaults are
+ // set)
+
+ public static final String FORREST_HOME = ForrestPlugin.getDefault()
+ .getPluginPreferences().getString(ForrestPreferences.FORREST_HOME);
+
+ public static final String FORREST_CORE_LIB = FORREST_HOME + File.separator
+ + "lib" + File.separator + "core" + File.separator;
+
+ public static final String FORREST_ENDORSED_LIB = FORREST_HOME
+ + File.separator + "lib" + File.separator + "endorsed"
+ + File.separator;
+
+ public static final String FORREST_OPTIONAL_LIB = FORREST_HOME
+ + File.separator + "lib" + File.separator + "optional"
+ + File.separator;
+
+ public static final String JETTY_LIB = FORREST_HOME + File.separator
+ + "tools" + File.separator + "jetty" + File.separator;
+
+ public static final String FORREST_CORE_WEBAPP = FORREST_HOME
+ + File.separatorChar + "main" + File.separatorChar + "webapp";
+
+ public static final String FORREST_JAR = FORREST_HOME + File.separatorChar
+ + "build" + File.separatorChar + "xml-forrest.jar";
+
+ public static final String FORREST_CLASSES = FORREST_CORE_WEBAPP
+ + File.separator + "WEB-INF" + File.separator + "classes"
+ + File.separator;
+
+ public static final String FORREST_LIB = FORREST_HOME + File.separator
+ + "build" + File.separator + "xml-forrest.jar";
+
+ public static final String FORREST_ANT = FORREST_HOME + File.separator
+ + "tools" + File.separator + "ant" + File.separator;
+
+ public static final String FORREST_ANTTASK_CLASSES = FORREST_HOME
+ + File.separator + "tools" + File.separator + "anttasks"
+ + File.separator;
+
+ public static final String FORREST_PLUGINS = FORREST_HOME + File.separator
+ + "build" + File.separator + "plugins" + File.separator;
public static final String FORREST_PLUGINS_LIB = FORREST_HOME
+ File.separator + "build" + File.separator + "plugins"
+ File.separator + "lib" + File.separator;
- private static final String FORREST_DEFAULT_PROPERTIES_FILE = FORREST_CORE_WEBAPP
- + File.separatorChar + "default-forrest.properties";
-
- private static ILaunch serverLaunch;
-
- /**
- * Create a manager, this is not intended to be called from your code. Use
- * Manager.getInstance() instead.
- */
- private ForrestManager() {
- super();
- }
-
- /**
- * Get the properties for a working directory
- * @param workingDir the working dir of the project
- * @return the properties for this project
- * @throws IOException if unable to read either the defaults file or the project file
- * @TODO Cache the project properties file
- * @refactor Move project creation code to own method
- */
- public Hashtable getProperties(String workingDir) throws IOException {
- // TODO: keep a record of the projects created, this is how we will cache the properties
- Project project = new Project();
- project.setName(workingDir);
-
- LoadProperties props = new LoadProperties();
- props.setProject(project);
-
- project.setProperty("project.home", workingDir);
-
- props.setSrcFile(new File(workingDir + File.separatorChar + "forrest.properties"));
- props.execute();
-
- props.setSrcFile(new File(FORREST_DEFAULT_PROPERTIES_FILE));
- props.execute();
-
- project.setProperty("forrest.home", FORREST_HOME);
- project.setProperty("forrest.plugins", FORREST_PLUGINS);
-
- return project.getProperties();
- }
-
-
- public static ForrestManager getInstance() {
- return ForrestManager.INSTANCE;
- }
-
- /**
- * Create a Forrest Job.
- *
- * @param workingDir -
- * the directory on which the job is to work
- * @param cmd -
- * the command the job is to carry out
- * @return
- */
- public Job getForrestJob(String workingDir, String cmd) {
- Job theJob;
- if (cmd.equals(COMMAND_STOP)) {
- theJob = new ForrestStopper(workingDir);
- } else if (cmd.equals(COMMAND_START)) {
- theJob = new ForrestRunner(workingDir);
- } else if (cmd.equals(COMMAND_BUILD)) {
- theJob = new ForrestBuilder(workingDir);
- } else if (cmd.equals(COMMAND_BUILD_PLAIN)) {
- theJob = new ForrestBuilder(workingDir, SKIN_PLAIN);
- } else {
- theJob = null;
- }
- return theJob;
- }
-
- /**
- * Get an array of Files to be placed in the
- * classpath for Forrest.
- *
- * @return an array of Files
- */
- protected static File[] getClasspathFiles() {
- Vector vctFiles = new Vector();
-
- try {
- // FIXME: cache the classpath
- // add Forrest classes
- vctFiles.add(new File(FORREST_CLASSES));
- vctFiles.add(new File(FORREST_JAR));
- // add core libs
- vctFiles.addAll(getLibFiles(FORREST_CORE_LIB));
- // add endorsed libs
- vctFiles.addAll(getLibFiles(FORREST_ENDORSED_LIB));
- // add optional libs
- vctFiles.addAll(getLibFiles(FORREST_OPTIONAL_LIB));
- // add plugin libs
+ private static final String FORREST_DEFAULT_PROPERTIES_FILE = FORREST_CORE_WEBAPP
+ + File.separatorChar + "default-forrest.properties";
+
+ private static ILaunch serverLaunch;
+
+ /**
+ * Create a manager, this is not intended to be called from your code. Use
+ * Manager.getInstance() instead.
+ */
+ private ForrestManager() {
+ super();
+ }
+
+ /**
+ * Get the properties for a working directory
+ *
+ * @param workingDir
+ * the working dir of the project
+ * @return the properties for this project
+ * @throws IOException
+ * if unable to read either the defaults file or the project
+ * file
+ * @TODO Cache the project properties file
+ * @refactor Move project creation code to own method
+ */
+ public Hashtable getProperties(String workingDir) throws IOException {
+ // TODO: keep a record of the projects created, this is how we will
+ // cache the properties
+ Project project = new Project();
+ project.setName(workingDir);
+
+ LoadProperties props = new LoadProperties();
+ props.setProject(project);
+
+ project.setProperty("project.home", workingDir);
+
+ props.setSrcFile(new File(workingDir + File.separatorChar
+ + "forrest.properties"));
+ props.execute();
+
+ props.setSrcFile(new File(FORREST_DEFAULT_PROPERTIES_FILE));
+ props.execute();
+
+ project.setProperty("forrest.home", FORREST_HOME);
+ project.setProperty("forrest.plugins", FORREST_PLUGINS);
+
+ return project.getProperties();
+ }
+
+ public static ForrestManager getInstance() {
+ return ForrestManager.INSTANCE;
+ }
+
+ /**
+ * Create a Forrest Job.
+ *
+ * @param workingDir -
+ * the directory on which the job is to work
+ * @param cmd -
+ * the command the job is to carry out
+ * @return
+ */
+ public Job getForrestJob(String workingDir, String cmd) {
+ Job theJob;
+ if (cmd.equals(COMMAND_STOP)) {
+ theJob = new ForrestStopper(workingDir);
+ } else if (cmd.equals(COMMAND_START)) {
+ theJob = new ForrestRunner(workingDir);
+ } else if (cmd.equals(COMMAND_BUILD)) {
+ theJob = new ForrestBuilder(workingDir);
+ } else if (cmd.equals(COMMAND_BUILD_PLAIN)) {
+ theJob = new ForrestBuilder(workingDir, SKIN_PLAIN);
+ } else {
+ theJob = null;
+ }
+ return theJob;
+ }
+
+ /**
+ * Get an array of Files to be placed in the classpath for Forrest.
+ *
+ * @return an array of Files
+ */
+ protected static File[] getClasspathFiles() {
+ Vector vctFiles = new Vector();
+
+ try {
+ // FIXME: cache the classpath
+ // add Forrest classes
+ vctFiles.add(new File(FORREST_CLASSES));
+ vctFiles.add(new File(FORREST_JAR));
+ // add core libs
+ vctFiles.addAll(getLibFiles(FORREST_CORE_LIB));
+ // add endorsed libs
+ vctFiles.addAll(getLibFiles(FORREST_ENDORSED_LIB));
+ // add optional libs
+ vctFiles.addAll(getLibFiles(FORREST_OPTIONAL_LIB));
+ // add plugin libs
vctFiles.addAll(getLibFiles(FORREST_PLUGINS_LIB));
- } catch (FileNotFoundException e) {
- logger.error("getClasspathFiles()", e);
+ } catch (FileNotFoundException e) {
+ logger.error("getClasspathFiles()", e);
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ File[] files = new File[vctFiles.size()];
+ File[] returnFileArray = (File[]) vctFiles.toArray(files);
+ return returnFileArray;
+ }
+
+ /**
+ * Return an array of URLs that point to lib files.
+ *
+ * @param dir -
+ * directory in which to look for libs
+ * @return ArrayList of URLs
+ * @throws FileNotFoundException -
+ * if the directory doesn't exist
+ */
+ static public ArrayList getLibFiles(String dir)
+ throws FileNotFoundException {
+ File directory = new File(dir);
+ ArrayList result = new ArrayList();
+ if (directory.listFiles() != null) {
+ List dirs = Arrays.asList(directory.listFiles());
+ Iterator filesIter = dirs.iterator();
+ File file = null;
+
+ while (filesIter.hasNext()) {
+ file = (File) filesIter.next();
+
+ if (file.isDirectory()) {
+ List deeperList = getLibFiles(file.toString());
+ result.addAll(deeperList);
+ } else if (file.toString().endsWith(".jar")
+ || file.toString().endsWith(".zip")) {
+ result.add(file);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Stop the server for the given project
+ *
+ * @param projectDir
+ * @throws InterruptedException
+ * @throws DebugException
+ */
+ public static void stopServer(String projectDir) throws DebugException {
+ serverLaunch.terminate();
+ }
+
+ /**
+ * Set the server launch.
+ *
+ * @param launch -
+ * the launch
+ */
+ public static void setServerLaunch(ILaunch launch) {
+ serverLaunch = launch;
+ }
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- File[] files = new File[vctFiles.size()];
- File[] returnFileArray = (File[]) vctFiles.toArray(files);
- return returnFileArray;
- }
-
- /**
- * Return an array of URLs that point to lib files.
- *
- * @param dir -
- * directory in which to look for libs
- * @return ArrayList of URLs
- * @throws FileNotFoundException -
- * if the directory doesn't exist
- */
- static public ArrayList getLibFiles(String dir) throws FileNotFoundException {
- File directory = new File(dir);
- ArrayList result = new ArrayList();
- List dirs = Arrays.asList(directory.listFiles());
- Iterator filesIter = dirs.iterator();
- File file = null;
-
- while (filesIter.hasNext()) {
- file = (File) filesIter.next();
-
- if (file.isDirectory()) {
- List deeperList = getLibFiles(file.toString());
- result.addAll(deeperList);
- } else if (file.toString().endsWith(".jar")
- || file.toString().endsWith(".zip")) {
- result.add(file);
- }
- }
-
- return result;
- }
-
- /**
- * Stop the server for the given project
- *
- * @param projectDir
- * @throws InterruptedException
- * @throws DebugException
- */
- public static void stopServer(String projectDir)
- throws DebugException {
- serverLaunch.terminate();
- }
-
- /**
- * Set the server launch.
- * @param launch - the launch
- */
- public static void setServerLaunch(ILaunch launch) {
- serverLaunch = launch;
- }
-
}