From e8a6b9c745856d3934d1f17a77744a7c5c3048ae Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 8 Aug 2003 17:52:04 +0000
Subject: [PATCH]         Added new optional property
 <code>cactus.weblogic7x.beahome</code> to         configure the location of
 BEA HOME for the WebLogic 7.x container. It         is only needed if the BEA
 HOME location is not the parent         directory of
 <code>cactus.home.weblogic7x</code>.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113813 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/plugin.jelly         | 32 +++++++++++++++++++++++++++-----
 cactus/plugin.properties    |  8 +++++++-
 cactus/xdocs/changes.xml    |  6 ++++++
 cactus/xdocs/properties.xml | 36 ++++++++++++++++++++++++++++--------
 4 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index 0b62f3db..d9159733 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -65,6 +65,15 @@
       <j:set var="cactusSourcePresent" value="true"/>
     </util:available>
 
+  </goal>
+
+  <!--
+     ========================================================================
+       Preparations for executing the JUnit reports
+     ========================================================================
+  -->
+  <goal name="cactus:init-report">
+
     <!-- Prepare the directories for the JUnit reports -->
     <ant:mkdir dir="${cactus.reports.dir}"/>
     
@@ -218,7 +227,8 @@
        defined.
      ========================================================================
   -->
-  <goal name="cactus:test" prereqs="cactus:init,cactus:cactifywar"
+  <goal name="cactus:test" 
+  	  prereqs="cactus:init,cactus:init-report,cactus:cactifywar"
       description="Run all Cactus Test Cases">
 
     <cactus warfile="${maven.build.dir}/${pom.artifactId}-cactus.war" 
@@ -295,7 +305,11 @@
         <weblogic7x if="cactus.home.weblogic7x"
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
-            todir="${cactus.reports.dir}/weblogic7x"/>
+            todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+            <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+          </j:if> 
+        </weblogic7x>            
 
       </containerset>
       <ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
@@ -460,7 +474,11 @@
         <weblogic7x if="cactus.home.weblogic7x"
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
-            todir="${cactus.reports.dir}/weblogic7x"/>
+            todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+            <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+          </j:if> 
+        </weblogic7x>            
 
       </containerset>
       <ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
@@ -476,7 +494,7 @@
 	 ========================================================================
 	   Execute a Cactus tests on all containers which have been defined, 
 	   i.e. which have a ${cactus.home.[container name]} property
-	   defined.  Specify the matching tests with -Dmatch=FooTest
+	   defined.  Specify the matching tests with -Dtestmatch=FooTest
 	 ========================================================================
   -->
   <goal name="cactus:match" prereqs="cactus:init,cactus:cactifywar"
@@ -565,7 +583,11 @@
         <weblogic7x if="cactus.home.weblogic7x"
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
-            todir="${cactus.reports.dir}/weblogic7x"/>
+            todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+            <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+          </j:if> 
+        </weblogic7x>            
 
       </containerset>
       <ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
diff --git a/cactus/plugin.properties b/cactus/plugin.properties
index e82e3e22..bdbf9323 100644
--- a/cactus/plugin.properties
+++ b/cactus/plugin.properties
@@ -87,4 +87,10 @@ cactus.jboss3x.config.name = default
 
 # (optional). Tomcat 5.x directory to which the container will be installed for the tests.
 # By default the system temporary directory is used
-#cactus.tomcat5x.tmpdir = 
\ No newline at end of file
+#cactus.tomcat5x.tmpdir = 
+
+# (optional). Location of BEA HOME. If not specified it defaults to
+# the parent directory of cactus.home.weblogic7x
+#cactus.weblogic7x.beahome =
+
+
diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml
index 837f1ee7..604c20a9 100644
--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@@ -8,6 +8,12 @@
   <body>
 
     <release version="3.1" date="in CVS">
+      <action dev="vmassol" type="add">
+        Added new optional property <code>cactus.weblogic7x.beahome</code> to
+        configure the location of BEA HOME for the WebLogic 7.x container. It
+        is only needed if the BEA HOME location is not the parent 
+        directory of <code>cactus.home.weblogic7x</code>.
+      </action>
       <action dev="vmassol" type="add">
         Added back support for WebLogic 7.x (it had somehow been dropped
         when we moved to the new Cactus/Ant integration in version 3.0).
diff --git a/cactus/xdocs/properties.xml b/cactus/xdocs/properties.xml
index b954510f..696c595f 100644
--- a/cactus/xdocs/properties.xml
+++ b/cactus/xdocs/properties.xml
@@ -302,17 +302,37 @@
           </td>
         </tr>
         <tr>
-	  <td>cactus.tomcat5x.tmpdir</td>
-	  <td>Yes</td>
-	  <td>
-	    <p>
-	      Directory to which the container will be installed for the tests.
-	      By default the system temporary directory is used.
-	    </p>
-	  </td>
+          <td>cactus.tomcat5x.tmpdir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Directory to which the container will be installed for the tests.
+              By default the system temporary directory is used.
+            </p>
+          </td>
         </tr>        
       </table>
     </section>
 
+    <section name="Cactus/WebLogic 7.x Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.weblogic7x.beahome</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of BEA HOME. If not specified it defaults to
+              the parent directory of <code>cactus.home.weblogic7x</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+
   </body>
 </document>
\ No newline at end of file