vmassol 2003/03/29 04:23:05
Modified: src/plugins-build/cactus project.xml project.properties
plugin.properties plugin.jelly
src/plugins-build/cactus/xdocs properties.xml
Log:
Added support for specifying a specific jboss server configuration
Revision Changes Path
1.17 +1 -1 maven/src/plugins-build/cactus/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 25 Mar 2003 19:47:33 -0000 1.16
+++ project.xml 29 Mar 2003 12:23:05 -0000 1.17
@@ -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>
1.6 +1 -1 maven/src/plugins-build/cactus/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 25 Mar 2003 19:47:33 -0000 1.5
+++ project.properties 29 Mar 2003 12:23:05 -0000 1.6
@@ -12,6 +12,6 @@
# 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
1.7 +6 -0 maven/src/plugins-build/cactus/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 23 Mar 2003 12:54:59 -0000 1.6
+++ plugin.properties 29 Mar 2003 12:23:05 -0000 1.7
@@ -36,3 +36,9 @@
# 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
1.12 +5 -0 maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 25 Mar 2003 19:47:33 -0000 1.11
+++ plugin.jelly 29 Mar 2003 12:23:05 -0000 1.12
@@ -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"/>
1.6 +33 -2 maven/src/plugins-build/cactus/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 23 Mar 2003 21:32:17 -0000 1.5
+++ properties.xml 29 Mar 2003 12:23:05 -0000 1.6
@@ -2,11 +2,11 @@
<document>
<properties>
- <title>cactus Properties</title>
+ <title>Cactus Properties</title>
<author email="[EMAIL PROTECTED]">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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
