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/08 17:51:51 UTC
cvs commit: jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher CactusLaunchShortcut.java WarBuilder.java
jruaux 2003/01/08 08:51:51
Modified: Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher
CactusLaunchShortcut.java WarBuilder.java
Log:
Corrected code formatting
Revision Changes Path
1.19 +3 -3 jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher/CactusLaunchShortcut.java
Index: CactusLaunchShortcut.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/launcher/CactusLaunchShortcut.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CactusLaunchShortcut.java 8 Jan 2003 16:45:10 -0000 1.18
+++ CactusLaunchShortcut.java 8 Jan 2003 16:51:51 -0000 1.19
@@ -165,14 +165,14 @@
}
if (type != null)
{
- prepareCactusTests(type);
- JUnitPlugin.getDefault().addTestRunListener(this);
+ prepareCactusTests(type);
+ JUnitPlugin.getDefault().addTestRunListener(this);
super.launchType(theSearch, theMode);
}
}
/**
-
+
* @param theType test or test suite to launch
* @param theMode mode for launch configuration
*/
1.6 +15 -13 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WarBuilder.java 8 Jan 2003 16:09:51 -0000 1.5
+++ WarBuilder.java 8 Jan 2003 16:51:51 -0000 1.6
@@ -171,23 +171,24 @@
}
Vector arguments = new Vector();
String jarFilesPath = jarFilesDir.getAbsolutePath();
- arguments.add("-Djars.dir=" + jarFilesPath);
+ arguments.add("-Djars.dir=" + jarFilesPath);
String webXMLPath = webXML.getAbsolutePath();
- arguments.add("-Dwebxml.path=" + webXMLPath);
+ arguments.add("-Dwebxml.path=" + webXMLPath);
String classFilesPath = classFilesDir.getAbsolutePath();
- arguments.add("-Dclasses.dir=" + classFilesPath);
+ arguments.add("-Dclasses.dir=" + classFilesPath);
String warFilePath = testWar.getAbsolutePath();
arguments.add("-Dwar.path=" + warFilePath);
// If a web dir is present in the user's project
// we use it for the War file, otherwise we use a blank one
- boolean userWebExists = webFilesDir.exists();
- if (!userWebExists) {
- String tempPath = System.getProperty("java.io.tmpdir");
- webFilesDir = new File(tempPath,"web");
- webFilesDir.mkdir();
- }
- String webFilesPath = webFilesDir.getAbsolutePath();
- arguments.add("-Dwebfiles.dir=" + webFilesPath);
+ boolean userWebExists = webFilesDir.exists();
+ if (!userWebExists)
+ {
+ String tempPath = System.getProperty("java.io.tmpdir");
+ webFilesDir = new File(tempPath, "web");
+ webFilesDir.mkdir();
+ }
+ String webFilesPath = webFilesDir.getAbsolutePath();
+ arguments.add("-Dwebfiles.dir=" + webFilesPath);
String[] antArguments = (String[]) arguments.toArray(new String[0]);
AntRunner runner = new AntRunner();
runner.setBuildFileLocation(buildFileLocation.getAbsolutePath());
@@ -199,8 +200,9 @@
// Could not use deleteOnExit on this dir because the VM launched by
// Ant seems to be crashing when shut down by the 'stop' task
//
- if (!userWebExists) {
- webFilesDir.delete();
+ if (!userWebExists)
+ {
+ webFilesDir.delete();
}
return testWar;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>