From baabb661f65d53a4671a52fe938aca481e8ed141 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 30 Apr 2004 14:24:31 +0000
Subject: [PATCH] - Gracefully handle projects with no source - Fixed
 <versions> tag in POM + added new version for 1.4 version in HEAD

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115099 13f79535-47bb-0310-9956-ffa450edef68
---
 simian/plugin.jelly      | 39 ++++++++++++++++++++++++++-------------
 simian/project.xml       | 28 +++++++++++++++++++++-------
 simian/xdocs/changes.xml |  5 ++++-
 3 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/simian/plugin.jelly b/simian/plugin.jelly
index c3d340e9..97476c59 100644
--- a/simian/plugin.jelly
+++ b/simian/plugin.jelly
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <!--
  ! Maven plugin for Simian
  !
@@ -124,17 +124,23 @@
 
   </goal>
 
-  <goal name="maven-simian-plugin:report" prereqs="maven-simian-plugin:analyze">
-    <simian:simianLog
-      logFile="${maven.build.dir}/generated-xdocs/simian.log"
-      jellyContext="${context}"
-      sourceDirectory="${pom.build.sourceDirectory}"
-      unitTestSourceDirectory="${pom.build.unitTestSourceDirectory}"
-    />
-    <j:set var="simLog" value="${context.getVariable('simianLog')}"/>
+  <goal name="maven-simian-plugin:report">
+
+    <j:choose>
+      <j:when test="${sourcesPresent}">
+
+        <attainGoal name="maven-simian-plugin:analyze"/>
+        
+        <simian:simianLog
+          logFile="${maven.build.dir}/generated-xdocs/simian.log"
+          jellyContext="${context}"
+          sourceDirectory="${pom.build.sourceDirectory}"
+          unitTestSourceDirectory="${pom.build.unitTestSourceDirectory}"
+        />
+        <j:set var="simLog" value="${context.getVariable('simianLog')}"/>
     
-    <j:file name="${maven.build.dir}/generated-xdocs/simian-report.xml" prettyPrint="true">
-      <j:whitespace xmlns="dummy">
+        <j:file name="${maven.build.dir}/generated-xdocs/simian-report.xml" prettyPrint="true">
+          <j:whitespace xmlns="dummy">
 
 <document>
   <properties>
@@ -193,7 +199,14 @@
   </body>
 </document>
 
-      </j:whitespace>
-    </j:file>
+          </j:whitespace>
+        </j:file>
+        
+      </j:when>
+      <j:otherwise>
+        <ant:echo>No sources to run Simian on</ant:echo>
+      </j:otherwise>
+    </j:choose>
+    
   </goal>
 </project>
diff --git a/simian/project.xml b/simian/project.xml
index a8e3025e..6d56ba16 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -34,6 +34,18 @@
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/simian/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/simian/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.3</id>
+      <name>1.3</name>
+      <tag>MAVEN_SIMIAN_1_3</tag>
+    </version>
+    <version>
+      <id>1.4</id>
+      <name>1.4</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
   <dependencies>
     <dependency>
       <groupId>redhill</groupId>
@@ -88,6 +100,15 @@
         <role>Maven Plugin</role>
       </roles>
     </developer>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Maven Plugin</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
@@ -105,11 +126,4 @@
     <report>maven-javadoc-plugin</report>
     <report>maven-clover-plugin</report>
   </reports>
-  <versions>
-    <version>
-      <id>1.3</id>
-      <name>1.3</name>
-      <tag>MAVEN_SIMIAN_1_3</tag>
-    </version>
-  </versions>
 </project>
diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml
index 2176323f..87cd50c7 100644
--- a/simian/xdocs/changes.xml
+++ b/simian/xdocs/changes.xml
@@ -26,9 +26,12 @@
   </properties>
   <body>
     <release version="1.4" date="in CVS">
+      <action dev="vmassol" type="fix">
+        Gracefully inform users when the plugin is executed on a project
+        with no source.
+      </action>
       <action dev="dion" type="fix">Fix issues with DOM classes and jdk1.3</action>
     </release>
-    
     <release version="1.3" date="2004-03-10">
       <action dev="dion" type="fix">Apply MPSIMIAN-4. Fix HTML.</action>
       <action dev="epugh" type="add">Allow classes to be included/excluded.</action>
