Author: ptahchiev
Date: Wed Jan 16 04:43:43 2008
New Revision: 612436
URL: http://svn.apache.org/viewvc?rev=612436&view=rev
Log:
last changes on the samples sub module.
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties?rev=612436&r1=612435&r2=612436&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties Wed
Jan 16 04:43:43 2008
@@ -2,10 +2,12 @@
basedir=.
target.dir=${basedir}/target
build.dir=${target.dir}/classes
+cactus.build.dir=${target.dir}/cactus/
cactus.src.dir=${basedir}/src/main/cactus/
src.dir=${basedir}/src/main/java/
src.application.dir=${basedir}/src/main/app
meta.inf.dir=${basedir}/src/main/resources
+src.webapp.dir=${basedir}/src/main/webapp
#Project Specific Settings
#cactus.samples.servlet-1.8.0-SNAPSHOT.war
@@ -18,8 +20,10 @@
#Container settings
-container.home=C:/apache/tomcat/apache-tomcat-6.0.14
-container.id=tomcat5x
+tomcat.container.home=C:/apache/tomcat/apache-tomcat-6.0.14
+tomcat.container.id=tomcat5x
+jboss.container.home=C:/jboss/jboss-4.0.2
+jboss.container.id=jboss4x
logs.dir=${target.dir}/logs
cactus.formatter.type=xml
cargo.servlet.port=8080
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml?rev=612436&r1=612435&r2=612436&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
Wed Jan 16 04:43:43 2008
@@ -35,6 +35,7 @@
-->
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
+ <mkdir dir="${cactus.build.dir}"/>
<mkdir dir="${logs.dir}"/>
<mkdir dir="${reports.dir}"/>
</target>
@@ -74,9 +75,28 @@
classpathref="cactus.classpath"/>
<javac srcdir="${cactus.src.dir}"
- destdir="${build.dir}"
- classpathref="cactus.classpath"/>
+ destdir="${cactus.build.dir}">
+ <classpath>
+ <path refid="cactus.classpath"/>
+ <dirset dir="${build.dir}">
+ <include name="**"/>
+ </dirset>
+ </classpath>
+ </javac>
</target>
+
+ <!--
+ ========================================================================
+ Create the runtime ejb-jar file.
+ ========================================================================
+ -->
+ <target name="package-war" depends="compile"
+ description="Generate the runtime war file.">
+
+ <war destfile="${target.dir}/${project.name}.war"
+ webxml="${basedir}/src/main/webapp/WEB-INF/web.xml"/>
+
+ </target>
<!--
========================================================================
@@ -108,14 +128,33 @@
<fileset file="${target.dir}/${project.name}.jar"/>
</ear>
</target>
+
+ <target name="cactifywar" depends="package-war"
+ description="Cactifies the given war file.">
+ <!-- Cactify the web-app archive -->
+ <cactifywar srcfile="${target.dir}/${project.name}.war"
+ destfile="${target.dir}/${project.name}-cactified.war"
+ mergewebxml="${src.webapp.dir}/WEB-INF/cactus-web.xml">
+ <classes dir="${cactus.build.dir}"/>
+ </cactifywar>
+
+ </target>
<!--
========================================================================
Cactify the ready-made ear file.
========================================================================
-->
- <target name="cactifyear" depends="package-ear">
- <cactifyear srcfile="${archive.name}"
destfile="${cactified.archive.name}"/>
+ <target name="cactifyear" depends="package-ear, package-war">
+ <cactifyear srcfile="${archive.name}"
destfile="${cactified.archive.name}">
+ <cactuswar srcfile="${target.dir}/${project.name}.war"
+ destfile="${target.dir}/${project.name}-cactified.war"
+ mergewebxml="${src.webapp.dir}/WEB-INF/cactus-web.xml"
+ context="/">
+ <classes dir="${cactus.build.dir}"/>
+ </cactuswar>
+ </cactifyear>
+
</target>
<!--
@@ -130,9 +169,10 @@
<classpath>
<path refid="cactus.classpath"/>
<pathelement location="${build.dir}"/>
+ <pathelement location="${cactus.build.dir}"/>
</classpath>
<containerset>
- <cargo containerId="${container.id}"
home="${container.home}" output="${logs.dir}/output.log"
+ <cargo containerId="${jboss.container.id}"
home="${jboss.container.home}" output="${logs.dir}/output.log"
log="${logs.dir}/cargo.log">
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml?rev=612436&r1=612435&r2=612436&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
Wed Jan 16 04:43:43 2008
@@ -28,4 +28,31 @@
<name>Cactus Ejb Samples - Parent Project</name>
<description>Cactus Ejb Samples - the parent project</description>
<packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.0.0-beta1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <ant
antfile="build.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml?rev=612436&r1=612435&r2=612436&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
Wed Jan 16 04:43:43 2008
@@ -150,7 +150,7 @@
<pathelement location="${build.dir}"/>
</classpath>
<containerset>
- <cargo containerId="${container.id}"
home="${container.home}" output="${logs.dir}/output.log"
+ <cargo containerId="${jboss.container.id}"
home="${jboss.container.home}" output="${logs.dir}/output.log"
log="${logs.dir}/cargo.log">
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
