You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/02/03 18:34:32 UTC
svn commit: r740355 -
/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
Author: rfeng
Date: Tue Feb 3 17:34:31 2009
New Revision: 740355
URL: http://svn.apache.org/viewvc?rev=740355&view=rev
Log:
Bypass the osgi resolution for test-compile
Modified:
tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
Modified: tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java?rev=740355&r1=740354&r2=740355&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java (original)
+++ tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java Tue Feb 3 17:34:31 2009
@@ -162,15 +162,19 @@
// 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);