Author: ptahchiev
Date: Wed Jan 16 05:42:24 2008
New Revision: 612451
URL: http://svn.apache.org/viewvc?rev=612451&view=rev
Log:
cosmetic changes regarding xref and other reporting
Removed:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/project.xml
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml Wed Jan 16
05:42:24 2008
@@ -204,28 +204,28 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <phase>site:run</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>src/site/news</dir>
-
<stylesheet>src/site/stylesheets/rdf2document.xsl</stylesheet>
- <outputDir>src/site/xdoc/</outputDir>
- </transformationSet>
- </transformationSets>
- <extension>xml</extension>
- </configuration>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <phase>site:run</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>src/site/news</dir>
+
<stylesheet>src/site/stylesheets/rdf2document.xsl</stylesheet>
+ <outputDir>src/site/xdoc/</outputDir>
+ </transformationSet>
+ </transformationSets>
+ <extension>xml</extension>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
Wed Jan 16 05:42:24 2008
@@ -34,11 +34,6 @@
<version>2.2</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.5.2a</version>
- </dependency>
</dependencies>
<build>
<plugins>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
Wed Jan 16 05:42:24 2008
@@ -45,7 +45,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration>
-
<descriptor>src/assemble/main.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
Wed Jan 16 05:42:24 2008
@@ -45,7 +45,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration>
-
<descriptor>src/assemble/main.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
Wed Jan 16 05:42:24 2008
@@ -45,7 +45,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration>
-
<descriptor>src/assemble/main.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
Wed Jan 16 05:42:24 2008
@@ -42,7 +42,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration>
-
<descriptor>src/assemble/main.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml Wed Jan 16
05:42:24 2008
@@ -75,12 +75,11 @@
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.5.2a</version>
- </dependency>
+ <version>1.5.3</version>
+ </dependency>
</dependencies>
- <modules>
-
+ <modules>
<module>framework-12-13-14</module>
<module>framework-13-14</module>
<module>framework-wrappers</module>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
Wed Jan 16 05:42:24 2008
@@ -177,7 +177,7 @@
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
-
<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
+
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
Wed Jan 16 05:42:24 2008
@@ -16,7 +16,7 @@
<outputDirectory>lib/common</outputDirectory>
<includes>
<include>aspectj:aspectjrt:jar</include>
-
<include>org.apache.cactus:javaEE-14-uberjar:jar</include>
+
<include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>httpunit:httpunit:jar</include>
<include>junit:junit:jar</include>
@@ -27,7 +27,7 @@
<dependencySet>
<outputDirectory>lib/client</outputDirectory>
<includes>
-
<include>org.apache.cactus:integration-ant:jar</include>
+
<include>org.apache.cactus:cactus.integration.ant:jar</include>
<include>commons-httpclient:commons-httpclient:jar</include>
<include>javax.servlet:servlet-api:jar</include>
<include>nekohtml:nekohtml:jar</include>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=612451&r1=612450&r2=612451&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Wed Jan 16 05:42:24
2008
@@ -33,7 +33,7 @@
<!-- It may work with previous versions of Maven but this
hasn't been tested so for safety
we require Maven 2.0.4 -->
<maven>2.0.4</maven>
- </prerequisites>
+ </prerequisites>
<dependencyManagement>
<dependencies>
<!-- build time only - might want to use plugins for
this? -->
@@ -52,27 +52,26 @@
<artifactId>aspectjtools</artifactId>
<version>1.2.1</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo</artifactId>
<version>0.9</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ </dependency>
<dependency>
<groupId>checkstyle</groupId>
<artifactId>checkstyle</artifactId>
@@ -175,6 +174,10 @@
<plugin>
<artifactId>maven-clover-plugin</artifactId>
</plugin>
+ <plugin>
+ <!--groupId>org.apache.maven.plugins</groupId-->
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
@@ -190,9 +193,9 @@
</notifiers>
</ciManagement>
- <build>
- <pluginManagement>
- <plugins>
+ <build>
+ <pluginManagement>
+ <plugins>
<!-- Apply checkstyle rules and fail the build
in case of errors. The checkstyle config
files are taken from the build-tools JAR module
-->
<plugin>
@@ -239,11 +242,11 @@
<configuration>
<tagBase>http://svn.apache.org/repos/asf/jakarta/cactus/tags</tagBase>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
+ <version>2.3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
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=612451&r1=612450&r2=612451&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 05:42:24 2008
@@ -28,6 +28,48 @@
<name>Cactus Ejb Samples - Parent Project</name>
<description>Cactus Ejb Samples - the parent project</description>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.0.0-beta1</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
