jruaux 2003/02/27 03:00:20
Modified: integration/eclipse/src/java/org/apache/cactus/eclipse/launcher
WarBuilder.java
Log:
Added custom web app directory
Revision Changes Path
1.5 +8 -9
jakarta-cactus/integration/eclipse/src/java/org/apache/cactus/eclipse/launcher/WarBuilder.java
Index: WarBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/eclipse/src/java/org/apache/cactus/eclipse/launcher/WarBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WarBuilder.java 26 Feb 2003 18:06:26 -0000 1.4
+++ WarBuilder.java 27 Feb 2003 11:00:20 -0000 1.5
@@ -63,6 +63,7 @@
import org.apache.cactus.eclipse.ui.CactusMessages;
import org.apache.cactus.eclipse.ui.CactusPlugin;
+import org.apache.cactus.eclipse.ui.CactusPreferences;
import org.eclipse.ant.core.AntRunner;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -111,17 +112,15 @@
/**
* User's project relative path to the web directory
*/
- private static final String USER_WEB_FILES_PATH = "web";
+ private String userWebFilesPath = CactusPreferences.getWebappDir();
/**
* User's project relative path to the web.xml file
*/
- private static final String USER_WEB_XML_PATH =
- USER_WEB_FILES_PATH + "/WEB-INF/web.xml";
+ private String userWebXMLPath = userWebFilesPath + "/WEB-INF/web.xml";
/**
* User's project relative path to the lib directory
*/
- private static final String USER_JAR_FILES_PATH =
- USER_WEB_FILES_PATH + "/WEB-INF/lib";
+ private String userJarFilesPath = userWebFilesPath + "/WEB-INF/lib";
/**
* Constructor.
* @param theBuildFileLocation the build file for war creation
@@ -167,7 +166,7 @@
projectPath.removeLastSegments(1).append(
theJavaProject.getOutputLocation());
userClassFilesDir = classFilesPath.toFile();
- userWebXML = projectPath.append(USER_WEB_XML_PATH).toFile();
+ userWebXML = projectPath.append(userWebXMLPath).toFile();
if (!userWebXML.exists())
{
URL webXMLURL = thePlugin.find(new Path(WEB_XML_PATH));
@@ -181,9 +180,9 @@
}
userWebXML = new File(webXMLURL.getPath());
}
- userJarFilesDir = projectPath.append(USER_JAR_FILES_PATH).toFile();
+ userJarFilesDir = projectPath.append(userJarFilesPath).toFile();
// copy any web folder situated in the user's project
- userWebFilesDir = projectPath.append(USER_WEB_FILES_PATH).toFile();
+ userWebFilesDir = projectPath.append(userWebFilesPath).toFile();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
