You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by jr...@apache.org on 2003/01/07 18:31:19 UTC
cvs commit: jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher WarBuilder.java
jruaux 2003/01/07 09:31:19
Modified: Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher
WarBuilder.java
Log:
added 'web' directory support in user's project
Revision Changes Path
1.4 +7 -2 jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher/WarBuilder.java
Index: WarBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher/WarBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WarBuilder.java 3 Jan 2003 15:50:32 -0000 1.3
+++ WarBuilder.java 7 Jan 2003 17:31:19 -0000 1.4
@@ -143,7 +143,8 @@
webXML =
new File(
thePlugin.find(new Path("./ant/conf/test/web.xml")).getPath());
- webFilesDir = new File(thePlugin.find(new Path("./ant/web")).getPath());
+ // copy any web folder situated in the user's project
+ webFilesDir = projectPath.append("web").toFile();
}
/**
@@ -178,7 +179,11 @@
arguments.add("-Dwebxml.path=" + webXMLPath);
arguments.add("-Dclasses.dir=" + classFilesPath);
arguments.add("-Djars.dir=" + jarFilesPath);
- arguments.add("-Dwebfiles.dir=" + webFilesPath);
+ // If a web dir is present in the user's project
+ // we add it to the War file
+ if (webFilesDir.exists()) {
+ arguments.add("-Dwebfiles.dir=" + webFilesPath);
+ }
String[] antArguments = (String[]) arguments.toArray(new String[0]);
AntRunner runner = new AntRunner();
runner.setBuildFileLocation(buildFileLocation.getAbsolutePath());
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>