svn commit: r603796 - in /incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin: AbstractBuildMojo.java IncrementalBuildMojo.java

[rfeng]

Author: rfeng
Date: Wed Dec 12 17:18:17 2007
New Revision: 603796

URL: http://svn.apache.org/viewvc?rev=603796&view=rev
Log:
Check if the pom.xml has been changed

Modified:
    
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/AbstractBuildMojo.java
    
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java

Modified: 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/AbstractBuildMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/AbstractBuildMojo.java?rev=603796&r1=603795&r2=603796&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/AbstractBuildMojo.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/AbstractBuildMojo.java
 Wed Dec 12 17:18:17 2007
@@ -157,6 +157,25 @@
         return new SimpleSourceInclusionScanner(includes, 
Collections.EMPTY_SET);
     }
 
+    protected boolean isPOMChanged() {
+        File pom = project.getFile();
+        File out = getOutputFile();
+        return pom.lastModified() > out.lastModified();
+    }
+
+    protected File getOutputFile() {
+        File basedir = buildDirectory;
+        String finalName = project.getBuild().getFinalName();
+        String classifier = project.getArtifact().getClassifier();
+        if (classifier == null) {
+            classifier = "";
+        } else if (classifier.trim().length() > 0 && 
!classifier.startsWith("-")) {
+            classifier = "-" + classifier;
+        }
+
+        return new File(basedir, finalName + classifier + "." + 
project.getArtifact().getType());
+    }
+
     /**
      * Test if the resources have been changed
      * @return
@@ -169,7 +188,7 @@
     protected boolean isTestResourceChanged() throws MojoExecutionException {
         return isChanged(project.getTestResources(), 
project.getBuild().getTestOutputDirectory());
     }
-    
+
     private static final String[] EMPTY_STRING_ARRAY = {};
 
     private static final String[] DEFAULT_INCLUDES = {"**/**"};

Modified: 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java?rev=603796&r1=603795&r2=603796&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
 Wed Dec 12 17:18:17 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.sca.tools.incremental.build.plugin;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -107,7 +106,7 @@
         String projectID = id(project);
 
         Compiler compiler = getCompiler();
-        boolean changed = isSourceChanged(compiler) || isResourceChanged();
+        boolean changed = isSourceChanged(compiler) || isResourceChanged() || 
isPOMChanged();
         boolean testChanged = false;
         if (changed) {
             modifiedProjectIDs.add(projectID);
@@ -170,7 +169,7 @@
             // request.setDebug(true);
             request.setOffline(settings.isOffline());
             request.setBaseDirectory(project.getBasedir());
-            request.setPomFile(new File(project.getBasedir().getPath() + 
"/pom.xml"));
+            request.setPomFile(project.getFile());
 
             try {
                 InvocationResult result = invoker.execute(request);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]