From 78c8999f9a783aba84e1d84ce2b297427f1a0024 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 29 Mar 2003 12:23:05 +0000
Subject: [PATCH] Added support for specifying a specific jboss server
 configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113217 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/plugin.jelly         |  5 +++++
 cactus/plugin.properties    |  6 ++++++
 cactus/project.properties   |  2 +-
 cactus/project.xml          |  2 +-
 cactus/xdocs/properties.xml | 35 +++++++++++++++++++++++++++++++++--
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index f2089a8c..f0e08650 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -110,6 +110,11 @@
           <property name="cactus.src.includes" value="${cactus.src.includes}"/>
           <property name="cactus.src.excludes" value="${cactus.src.excludes}"/>
           <property name="cactus.context" value="${cactus.context}"/>
+
+          <property name="cactus.jboss3x.config.dir" 
+            value="${cactus.jboss3x.config.dir}"/>
+          <property name="cactus.jboss3x.config.name" 
+            value="${cactus.jboss3x.config.name}"/>
         </ant>
 
         <j:set var="containerFound" value="true"/>
diff --git a/cactus/plugin.properties b/cactus/plugin.properties
index 5ec81c66..4d12560f 100644
--- a/cactus/plugin.properties
+++ b/cactus/plugin.properties
@@ -36,3 +36,9 @@ cactus.junit.usefile = false
 
 # Location of junit test reports for the Cactus tests
 cactus.reports.dir = ${cactus.target.dir}/test-cactus-reports
+
+# Location of the JBoss server configuration directory.
+cactus.jboss3x.config.dir = ${cactus.home.jboss3x}/server
+
+# Name of the JBoss server configuration to use
+cactus.jboss3x.config.name = default
diff --git a/cactus/project.properties b/cactus/project.properties
index befad1fb..6ee2e5c3 100644
--- a/cactus/project.properties
+++ b/cactus/project.properties
@@ -12,6 +12,6 @@ maven.license.licenseFile=${basedir}/../../../LICENSE.txt
 # mechanism is finalized.
 
 maven.cactus.artifacts.zips.dir = ${maven.repo.local}/cactus/zips
-maven.cactus.antintegration.version = 13-1.5dev-20030325
+maven.cactus.antintegration.version = 13-1.5dev-20030329
 maven.cactus.antintegration.name = jakarta-cactus-integration-ant-${maven.cactus.antintegration.version}
 maven.cactus.antintegration.zip = ${maven.cactus.artifacts.zips.dir}/${maven.cactus.antintegration.name}.zip
diff --git a/cactus/project.xml b/cactus/project.xml
index 4fc99951..81fa4bdb 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>cactus</groupId>
       <artifactId>jakarta-cactus-integration-ant</artifactId>
-      <version>13-1.5dev-20030325</version>
+      <version>13-1.5dev-20030329</version>
       <type>zip</type>
     </dependency>
  
diff --git a/cactus/xdocs/properties.xml b/cactus/xdocs/properties.xml
index 0972bb8f..62fb49b2 100644
--- a/cactus/xdocs/properties.xml
+++ b/cactus/xdocs/properties.xml
@@ -2,11 +2,11 @@
 
 <document>
   <properties>
-    <title>cactus Properties</title>
+    <title>Cactus Properties</title>
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
-    <section name="cactus Settings">
+    <section name="Cactus Settings">
       <table>
         <tr>
           <th>Property</th>
@@ -141,5 +141,36 @@
         </tr>
       </table>
     </section>
+
+    <section name="Cactus/JBoss Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.config.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location of the JBoss server configuration directory.
+              Default value is <code>${cactus.home.jboss3x}</code>.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td>cactus.jboss3x.config.name</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Name of the JBoss server configuration to use.
+              Default value is <code>default</code>.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </section>
+    
   </body>
 </document>
\ No newline at end of file