Author: ptahchiev
Date: Tue Jan 22 08:39:16 2008
New Revision: 614248
URL: http://svn.apache.org/viewvc?rev=614248&view=rev
Log:
added the jxr reporting in the central pom
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml?rev=614248&r1=614247&r2=614248&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
Tue Jan 22 08:39:16 2008
@@ -46,7 +46,6 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=614248&r1=614247&r2=614248&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Tue Jan 22 08:39:16
2008
@@ -174,10 +174,10 @@
<plugin>
<artifactId>maven-clover-plugin</artifactId>
</plugin>
- <plugin>
- <!--groupId>org.apache.maven.plugins</groupId-->
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- </plugin>
+ </plugin-->
</plugins>
</reporting>
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=614248&r1=614247&r2=614248&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties Tue
Jan 22 08:39:16 2008
@@ -11,18 +11,24 @@
#Project Specific Settings
#cactus.samples.servlet-1.8.0-SNAPSHOT.war
-project.name=samples-servlet-1.8.0-SNAPSHOT
-archive.name=${target.dir}/${project.name}.${cactus.sample.archive.type}
-cactified.archive.name=${target.dir}/${project.name}-cactified.${cactus.sample.archive.type}
+
+servlet.project.name=samples-servlet-1.8.0-SNAPSHOT
+ejb.project.name=samples-ejb-1.8.0-SNAPSHOT
+
+servlet.archive.name=${target.dir}/${servlet.project.name}.${cactus.sample.archive.type}
+ejb.archive.name=${target.dir}/${ejb.project.name}.${cactus.sample.archive.type}
+
+cactified.servlet.archive.name=${target.dir}/${servlet.project.name}-cactified.${cactus.sample.archive.type}
+cactified.ejb.archive.name=${target.dir}/${ejb.project.name}-cactified.${cactus.sample.archive.type}
#Maven Repository
maven.repo=/home/peter/.m2/repository
#Container settings
-tomcat.container.home=C:/apache/tomcat/apache-tomcat-6.0.14
+tomcat.container.home=/home/peter/bin/apache/apache-tomcat-6.0.9
tomcat.container.id=tomcat5x
-jboss.container.home=C:/jboss/jboss-4.0.2
+jboss.container.home=/home/peter/bin/jboss/jboss-4.0.2
jboss.container.id=jboss4x
logs.dir=${target.dir}/logs
cactus.formatter.type=xml
@@ -31,4 +37,4 @@
reports.dir=${basedir}/target/reports
#Ivy properties
-ivy.lib.dir=${basedir}/target/lib
+ivy.lib.dir=${basedir}/target/lib
\ No newline at end of file
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml?rev=614248&r1=614247&r2=614248&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Tue Jan 22
08:39:16 2008
@@ -36,8 +36,8 @@
</dependency>
</dependencies>
<modules>
- <module>samples-ejb</module>
- <module>samples-servlet</module>
+ <module>samples-servlet</module>
+ <module>samples-ejb</module>
</modules>
</project>
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=614248&r1=614247&r2=614248&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
Tue Jan 22 08:39:16 2008
@@ -85,7 +85,7 @@
<target name="package-war" depends="compile"
description="Generate the runtime war file.">
- <war destfile="${target.dir}/${project.name}.war"
+ <war destfile="${target.dir}/${ejb.project.name}.war"
webxml="${basedir}/src/main/webapp/WEB-INF/web.xml"/>
</target>
@@ -100,7 +100,7 @@
<!-- ATM, only support containers which do not need an ejb compilation
step. For example: JBoss -->
- <jar jarfile="${target.dir}/${project.name}.jar">
+ <jar jarfile="${target.dir}/${ejb.project.name}.jar">
<fileset dir="${build.dir}"/>
<metainf dir="${meta.inf.dir}"/>
</jar>
@@ -115,9 +115,9 @@
<target name="package-ear" depends="ejb"
description="Generate the runtime ear">
- <ear earfile="${archive.name}"
+ <ear earfile="${ejb.archive.name}"
appxml="${src.application.dir}/application.xml">
- <fileset file="${target.dir}/${project.name}.jar"/>
+ <fileset file="${target.dir}/${ejb.project.name}.jar"/>
</ear>
</target>
@@ -127,9 +127,9 @@
========================================================================
-->
<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"
+ <cactifyear srcfile="${ejb.archive.name}"
destfile="${cactified.ejb.archive.name}">
+ <cactuswar srcfile="${target.dir}/${ejb.project.name}.war"
+ destfile="${target.dir}/${ejb.project.name}-cactified.war"
mergewebxml="${src.webapp.dir}/WEB-INF/cactus-web.xml"
context="/">
<classes dir="${build.dir}">
@@ -147,7 +147,7 @@
-->
<target name="test" depends="cactifyear">
- <cactus earfile="${cactified.archive.name}"
+ <cactus earfile="${cactified.ejb.archive.name}"
printsummary="yes">
<classpath>
<path refid="cactus.classpath"/>
@@ -160,7 +160,7 @@
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
- <deployable
type="${cactus.sample.archive.type}" file="${cactified.archive.name}"/>
+ <deployable
type="${cactus.sample.archive.type}" file="${cactified.ejb.archive.name}"/>
</configuration>
</cargo>
</containerset>
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=614248&r1=614247&r2=614248&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
Tue Jan 22 08:39:16 2008
@@ -85,7 +85,7 @@
========================================================================
-->
<target name="package-war" depends="compile">
- <war destfile="${archive.name}"
webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
+ <war destfile="${servlet.archive.name}"
webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
<fileset dir="${basedir}/src/main/webapp/WEB-INF">
<exclude name="cactus-report.xsl"/>
<exclude name="cactus-web.xml"/>
@@ -110,10 +110,10 @@
========================================================================
-->
<target name="cactifywar" depends="package-war">
- <cactifywar srcfile="${archive.name}"
destfile="${cactified.archive.name}"
mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml"/>
+ <cactifywar srcfile="${servlet.archive.name}"
destfile="${cactified.servlet.archive.name}"
mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml"/>
- <cactifywar srcfile="${archive.name}"
- destfile="${cactified.archive.name}"
+ <cactifywar srcfile="${servlet.archive.name}"
+ destfile="${cactified.servlet.archive.name}"
mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml">
<classes dir="${build.dir}"/>
<!-- Provide a secured servlet redirector in addition to the
@@ -143,7 +143,7 @@
========================================================================
-->
<target name="test" depends="cactifywar">
- <cactus warfile="${cactified.archive.name}"
+ <cactus warfile="${cactified.servlet.archive.name}"
printsummary="yes">
<classpath>
<path refid="cactus.classpath"/>
@@ -155,7 +155,7 @@
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
- <deployable
type="${cactus.sample.archive.type}" file="${cactified.archive.name}"/>
+ <deployable
type="${cactus.sample.archive.type}" file="${cactified.servlet.archive.name}"/>
</configuration>
</cargo>
</containerset>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
