You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2004/01/15 12:29:54 UTC
cvs commit: jakarta-cactus/integration/maven/samples/ejb/src/ejb ejb-jar.xml
vmassol 2004/01/15 03:29:54
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs properties.xml
Added: integration/maven/samples/ejb/src/ejb/META-INF ejb-jar.xml
Removed: integration/maven/samples/ejb/src/ejb ejb-jar.xml
Log:
- created new cactus.src.ejb property that points to where the ejb to test is located
- fixed ejb sample (ejb-jar.xml was in the wrong location)
- fixed typo in properties doc
Revision Changes Path
1.11 +3 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 14 Jan 2004 18:56:32 -0000 1.10
+++ plugin.properties 15 Jan 2004 11:29:54 -0000 1.11
@@ -59,6 +59,9 @@
# Default location of war to cactify
cactus.src.war = ${maven.build.dir}/${pom.artifactId}.war
+# Default location of the EJB to test (for the test-ear goal only)
+cactus.src.ejb = ${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar
+
# Goal that Cactus should call for generating the ejb artifact
cactus.build.goal.ejb = ejb:ejb
1.14 +4 -4 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 14 Jan 2004 18:56:32 -0000 1.13
+++ plugin.jelly 15 Jan 2004 11:29:54 -0000 1.14
@@ -77,7 +77,10 @@
<ant:dirname property="cactus.war.dir" file="${cactus.war}"/>
<ant:basename property="cactus.war.name" file="${cactus.war}"/>
-
+
+ <ant:dirname property="cactus.ejb.dir" file="${cactus.src.ejb}"/>
+ <ant:basename property="cactus.ejb.name" file="${cactus.src.ejb}"/>
+
<j:set var="cactus.ear"
value="${maven.build.dir}/${pom.artifactId}-cactus.ear"/>
@@ -992,9 +995,6 @@
========================================================================
-->
<goal name="cactus:generate-ear-descriptor" prereqs="cactus:init">
-
- <j:set var="cactus.ejb.dir" value="${maven.build.dir}"/>
- <j:set var="cactus.ejb.name" value="${maven.final.name}.jar"/>
<mkdir dir="${maven.build.dir}"/>
1.1 jakarta-cactus/integration/maven/samples/ejb/src/ejb/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ejb-jar PUBLIC
'-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN'
'http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd'>
<ejb-jar>
<display-name>cactus-sample-ejb</display-name>
<enterprise-beans>
<session>
<description>Converter Session Bean</description>
<display-name>Converter</display-name>
<ejb-name>Converter</ejb-name>
<home>org.apache.cactus.sample.ejb.ConverterHome</home>
<remote>org.apache.cactus.sample.ejb.Converter</remote>
<ejb-class>org.apache.cactus.sample.ejb.ConverterEJB</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
<method>
<ejb-name>Converter</ejb-name>
<method-intf>Remote</method-intf>
<method-name>*</method-name>
</method>
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
</ejb-jar>
1.14 +12 -1 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- properties.xml 14 Jan 2004 18:56:32 -0000 1.13
+++ properties.xml 15 Jan 2004 11:29:54 -0000 1.14
@@ -167,12 +167,23 @@
</td>
</tr>
<tr>
- <td>cactus.war</td>
+ <td>cactus.src.war</td>
<td>Yes</td>
<td>
<p>
Location of war to cactify. Defaults to
<code>${maven.build.dir}/${pom.artifactId}.war</code>.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>cactus.src.ejb</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Location of the EJB to test (for the test-ear goal only).
+ Defaults to
+ <code>${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar</code>.
</p>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org