[testedby] r207 committed - Updating boot classpath to new javassist artifact + adding xstream

[test...@googlecode.com]

Revision: 207
Author: alessio.soldano
Date: Sun Sep 19 07:40:48 2010
Log: Updating boot classpath to new javassist artifact + adding xstream

http://code.google.com/p/testedby/source/detail?r=207

Modified:

/plugins/maven/trunk/src/main/java/it/javalinux/testedby/plugins/TestedByMojo.java

/plugins/maven/trunk/src/test/resources/test-embedded/test1/invoker.properties

=======================================
---
/plugins/maven/trunk/src/main/java/it/javalinux/testedby/plugins/TestedByMojo.java
Fri Jan 8 04:07:17 2010
+++
/plugins/maven/trunk/src/main/java/it/javalinux/testedby/plugins/TestedByMojo.java
Sun Sep 19 07:40:48 2010
@@ -280,9 +280,10 @@
String testedByPluginJar =
getBuildPluginArtifactPath("it.javalinux.testedby.plugins", "maven-testedby-plugin");
String testedByJar =
getArtifactPath("it.javalinux.testedby", "TestedBy", null, "jar");
String junitJar = getArtifactPath("junit", "junit", null, "jar");
- String javassistJar = getArtifactPath("javassist", "javassist",
null, "jar");
-
- int res = invokeExecutor("java",
getExecutorArguments(testedByPluginJar, testedByJar, junitJar,
javassistJar, confFile.getCanonicalPath()));
+ String javassistJar = getArtifactPath("org.javassist", "javassist",
null, "jar");
+ String xStreamJar =
getArtifactPath("com.thoughtworks.xstream", "xstream", null, "jar");
+
+ int res = invokeExecutor("java", getExecutorArguments(testedByJar,
confFile.getCanonicalPath(), testedByPluginJar, junitJar, javassistJar,
xStreamJar));
if (res != 0) {
throw new MojoExecutionException("Error during TestedBy invocation,
child process returned value: " + res);
}
@@ -300,16 +301,14 @@
}
}

- private String[] getExecutorArguments(String testedByPluginJar, String
testedByJar, String junitJar, String javassistJar, String configPath) {
+ private String[] getExecutorArguments(String testedByJar, String
configPath, String... additionalBootCPJars) {
List<String> args = new LinkedList<String>();
StringBuilder bootCpArg = new StringBuilder("-Xbootclasspath/a:");
bootCpArg.append(testedByJar);
- bootCpArg.append(File.pathSeparator);
- bootCpArg.append(testedByPluginJar);
- bootCpArg.append(File.pathSeparator);
- bootCpArg.append(junitJar);
- bootCpArg.append(File.pathSeparator);
- bootCpArg.append(javassistJar);
+ for (String s : additionalBootCPJars) {
+ bootCpArg.append(File.pathSeparator);
+ bootCpArg.append(s);
+ }
List<String> cpElements = getTestClasspathElements();
if (cpElements != null && !cpElements.isEmpty()) {
for (Iterator<String> it = cpElements.iterator(); it.hasNext();) {
=======================================
---
/plugins/maven/trunk/src/test/resources/test-embedded/test1/invoker.properties
Wed Dec 9 12:35:33 2009
+++
/plugins/maven/trunk/src/test/resources/test-embedded/test1/invoker.properties
Sun Sep 19 07:40:48 2010
@@ -1,1 +1,1 @@
-invoker.goals = clean process-test-classes
+invoker.goals = -e clean process-test-classes