myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arobinso...@apache.org
Subject svn commit: r746083 - /myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java
Date Fri, 20 Feb 2009 01:13:42 GMT
Author: arobinson74
Date: Fri Feb 20 01:13:42 2009
New Revision: 746083

URL: http://svn.apache.org/viewvc?rev=746083&view=rev
Log:
Applying a second patch from Gary

Modified:
    myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java

Modified: myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java?rev=746083&r1=746082&r2=746083&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java
(original)
+++ myfaces/trinidad-maven/branches/gkind-1.2.8.1-branch/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/JDeveloperMojo.java
Fri Feb 20 01:13:42 2009
@@ -496,13 +496,15 @@
       boolean projHasTests = false;
 
       // Added in V11
-      if (_releaseMajor < 11)
+      if (_releaseMajor >= 11)
       {
         Properties props = collectedProject.getProperties();
         String hasTests = (String)props.get(_PROPERTY_HAS_TESTS);
         projHasTests = "true".equalsIgnoreCase(hasTests);
       }
-      
+
+      getLog().info("projHasTests is " + Boolean.valueOf(projHasTests).toString());
+
       // if a child project is also a workspace, then don't 
       // put it in the .jws file.  It will have its own .jws
       // file.
@@ -519,10 +521,13 @@
         ** In V11, we don't create a <projname>-test.jpr if 
         ** a project does not have any tests.
         */
-        if ( (_releaseMajor >= 11) && projHasTests)
+        if (_releaseMajor >= 11)
         {
-          targetDOM.addChild(createProjectReferenceDOM(workspaceDir, 
-                                                       testProjectFile));
+          if (projHasTests)
+          {
+            targetDOM.addChild(createProjectReferenceDOM(workspaceDir, 
+                                                         testProjectFile));
+          }
         }
         else
         {
@@ -1819,6 +1824,7 @@
       // Default release is currently 10.x
       _releaseMajor = 10;
     }
+    getLog().info("releaseMajor is " + Integer.valueOf(_releaseMajor).toString());
   }
 
   private int     _releaseMajor = 0;



Mime
View raw message