Author: bdaw Date: 2008-01-02 10:56:01 -0500 (Wed, 02 Jan 2008) New Revision: 9409 Modified: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/TestsType.java modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java Log: jpda fix and classpath building changes Modified: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/TestsType.java =================================================================== --- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/TestsType.java 2007-12-30 00:47:52 UTC (rev 9408) +++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/TestsType.java 2008-01-02 15:56:01 UTC (rev 9409) @@ -141,6 +141,11 @@ { javaBuilder.setConfig(config); + if (isJpda()) + { + javaBuilder.setJPDA(true); + } + if (getSuiteName() != null) { javaBuilder.setSuiteName(getSuiteName()); Modified: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java =================================================================== --- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java 2007-12-30 00:47:52 UTC (rev 9408) +++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java 2008-01-02 15:56:01 UTC (rev 9409) @@ -83,7 +83,7 @@ // This is really stupid workaround to the fact that maven eats whole output of invoked java task. // Should be investigated and fixed in more proper way ... - + javaTask.setFork(true); File log = File.createTempFile("jboss-unit-" + System.currentTimeMillis(), "log"); @@ -135,50 +135,42 @@ // System.out.println("Creating classpath: "); - for (Artifact artifact : (Collection<Artifact>)project.getCompileArtifacts()) - { - System.out.println("Compile Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); - path.createPathElement().setLocation(artifact.getFile()); - } - - for (Artifact artifact : (Collection<Artifact>)project.getTestArtifacts()) - { -// System.out.println("Test Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); - path.createPathElement().setLocation(artifact.getFile()); - } - - for (Artifact artifact : (Collection<Artifact>)project.getRuntimeArtifacts()) - { -// System.out.println("Runtime Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); - path.createPathElement().setLocation(artifact.getFile()); - } - - for (Artifact artifact : (Collection<Artifact>)project.getSystemArtifacts()) - { -// System.out.println("System Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); - path.createPathElement().setLocation(artifact.getFile()); - } - - for (Artifact artifact : (Collection<Artifact>)project.getDependencyArtifacts()) - { -// System.out.println("Dependency Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); - path.createPathElement().setLocation(artifact.getFile()); - } - - // getSystemPath returns null... -// for (Dependency dependency : (List<Dependency>)project.getTestDependencies()) +// for (Artifact artifact : (Collection<Artifact>)project.getCompileArtifacts()) // { -// path.createPathElement().setLocation(new File(dependency.getSystemPath())); +// System.out.println("Compile Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); +// path.createPathElement().setLocation(artifact.getFile()); // } +// +// for (Artifact artifact : (Collection<Artifact>)project.getTestArtifacts()) +// { +//// System.out.println("Test Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); +// path.createPathElement().setLocation(artifact.getFile()); +// } +// +// for (Artifact artifact : (Collection<Artifact>)project.getRuntimeArtifacts()) +// { +//// System.out.println("Runtime Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); +// path.createPathElement().setLocation(artifact.getFile()); +// } +// +// for (Artifact artifact : (Collection<Artifact>)project.getSystemArtifacts()) +// { +//// System.out.println("System Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); +// path.createPathElement().setLocation(artifact.getFile()); +// } +// +// for (Artifact artifact : (Collection<Artifact>)project.getDependencyArtifacts()) +// { +//// System.out.println("Dependency Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId()); +// path.createPathElement().setLocation(artifact.getFile()); +// } +// +// for (Resource resource : (Collection<Resource>)project.getTestResources()) +// { +//// System.out.println("Test Resource: " + resource.getDirectory()); +// path.createPathElement().setLocation(new File(resource.getDirectory())); +// } - - - for (Resource resource : (Collection<Resource>)project.getTestResources()) - { -// System.out.println("Test Resource: " + resource.getDirectory()); - path.createPathElement().setLocation(new File(resource.getDirectory())); - } - try { for (String element : (Collection<String>)project.getTestClasspathElements())