summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-03-31 08:22:19 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-03-31 08:22:19 +0000
commitfa85696d2754f0a7bccf919a885e9bee8a9b7e86 (patch)
tree350b16c6578495dfac3904f35e55f8d525765c08
parent15d305ea23f9a9e6266f9a2411b7f0c35c5fa9a2 (diff)
Update the approach to choosing what is the contribution so that a folder in the target directory named after the artifact or the target/classes folder is used over the packaged artifact. That means if you update a contribution project in an IDE like Eclipse the changes are still used even though eclipse doesn't rebuild teh jar
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1087210 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java b/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
index 5f84a95c52..d5cce76bc2 100644
--- a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
+++ b/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
@@ -151,8 +151,12 @@ public class TuscanyRunMojo extends AbstractMojo {
File contributionFile = new File(buildDirectory.getParent(), finalName.getName());
if (!contributionFile.exists()) {
+ contributionFile = new File(buildDirectory.getParent(), "classes");
+ }
+ if (!contributionFile.exists()) {
contributionFile = new File(buildDirectory.getParent(), finalName.getName() + packaging);
}
+
String contribution = contributionFile.toURI().toURL().toString();
getLog().info("Project contribution: " + contribution);
cs.add(contribution);