diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-03 17:34:31 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-03 17:34:31 +0000 |
commit | 6d5ba3b358e9f00d2b1b5843a3d14730d6fcd922 (patch) | |
tree | 1c048d289e1d75869f2bd37171a4cf81ac82f0e2 /java/sca/tools/maven/maven-eclipse-compiler | |
parent | 71822db13f4477a95753eeb5964d6c84d5ff0224 (diff) |
Bypass the osgi resolution for test-compile
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@740355 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/tools/maven/maven-eclipse-compiler')
-rw-r--r-- | java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java b/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java index f522ca291a..e2a9143b43 100644 --- a/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java +++ b/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java @@ -162,15 +162,19 @@ public class JavaCompiler extends AbstractCompiler { // getLogger().info(configuration.getCustomCompilerArguments().toString()); boolean osgi = "true".equals(configuration.getCustomCompilerArguments().get("-osgi")); File proj = new File(configuration.getOutputLocation()); + String symbol = null; try { - symbol = BundleUtil.getBundleSymbolicName(proj); + // Don't trigger the resolution for test-compile + if (!"test-classes".equals(proj.getName())) { + symbol = BundleUtil.getBundleSymbolicName(proj); + } } catch (IOException e1) { symbol = null; } if (osgi && symbol != null) { - getLogger().info("Resolving OSGi bundles"); + getLogger().info("Resolving OSGi bundle: "+symbol); for (String entry : (List<String>)configuration.getClasspathEntries()) { try { File cp = new File(entry); |