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 pt...@apache.org on 2008/01/15 16:24:44 UTC

svn commit: r612137 - in /jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH: ./ build-tools/ cactus-maven-skin/ cactus-site/ framework/ framework/framework-12-13-14/ framework/framework-13-14/ framework/framework-uberjars/ framework/framework-uberjars/javaE...

Author: ptahchiev
Date: Tue Jan 15 07:24:41 2008
New Revision: 612137

URL: http://svn.apache.org/viewvc?rev=612137&view=rev
Log:
changed the name of the artifacts so that they are more descriptive.

Added:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
Removed:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/ivy.xml
Modified:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml
    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-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-12-uberjar/src/assemble/main.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-13-uberjar/src/assemble/main.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-14-uberjar/src/assemble/main.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/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.webapp/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivy.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivysettings.xml
    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-ejb/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml Tue Jan 15 07:24:41 2008
@@ -24,7 +24,7 @@
 		<artifactId>cactus</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>build-tools</artifactId>
+	<artifactId>cactus.build.tools</artifactId>
 	<name>Cactus Build Tools</name>
 	<packaging>jar</packaging>
 	<description>Cactus Build Tools (like checkstyle configuration)</description>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml Tue Jan 15 07:24:41 2008
@@ -20,7 +20,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cactus</groupId>
-    <artifactId>cactus-maven-skin</artifactId>
+    <artifactId>cactus.maven.skin</artifactId>
     <version>2.0.0</version>
     <name>Cactus Site Skin</name>
     <description>Cactus Maven2 Site Skin</description>

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=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml Tue Jan 15 07:24:41 2008
@@ -19,8 +19,8 @@
 -->
 <project>
 	<parent>
-		<artifactId>cactus</artifactId>
 		<groupId>org.apache.cactus</groupId>
+    <artifactId>cactus</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -228,4 +228,4 @@
       		</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,12 +21,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework</artifactId>
+		<artifactId>cactus.core.framework</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Framework - shared all versions</name>
 	<description>Shared classes of Cactus Framework for all Java EE</description>
-	<artifactId>framework-12-13-14</artifactId>
+	<artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -35,10 +35,10 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            		<groupId>aspectj</groupId>
-            		<artifactId>aspectjrt</artifactId>
-            		<version>1.5.2a</version>
-        	</dependency>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.5.2a</version>
+    </dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -54,16 +54,16 @@
 				</executions>
 			</plugin>
 			<plugin>
-                		<groupId>org.codehaus.mojo</groupId>
-                		<artifactId>aspectj-maven-plugin</artifactId>
-                		<executions>
-                    			<execution>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>aspectj-maven-plugin</artifactId>
+         <executions>
+           <execution>
 						<goals>
 							<goal>compile</goal>
 						</goals>
 					</execution>
 				</executions>
-           		</plugin>
+      </plugin>
 		</plugins>
 	</build>
 </project>

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=612137&r1=612136&r2=612137&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 15 07:24:41 2008
@@ -21,24 +21,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework</artifactId>
+		<artifactId>cactus.core.framework</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Framework - shared Java EE 1.3 and 1.4</name>
 	<description>Shared classes of Cactus Framework for Java EE 1.3 and 1.4</description>
-	<artifactId>framework-13-14</artifactId>
+	<artifactId>cactus.core.framework.javaEE.13-14</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-12-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
 			<version>${version}</version>
 			<scope>test</scope>
 			<type>test-jar</type>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-12-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
 			<version>${version}</version>
 			<type>jar</type>
 		</dependency>

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-uberjars</artifactId>
+		<artifactId>cactus.core.framework.uberjars</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>javaEE-12-uberjar</artifactId>
+	<artifactId>cactus.core.framework.uberjar.javaEE.12</artifactId>
 	<name>Cactus Uberjar - Java EE 1.2</name>
 	<description>Cactus Uberjar for Java EE 1.2</description>
 	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>wrapper-javaEE-12</artifactId>
+			<artifactId>cactus.core.framework.wrapper.javaEE.12</artifactId>
 			<version>${version}</version>
 		</dependency>
 	</dependencies>
@@ -58,4 +58,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml Tue Jan 15 07:24:41 2008
@@ -8,8 +8,8 @@
 			<outputDirectory>/</outputDirectory>
 			<outputFileNameMapping/>
 			<includes>
-				<include>org.apache.cactus:framework-12-13-14:jar</include>
-				<include>org.apache.cactus:wrapper-javaEE-12:jar</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14:jar</include>
+				<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.12:jar</include>
 			</includes>
 			<unpack>true</unpack>
 			<scope>test</scope>

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-uberjars</artifactId>
+		<artifactId>cactus.core.framework.uberjars</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>javaEE-13-uberjar</artifactId>
+	<artifactId>cactus.core.framework.uberjar.javaEE.13</artifactId>
 	<name>Cactus Uberjar - Java EE 1.3</name>
 	<description>Cactus Uberjar for Java EE 1.3</description>
 	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>wrapper-javaEE-13</artifactId>
+			<artifactId>cactus.core.framework.wrapper.javaEE.13</artifactId>
 			<version>${version}</version>
 		</dependency>
 	</dependencies>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml Tue Jan 15 07:24:41 2008
@@ -8,11 +8,10 @@
 			<outputDirectory>/</outputDirectory>
 			<outputFileNameMapping/>
 			<includes>
-				<include>org.apache.cactus:framework-12-13-14:jar</include>
-				<include>org.apache.cactus:framework-13-14</include>
-				<include>org.apache.cactus:wrapper-javaEE-13</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14:jar</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
+				<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.13</include>
 			</includes>
-
 			<unpack>true</unpack>
 			<scope>test</scope>
 		</dependencySet>

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-uberjars</artifactId>
+		<artifactId>cactus.core.framework.uberjars</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>javaEE-14-uberjar</artifactId>
+	<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
 	<name>Cactus Uberjar - Java EE 1.4</name>
 	<description>Cactus Uberjar for Java EE 1.4</description>
 	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>wrapper-javaEE-14</artifactId>
+			<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
 			<version>${version}</version>
 		</dependency>
 	</dependencies>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml Tue Jan 15 07:24:41 2008
@@ -8,11 +8,10 @@
 			<outputDirectory>/</outputDirectory>
 			<outputFileNameMapping/>
 			<includes>
-				<include>org.apache.cactus:framework-12-13-14</include>
-				<include>org.apache.cactus:framework-13-14</include>
-				<include>org.apache.cactus:wrapper-javaEE-14</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14:jar</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
+				<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.14</include>
 			</includes>
-
 			<unpack>true</unpack>
 			<scope>test</scope>
 		</dependencySet>

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-uberjars</artifactId>
+		<artifactId>cactus.core.framework.uberjars</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>javaEE-15-uberjar</artifactId>
+	<artifactId>cactus.core.framework.uberjar.javaEE.15</artifactId>
 	<name>Cactus Uberjar - Java EE 1.5</name>
 	<description>Cactus Uberjar for Java EE 1.5</description>
 	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>wrapper-javaEE-15</artifactId>
+			<artifactId>cactus.core.framework.wrapper.javaEE.15</artifactId>
 			<version>${version}</version>
 		</dependency>
 	</dependencies>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml Tue Jan 15 07:24:41 2008
@@ -8,9 +8,9 @@
 			<outputDirectory>/</outputDirectory>
 			<outputFileNameMapping/>
 			<includes>
-				<include>org.apache.cactus:framework-12-13-14:jar</include>
-				<include>org.apache.cactus:framework-13-14</include>
-				<include>org.apache.cactus:wrapper-javaEE-15</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14:jar</include>
+				<include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
+				<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.15</include>
 			</includes>
 
 			<unpack>true</unpack>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework</artifactId>
+		<artifactId>cactus.core.framework</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>framework-uberjars</artifactId>
+	<artifactId>cactus.core.framework.uberjars</artifactId>
 	<name>Cactus Uberjars - Parent Projcet</name>
 	<packaging>pom</packaging>
 	<modules>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,13 +21,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework</artifactId>
+		<artifactId>cactus.core.framework</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
-    <name>Cactus Wrappers - Parent Project</name>
+  <name>Cactus Wrappers - Parent Project</name>
 	<description>Parent project for Cactus wrapper projects</description>
-	<artifactId>framework-wrappers</artifactId>
+	<artifactId>cactus.core.framework.wrappers</artifactId>
 	<build>
 		<plugins>
   			<plugin>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,24 +21,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-wrappers</artifactId>
+		<artifactId>cactus.core.framework.wrappers</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>wrapper-javaEE-12</artifactId>
+	<artifactId>cactus.core.framework.wrapper.javaEE.12</artifactId>
 	<packaging>jar</packaging>
 	<name>Cactus Wrappers - Java EE 1.2</name>
 	<description>Cactus Wrappers and JSP redirector for Java EE 1.2</description>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-12-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
 			<version>${version}</version>
 			<scope>test</scope>
 			<type>test-jar</type>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-12-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,18 +21,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-    	<artifactId>framework-wrappers</artifactId>
-	<version>1.8.0-SNAPSHOT</version>
+    <artifactId>cactus.core.framework.wrappers</artifactId>
+	  <version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Wrappers - Java EE 1.3</name>
 	<description>Cactus Wrappers and JSP redirector for Java EE 1.3</description>
-	<artifactId>wrapper-javaEE-13</artifactId>
+	<artifactId>cactus.core.framework.wrapper.javaEE.13</artifactId>
 	<packaging>jar</packaging>
 	
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.13-14</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-wrappers</artifactId>
+		<artifactId>cactus.core.framework.wrappers</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Wrappers - Java EE 1.4</name>
 	<description>Cactus Wrappers and JSP redirector for Java EE 1.4</description>
-	<artifactId>wrapper-javaEE-14</artifactId>
+	<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.13-14</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<!--  TODO: change versions below -->
@@ -65,7 +65,7 @@
 							<goal>compile</goal>
 						</goals>
 					</execution>
-               			</executions>
+        </executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,17 +21,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>framework-wrappers</artifactId>
+		<artifactId>cactus.core.framework.wrappers</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Wrappers - Java EE 1.5</name>
 	<description>Cactus Wrappers and JSP redirector for Java EE 1.5</description>
-	<artifactId>wrapper-javaEE-15</artifactId>
+	<artifactId>cactus.core.framework.wrapper.javaEE.15</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>framework-13-14</artifactId>
+			<artifactId>cactus.core.framework.javaEE.13-14</artifactId>
 			<scope>compile</scope>
 			<version>${version}</version>
 		</dependency>
@@ -64,7 +64,7 @@
 							<goal>compile</goal>
 						</goals>
 					</execution>
-               			</executions>
+       </executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

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=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml Tue Jan 15 07:24:41 2008
@@ -24,10 +24,10 @@
 		<artifactId>cactus</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-    <name>Cactus Framework - Parent Project</name>
+  <name>Cactus Framework - Parent Project</name>
 	<description>Parent project for Cactus framework</description>
 	<packaging>pom</packaging>
-	<artifactId>framework</artifactId>
+	<artifactId>cactus.core.framework</artifactId>
 	<build>
 		<plugins>
   			<plugin>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration</artifactId>
+		<artifactId>cactus.integration</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>integration-ant</artifactId>
+	<artifactId>cactus.integration.ant</artifactId>
 	<name>Cactus Ant Integration</name>
 	<packaging>jar</packaging>
 	
@@ -52,7 +52,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>integration-shared-api</artifactId>
+			<artifactId>cactus.integration.shared.api</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -2,18 +2,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration-eclipse</artifactId>
+		<artifactId>cactus.integration.eclipse</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<name>Cactus Eclipse Integration - Webapp</name>
+	<name>Cactus Eclipse Integration - Runner</name>
 	<packaging>jar</packaging>
 	<artifactId>org.apache.cactus.eclipse.runner</artifactId>
   <dependencies>
-    <dependency>
+    <!--dependency>
         <groupId>ant</groupId>
         <artifactId>ant</artifactId>
         <version>1.6.5</version>
-    </dependency>
+    </dependency-->
     
     <dependency>
         <groupId>org.eclipse.jdt</groupId>
@@ -153,7 +153,7 @@
     
 		<dependency> 
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>cactus.eclipse.webapp.plugin</artifactId>
+			<artifactId>org.apache.cactus.eclipse.webapp</artifactId>
 			<version>1.8.0-SNAPSHOT</version>
 		</dependency>
 		
@@ -163,11 +163,11 @@
 			<version>[3.0.0,4.0.0)</version>
 		</dependency>
 
-		<dependency> 
+		<!--dependency> 
 			<groupId>org.eclipse.wst.xsd</groupId>
 			<artifactId>ui</artifactId>
 			<version>[1.0.0,2.0.0)</version>
-		</dependency>
+		</dependency-->
 		
 		<!-- Here start the dependencies that are included in the lib/common & lib/client folders -->
 		<dependency>
@@ -177,7 +177,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>javaEE-14-uberjar</artifactId>
+			<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
@@ -203,7 +203,7 @@
 		
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>integration-ant</artifactId>
+			<artifactId>cactus.integration.ant</artifactId>
 			<version>1.8.0-SNAPSHOT</version>
 		</dependency>	
 		<dependency>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml Tue Jan 15 07:24:41 2008
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration-eclipse</artifactId>
+		<artifactId>cactus.integration.eclipse</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
 	<name>Cactus Eclipse Integration - Webapp</name>
@@ -61,7 +61,7 @@
     <dependency>
         <groupId>org.eclipse.swt.win32.win32</groupId>
         <artifactId>x86</artifactId>
-        <version>[3.2.0,4.0)</version>
+        <version>[3.2.0,5.0)</version>
     </dependency>
     
     <dependency>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration</artifactId>
+		<artifactId>cactus.integration</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>integration-eclipse</artifactId>
+	<artifactId>cactus.integration.eclipse</artifactId>
 	<name>Cactus Eclipse Integration</name>
 	<packaging>pom</packaging>
 

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration</artifactId>
+		<artifactId>cactus.integration</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>cactus-maven1-plugin</artifactId>
+	<artifactId>cactus.maven1.plugin</artifactId>
 	<name>Cactus Maven 1 Plugin</name>
   <packaging>maven-one-plugin</packaging>
 	<dependencies>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,11 +21,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
    <groupId>org.apache.cactus</groupId>
-   <artifactId>integration</artifactId>
+   <artifactId>cactus.integration</artifactId>
    <version>1.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.cactus.integration.m2</groupId>
-  <artifactId>cactus-m2-plugin</artifactId>
+  <artifactId>cactus.m2.plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1.0-SNAPSHOT</version>
   <name>cactus-m2-plugin</name>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>integration</artifactId>
+		<artifactId>cactus.integration</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>integration-shared-api</artifactId>
+	<artifactId>cactus.integration.shared.api</artifactId>
 	<name>Cactus Shared API for the integration </name>
 	<packaging>jar</packaging>
 	

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml Tue Jan 15 07:24:41 2008
@@ -24,7 +24,7 @@
 		<artifactId>cactus</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>integration</artifactId>
+	<artifactId>cactus.integration</artifactId>
 	<name>Cactus Integration - Parent Project</name>
 	<packaging>pom</packaging>
 	<modules>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Tue Jan 15 07:24:41 2008
@@ -201,7 +201,7 @@
 					<dependencies>
 						<dependency>
 						<groupId>org.apache.cactus</groupId>
-						<artifactId>build-tools</artifactId>
+						<artifactId>cactus.build.tools</artifactId>
 						<version>${version}</version>
 						</dependency>
 					</dependencies>

Added: 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=612137&view=auto
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties (added)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties Tue Jan 15 07:24:41 2008
@@ -0,0 +1,29 @@
+#Here comes the directory properties.
+basedir=.
+target.dir=${basedir}/target
+build.dir=${target.dir}/classes
+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
+
+#Project Specific Settings
+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}
+
+#Maven Repository
+maven.repo=/home/peter/.m2/repository
+
+
+#Container settings
+container.home=C:/apache/tomcat/apache-tomcat-6.0.14
+container.id=tomcat5x
+logs.dir=${target.dir}/logs
+cactus.formatter.type=xml
+cargo.servlet.port=8080
+cargo.logging=high
+reports.dir=${basedir}/target/reports
+
+#Ivy properties
+ivy.lib.dir=${basedir}/target/lib

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.xml Tue Jan 15 07:24:41 2008
@@ -27,10 +27,10 @@
 		<property name="archive.name" value="${target.dir}/${project.name}.${cactus.sample.archive.type}"/>
 		<property name="cactified.archive.name" value="${target.dir}/${project.name}-cactified.${cactus.sample.archive.type}"/>
 		<property name="maven.repo" location="/home/peter/.m2/repository"/>
-		<property name="container.home" location="C:/caucho/resin-3.1.3"/>
+		<property name="container.home" location="C:/apache/tomcat/apache-tomcat-6.0.14"/>
 		<property name="logs.dir" location="${target.dir}/logs"/>
 		<property name="cactus.formatter.type" value="xml"/>
-		<property name="container.id" value="jboss4x"/>
+		<property name="container.id" value="tomcat5x"/>
 		<property name="cargo.servlet.port" value="8080"/>
 		<property name="cargo.logging" value="high"/>
 		
@@ -39,11 +39,13 @@
 		<property name="meta.inf.dir" value="${base.dir}/src/main/resources"/>
 		
 		<path id="cactus.classpath">
-			<fileset dir="${ivy.lib.dir}" includes="*.jar"/>
+			<fileset dir="${ivy.lib.dir}">
+        <include name="*.jar"/>
+      </fileset>
 		</path>
 		
 		<condition property="iswar">
-      <equals arg1="cactus.sample.archive.type" arg2="war"/>
+      <equals arg1="${cactus.sample.archive.type}" arg2="war"/>
     </condition>
 	</target>
 
@@ -66,7 +68,7 @@
 	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
 		<ivy:configure file="${basedir}/ivysettings.xml" />
 		<ivy:retrieve />
-    	</target>
+  </target>
 
  <!--
      ========================================================================
@@ -116,7 +118,7 @@
        Create the runtime ejb-jar file.
      ========================================================================
   -->
-  <target name="ejb" depends="compile"
+  <target name="ejb" depends="compile" unless="iswar"
       description="Generate the runtime ejb-jar">
 
     <!-- ATM, only support containers which do not need an ejb compilation
@@ -166,7 +168,9 @@
      ========================================================================
   -->
 	<target name="test" depends="cactifywar, cactifyear">
-		<cactus earfile="${cactified.archive.name}"
+	<echo>${cactified.archive.name}</echo>
+	
+		<cactus warfile="${cactified.archive.name}"
 			printsummary="yes">
 			<classpath>
 				<path refid="cactus.classpath"/>
@@ -178,7 +182,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="samples-ejb/target/cactus-sample-ejb-cactified.ear"/>
+						<deployable type="${cactus.sample.archive.type}" file="${cactified.archive.name}"/>
 					</configuration>
 				</cargo>
 			</containerset>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivy.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivy.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivy.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivy.xml Tue Jan 15 07:24:41 2008
@@ -5,9 +5,9 @@
 		<!--dependency org="commons-lang" name="commons-lang" rev="2.0"/>
 		<dependency org="commons-cli" name="commons-cli" rev="1.0"/-->
 		
-		<dependency org="org.apache.cactus" name="javaEE-14-uberjar" rev="1.8.0-SNAPSHOT"/>
-		<dependency org="org.apache.cactus" name="integration-ant" rev="1.8.0-SNAPSHOT"/>
-		<dependency org="org.apache.cactus" name="integration-shared-api" rev="1.8.0-SNAPSHOT"/>
+		<dependency org="org.apache.cactus" name="cactus.core.framework.uberjar.javaEE.14" rev="1.8.0-SNAPSHOT"/>
+		<dependency org="org.apache.cactus" name="cactus.integration.ant" rev="1.8.0-SNAPSHOT"/>
+		<dependency org="org.apache.cactus" name="cactus.integration.shared.api" rev="1.8.0-SNAPSHOT"/>
 		
 		<dependency org="commons-httpclient" name="commons-httpclient" rev="2.0.2"/>
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4"/>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivysettings.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivysettings.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivysettings.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/ivysettings.xml Tue Jan 15 07:24:41 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <settings defaultResolver="local-maven2">
         <property name="local-maven2-pattern" value="file:${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]"
-        override="false" />
+        override="true" />
         <resolvers>
                 <url name="local-maven2" m2compatible="true">
                         <artifact pattern="${local-maven2-pattern}"/>

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=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Tue Jan 15 07:24:41 2008
@@ -24,7 +24,7 @@
 		<artifactId>cactus</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>samples</artifactId>
+	<artifactId>cactus.samples</artifactId>
 	<name>Cactus Samples - Parent Project</name>
 	<description>Cactus Sample Projects</description>
 	<packaging>pom</packaging>
@@ -39,47 +39,6 @@
     <module>samples-ejb</module>
     <module>samples-servlet</module>
   </modules>
-	<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>
-							<!--
-							    Place any ant task here. You can add anything
-							    you can add between <target> and </target> in a
-							    build.xml.
-							    -->
-							    <ant antfile="build.xml">
-								    <property name="cactus.sample.app.type" value="servlet"/>
-								    <property name="cactus.sample.archive.type" value="war"/>
-							    </ant>
-							    <ant antfile="build.xml" inheritAll="false">
-								    <property name="cactus.sample.app.type" value="ejb"/>
-								    <property name="cactus.sample.archive.type" value="ear"/>
-							    </ant>
-
-						    </tasks>
-					    </configuration>
-					    <goals>
-						    <goal>run</goal>
-					    </goals>
-				    </execution>
-			</executions>
-		   </plugin>
-	</plugins>
-	</build>
 </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=612137&r1=612136&r2=612137&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 15 07:24:41 2008
@@ -1,48 +1,89 @@
-<project name="CactusSampleEJB"  xmlns:ivy="antlib:org.apache.ivy.ant" default="test"> 
-	
+<project name="CactusMaven2Plugin"  xmlns:ivy="antlib:org.apache.ivy.ant" default="test"> 
+
+	<description>
+     Cactus Sample
+     ---------------------------------------------------------
+     Sample EAR application that demonstrates how Cactus can
+     be used using the Ant integration for unit testing EJBs
+     classes.
+  </description>
+  
+ <!--
+     ========================================================================
+       Initialize properties.
+     ========================================================================
+  -->	
 	<target name="init" depends="">
+	
+  	<property name="base.dir" location="samples-${cactus.sample.app.type}"/>
+		<echo>${base.dir}</echo>
 		
-		<property file="build.properties"/>
-		
-		<property name="build.dir" location="${basedir}/target/classes"/>
-		<property name="cactus.src.dir" location="${basedir}/src/main/cactus/"/>
-		<property name="src.dir" location="${basedir}/src/main/java/"/>
-		<property name="archive.name" value="target/samples-servlet-1.8.0-SNAPSHOT.war"/>
-		<property name="cactified.archive.name" value="target/testCactus-cactified.war"/>
-		<property name="test.reports.dir" location="reports/"/>
+		<property name="target.dir" location="${base.dir}/target"/>
+		<property name="build.dir" location="${target.dir}/classes"/>
+		<property name="cactus.src.dir" location="${base.dir}/src/main/cactus/"/>
+		<property name="src.dir" location="${base.dir}/src/main/java/"/>
+		<property name="src.application.dir" location="${base.dir}/src/main/app"/>
+		<property name="project.name" value="samples-servlet-1.8.0-SNAPSHOT"/>
+		<property name="archive.name" value="${target.dir}/${project.name}.${cactus.sample.archive.type}"/>
+		<property name="cactified.archive.name" value="${target.dir}/${project.name}-cactified.${cactus.sample.archive.type}"/>
 		<property name="maven.repo" location="/home/peter/.m2/repository"/>
-		<property name="container.home" location="/home/peter/bin/apache/jakarta-tomcat-5.0.28/"/>
-		<property name="logs.dir" location="target/logs"/>
+		<property name="container.home" location="C:/apache/tomcat/apache-tomcat-6.0.14"/>
+		<property name="logs.dir" location="${target.dir}/logs"/>
 		<property name="cactus.formatter.type" value="xml"/>
 		<property name="container.id" value="tomcat5x"/>
 		<property name="cargo.servlet.port" value="8080"/>
 		<property name="cargo.logging" value="high"/>
-		<property name="deployable.type" value="war"/>
-		<property name="reports.dir" value="target/reports"/>
-		<property name="ivy.lib.dir" value="${basedir}/target/lib"/>
+		
+		<property name="reports.dir" value="${base.dir}/target/reports"/>
+		<property name="ivy.lib.dir" value="${base.dir}/target/lib"/>
+		<property name="meta.inf.dir" value="${base.dir}/src/main/resources"/>
 		
 		<path id="cactus.classpath">
-			<fileset dir="${ivy.lib.dir}" includes="*.jar"/>
+			<fileset dir="${ivy.lib.dir}">
+        <include name="*.jar"/>
+      </fileset>
 		</path>
 	</target>
-	
-	<target name="resolve" description="Retrieve dependencies with ivy" depends="init">
-		<ivy:configure file="/home/peter/.ivy2/cache/ivysettings.xml" />
-		<ivy:retrieve />
-	</target>
-	
-	<target name="prepare" depends="resolve">
+
+ <!--
+     ========================================================================
+       Prepare the folder structure.
+     ========================================================================
+  -->
+	<target name="prepare" depends="init">
 		<mkdir dir="${build.dir}"/>
 		<mkdir dir="${logs.dir}"/>
 		<mkdir dir="${reports.dir}"/>
 	</target>
-	
-	<target name="load.tasks" depends="prepare">
+
+ <!--
+     ========================================================================
+       Resolve Ivy dependencies.
+     ========================================================================
+  -->
+	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
+		<ivy:configure file="${basedir}/../ivysettings.xml" />
+		<ivy:retrieve />
+  </target>
+
+ <!--
+     ========================================================================
+       Load external ant tasks.
+     ========================================================================
+  -->
+	<target name="load.tasks" depends="resolve">
 		<taskdef resource="cactus.tasks"
 			 classpathref="cactus.classpath">
 		</taskdef>
 	</target>
 	
+ <!--
+     ========================================================================
+       Compile source classes as well as cactus classes.
+     ========================================================================
+  -->
+	<!--Note that if some dependency is missing in the classpath, instead of compilation errors,
+      Ivy reports to Maven 'No Compiler Found' error. -->
 	<target name="compile" depends="load.tasks">
 		
 		<javac srcdir="${src.dir}"
@@ -51,31 +92,57 @@
 		
 		<javac srcdir="${cactus.src.dir}"
 		       destdir="${build.dir}"
-		       classpathref="cactus.classpath"/>
+			classpathref="cactus.classpath"/>
 	</target>
-	
-	<target name="package" depends="compile">
-		
-		<war destfile="${archive.name}" webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
-			<classes dir="${build.dir}"/>
-			<lib dir="${ivy.lib.dir}">
-				<include name="**.jar"/>
-			</lib>	
-		</war>
-	</target>
-	
-	<target name="cactifywar" depends="package">
-		<cactifywar srcfile="${archive.name}" 
-			    destfile="${cactified.archive.name}"/>	
-	</target>
-	
-	<target name="cactifyear" depends="init">
-		
-	</target>
-	
-	<target name="test" depends="cactifywar">
-		<echo>a</echo>
-		<cactus warfile="${cactified.archive.name}"
+
+  <!--
+     ========================================================================
+       Create the runtime ejb-jar file.
+     ========================================================================
+  -->
+  <target name="ejb" depends="compile"
+      description="Generate the runtime ejb-jar">
+
+    <!-- ATM, only support containers which do not need an ejb compilation
+         step. For example: JBoss -->
+    <jar jarfile="${target.dir}/${project.name}.jar">
+      <fileset dir="${build.dir}"/>
+      <metainf dir="${meta.inf.dir}"/>
+    </jar>
+
+  </target>
+
+  <!--
+     ========================================================================
+       Create the runtime ear file.
+     ========================================================================
+  -->
+  <target name="package-ear" depends="ejb"
+      description="Generate the runtime ear">
+
+    <ear earfile="${archive.name}"
+        appxml="${src.application.dir}/application.xml">
+      <fileset file="${target.dir}/${project.name}.jar"/>
+    </ear>
+  </target>
+
+	<!--
+     ========================================================================
+       Cactify the ready-made ear file.
+     ========================================================================
+  -->
+	<target name="cactifyear" depends="package-ear">
+		<cactifyear srcfile="${archive.name}" destfile="${cactified.archive.name}"/>
+	</target>
+	
+	<!--
+     ========================================================================
+       Execute the tests.
+     ========================================================================
+  -->
+	<target name="test" depends="cactifywar, cactifyear">
+
+		<cactus earfile="${cactified.archive.name}"
 			printsummary="yes">
 			<classpath>
 				<path refid="cactus.classpath"/>
@@ -87,7 +154,7 @@
 					<configuration>
 						<property name="cargo.servlet.port" value="${cargo.servlet.port}"/>
 						<property name="cargo.logging" value="${cargo.logging}"/>
-						<deployable type="${deployable.type}" file="${cactified.archive.name}"/>
+						<deployable type="${cactus.sample.archive.type}" file="${cactified.archive.name}"/>
 					</configuration>
 				</cargo>
 			</containerset>
@@ -100,6 +167,4 @@
 			</batchtest>
 		</cactus>
 	</target>
-	
 </project>
- 

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=612137&r1=612136&r2=612137&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 Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>samples</artifactId>
+		<artifactId>cactus.samples</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>samples-ejb</artifactId>
+	<artifactId>cactus.samples.ejb</artifactId>
 	<name>Cactus Ejb Samples - Parent Project</name>
 	<description>Cactus Ejb Samples - the parent project</description>
 	<packaging>pom</packaging>

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=612137&r1=612136&r2=612137&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 15 07:24:41 2008
@@ -1,424 +1,137 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
-  <!ENTITY common SYSTEM "file:../../build-common.xml">
-]>
+<project name="CactusMaven2Plugin"  xmlns:ivy="antlib:org.apache.ivy.ant" default="test"> 
 
-<!--
-  =============================================================================
-    Build file for the Cactus Servlet Sample subproject.
-
-    $Id: build.xml 394330 2006-04-15 16:53:21Z felipeal $
-  =============================================================================
--->
-<project name="Cactus Servlet Sample" default="dist" basedir="../..">
-
-  <description>
- Cactus Servlet Sample
- ---------------------------------------------------------
- Sample web-application that demonstrates how Cactus can
- be used using the Ant integration for unit testing classes 
- that use the servlet API (such as servlets, filters and 
- tag libraries).
+	<description>
+     Cactus Sample
+     ---------------------------------------------------------
+     Sample WAR/EAR application that demonstrates how Cactus can
+     be used using the Ant integration for unit testing Servlets/EJBs
+     classes.
   </description>
+  
+ <!--
+     ========================================================================
+       Initialize properties.
+     ========================================================================
+  -->	
+	<target name="init" depends="">
+	
+	  <property name="cactus.sample.app.type" value="servlet"/>
+		<property name="cactus.sample.archive.type" value="war"/>
+    
+    <property file="../build.properties"/>
+	 
+	
+		<path id="cactus.classpath">
+			<fileset dir="${ivy.lib.dir}">
+        <include name="*.jar"/>
+      </fileset>
+		</path>
+		
+	</target>
 
-  <!-- Base directory for all file related operations -->
-  <property name="base.dir" location="${basedir}/samples/servlet"/>
-
-  <!-- Indicate that this subproject is dependant on the version of the J2EE
-       API available -->
-  <property name="j2ee.dependant" value="true"/>
-
-  <!-- Include properties and targets common to the different subprojects -->
-  &common;
-
-  <!-- Global project properties -->
-  <property name="project.name.text" value="Cactus Servlet Sample"/>
-  <property name="project.name.file" value="cactus-sample-servlet"/>
-
-  <!--
+ <!--
      ========================================================================
-       Initialize source, target and dist properties
+       Prepare the folder structure.
      ========================================================================
   -->
-  <target name="properties">
-
-    <!-- Set the properties related to the source tree -->
-    <property name="src.dir" location="${base.dir}/src"/>
-    <property name="src.java.dir" location="${src.dir}/java"/>
-    <property name="src.conf.dir" location="${src.dir}/conf"/>
-    <property name="src.cactus.dir" location="${src.dir}/test-cactus"/>
-    <property name="src.script.dir" location="${src.dir}/scripts"/>
-    <property name="src.webapp.dir" location="${src.dir}/webapp"/>
-
-    <!-- Set the properties related to the target area -->
-    <property name="target.sample.dir" location="${target.dir}/sample"/>
-    <property name="target.sample.src.dir"
-        location="${target.sample.dir}/src"/>
-    <property name="target.sample.src.java.dir"
-        location="${target.sample.src.dir}/java"/>
-    <property name="target.sample.src.conf.dir"
-        location="${target.sample.src.dir}/conf"/>
-    <property name="target.sample.src.cactus.dir"
-        location="${target.sample.src.dir}/test-cactus"/>
-    <property name="target.sample.src.webapp.dir" 
-        location="${target.sample.src.dir}/webapp"/>
-    <property name="target.sample.lib.dir" 
-        location="${target.sample.dir}/lib"/>
-    <property name="target.test.dir" 
-        location="${target.dir}/test"/>
-
-  </target>
+	<target name="prepare" depends="init">
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${logs.dir}"/>
+		<mkdir dir="${reports.dir}"/>
+	</target>
 
-  <!--
+ <!--
      ========================================================================
-       Initialize filters used in copy operations
+       Resolve Ivy dependencies.
      ========================================================================
   -->
-  <target name="init.filters.clover"
-      depends="init.common"
-      if="clover.enable">
-
-    <filterset id="clover.enablement">
-      <filter token="clover.begin" value=""/>
-      <filter token="clover.end" value=""/>
-    </filterset>
-
-  </target>
-
-  <target name="init.filters.noclover"
-      depends="init.common"
-      unless="clover.enable">
-
-    <filterset id="clover.enablement">
-      <filter token="clover.begin" value="!-- "/>
-      <filter token="clover.end" value=" --"/>
-    </filterset>
-
-  </target>
-
-  <target name="init.filters.12" depends="init.common"
-      unless="j2ee13.available">
-
-    <filterset id="container.enablement">
-      <filter token="j2ee12.begin" value=""/>
-      <filter token="j2ee12.end" value=""/>
-      <filter token="j2ee13.begin" value="!-- "/>
-      <filter token="j2ee13.end" value=" --"/>
-    </filterset>
-
+	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
+		<ivy:configure file="${basedir}/../ivysettings.xml" />
+		<ivy:retrieve file="../ivy.xml"/>
   </target>
 
-  <target name="init.filters.13" depends="init.common"
-      if="j2ee13.available">
-
-    <filterset id="container.enablement">
-      <filter token="j2ee12.begin" value="!-- "/>
-      <filter token="j2ee12.end" value=" --"/>
-      <filter token="j2ee13.begin" value=""/>
-      <filter token="j2ee13.end" value=""/>
-    </filterset>
-
-  </target>
-
-  <target name="init.filters"
-      depends="init.filters.clover, init.filters.noclover,
-               init.filters.12, init.filters.13">
-
-    <!-- Copy scripts -->
-    <basename property="cargo.jar.name" file="${cargo.jar}"/>
-    <basename property="cargo.ant.jar.name" file="${cargo.ant.jar}"/>
-    <basename property="jstl.jar.name" file="${jstl.jar}"/>
-    <basename property="standard.jar.name" file="${standard.jar}"/>
-    <basename property="servlet.jar.name" file="${servlet.jar}"/>
-    <basename property="aspectjrt.jar.name" file="${aspectjrt.jar}"/>
-    <basename property="commons.httpclient.jar.name"
-        file="${commons.httpclient.jar}"/>
-    <basename property="commons.logging.jar.name"
-        file="${commons.logging.jar}"/>
-    <basename property="httpunit.jar.name" file="${httpunit.jar}"/>
-    <basename property="htmlunit.jar.name" file="${htmlunit.jar}"/>
-    <basename property="junit.jar.name" file="${junit.jar}"/>
-    <basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
-    <basename property="log4j.jar.name" file="${log4j.jar}"/>
-
-    <filterset id="jar.names">
-      <filter token="cargo.jar.name" value="${cargo.jar.name}"/>
-      <filter token="cargo.ant.jar.name" value="${cargo.ant.jar.name}"/>
-      <filter token="jstl.jar.name" value="${jstl.jar.name}"/>
-      <filter token="standard.jar.name" value="${standard.jar.name}"/>
-      <filter token="servlet.jar.name" value="${servlet.jar.name}"/>
-      <filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
-      <filter token="cactus.ant.jar.name" value="${cactus.ant.jar.name}.jar"/>
-      <filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
-      <filter token="commons.httpclient.jar.name"
-          value="${commons.httpclient.jar.name}"/>
-      <filter token="commons.logging.jar.name"
-          value="${commons.logging.jar.name}"/>
-      <filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
-      <filter token="htmlunit.jar.name" value="${htmlunit.jar.name}"/>
-      <filter token="junit.jar.name" value="${junit.jar.name}"/>
-      <filter token="nekohtml.jar.name" value="${nekohtml.jar.name}"/>
-      <filter token="log4j.jar.name" value="${log4j.jar.name}"/>
-    </filterset>
-
-  </target>
-
-  <!--
+ <!--
      ========================================================================
-       Initialize the build. Must be called by all targets
+       Load external ant tasks.
      ========================================================================
   -->
-  <target name="init" 
-      depends="init.common, init.filters, properties">
-
-    <echo>Dependencies:</echo>
-    <echo>  aspectjrt.jar = [${aspectjrt.jar}]</echo>
-    <echo>  cactus.ant.jar = [${cactus.ant.jar}]</echo>
-    <echo>  cactus.jar = [${cactus.jar}]</echo>
-    <echo>  cargo.jar = [${cargo.jar}]</echo>
-    <echo>  cargo.ant.jar = [${cargo.ant.jar}]</echo>
-    <echo>  commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
-    <echo>  commons.logging.jar = [${commons.logging.jar}]</echo>
-    <echo>  htmlunit.jar = [${htmlunit.jar}]</echo>
-    <echo>  httpunit.jar = [${httpunit.jar}]</echo>
-    <echo>  jstl.jar (for J2EE 1.3 only) = [${jstl.jar}]</echo>
-    <echo>  junit.jar = [${junit.jar}]</echo>
-    <echo>  log4j.jar = [${log4j.jar}]</echo>
-    <echo>  nekohtml.jar = [${nekohtml.jar}]</echo>
-    <echo>  servlet.jar = [${servlet.jar}]</echo>
-    <echo>  standard.jar (for J2EE 1.3 only) = [${standard.jar}]</echo>
-    <echo>  xerces.jar (optional) = [${xerces.jar}]</echo>
-    <echo>  xmlapis.jar (optional) = [${xmlapis.jar}]</echo>
-    <echo/>
-    <echo>Options:</echo>
-    <echo>  clover.enable = ${clover.enable}</echo>
-    <echo>  clover.jar = [${clover.jar}]</echo>
-    <echo>  cactus.port = ${cactus.port}</echo>
-
-    <condition property="properties.ok">
-      <and>
-        <available file="${aspectjrt.jar}"/>
-        <available file="${cactus.jar}"/>
-        <available file="${cactus.ant.jar}"/>
-        <available file="${cargo.jar}"/>
-        <available file="${cargo.ant.jar}"/>
-        <available file="${commons.httpclient.jar}"/>
-        <available file="${commons.logging.jar}"/>
-        <available file="${httpunit.jar}"/>
-        <available file="${htmlunit.jar}"/>
-        <available file="${servlet.jar}"/>
-        <available file="${log4j.jar}"/>
-        <or>
-          <not>
-            <isset property="j2ee13.available"/>
-          </not>
-          <and>
-            <available file="${jstl.jar}"/>
-            <available file="${standard.jar}"/>
-          </and>
-        </or>
-        <available file="${junit.jar}"/>
-        <available file="${log4j.jar}"/>
-        <available file="${nekohtml.jar}"/>
-        <!-- Check for a JAXP class instead of the xmlapis.jar file so that
-             the build works on JDK 1.4 without needing to define the
-             xmlapis.jar property -->
-        <available classname="javax.xml.parsers.DocumentBuilder"
-            classpath="${xmlapis.jar}"/>
-        <!-- Check for a Xerces class instead of the xerces.jar file so
-             that the build also works on JDKs that bundle Xerces without
-             needing to define the xerces.jar property -->
-        <available classname="org.apache.xml.serialize.XMLSerializer"
-            classpath="${xerces.jar}"/>
-        <!-- Check that clover.jar points to a valid file if clover is 
-             enabled -->
-        <or>
-          <and>        
-            <isset property="clover.enable"/>
-            <available file="${clover.jar}"/>
-          </and>
-          <not>
-            <isset property="clover.enable"/>
-          </not>
-        </or>            
-      </and>
-    </condition>
-
-    <fail unless="properties.ok">One or more required dependencies could not
-be resolved. Please check you build.properties file, and run Ant with the 
--verbose option for more details</fail>
-
-  </target>
-
-  <!--
-      ========================================================================
-        Generate the sample application
-      ========================================================================
-   -->
-  <target name="sample.main" depends="init">
-
-    <!-- Create output directory structure and copy sample files in it -->
-    <mkdir dir="${target.sample.dir}"/>
-    <mkdir dir="${target.sample.src.java.dir}"/>
-    <mkdir dir="${target.sample.src.conf.dir}"/>
-    <mkdir dir="${target.sample.src.cactus.dir}"/>
-    <mkdir dir="${target.sample.src.webapp.dir}"/>
-
-    <!-- Copy src files -->
-    <copy todir="${target.sample.src.java.dir}">
-      <fileset dir="${src.java.dir}/share"/>
-      <fileset dir="${src.java.dir}/j2ee${j2ee.api}"/>
-    </copy>
-    <copy todir="${target.sample.src.cactus.dir}">
-      <fileset dir="${src.cactus.dir}/share"/>
-      <fileset dir="${src.cactus.dir}/j2ee${j2ee.api}"/>
-    </copy>
-    <copy todir="${target.sample.src.conf.dir}">
-      <fileset dir="${src.conf.dir}"/>
-    </copy>
-
-    <!-- Copy scripts -->
-    <copy todir="${target.sample.dir}" filtering="on">
-      <fileset dir="${src.script.dir}/share"/>
-      <fileset dir="${src.script.dir}/j2ee${j2ee.api}"/>
-      <filterset refid="clover.enablement"/>
-      <filterset refid="container.enablement"/>
-      <filterset refid="jar.names"/>
-    </copy>
-
-    <!-- Copy webapp files -->
-    <copy todir="${target.sample.src.webapp.dir}">
-      <fileset dir="${src.webapp.dir}/share"/>
-      <fileset dir="${src.webapp.dir}/j2ee${j2ee.api}"/>
-    </copy>
-
-    <!-- Copy README file -->
-    <copy todir="${target.sample.dir}" file="${base.dir}/README"/>
-
-    <!-- Copy sample logging properties file -->
-    <copy todir="${target.sample.dir}">
-      <fileset dir="${base.dir}">
-        <include name="logging_*.properties.sample"/>
-      </fileset>
-    </copy>
-    
-  </target>
-
-  <target name="sample.clover" depends="sample.main" if="clover.enable">
-
-    <copy todir="${target.sample.lib.dir}" file="${clover.jar}"/>
-
-  </target>
-
-  <target name="sample" depends="sample.clover"
-      description="Generate the sample application"/>
-
-  <!--
+	<target name="load.tasks" depends="resolve">
+		<taskdef resource="cactus.tasks"
+			 classpathref="cactus.classpath">
+		</taskdef>
+	</target>
+	
+ <!--
      ========================================================================
-       Run the full suite of tests on all defined containers.
+       Compile source classes as well as cactus classes.
      ========================================================================
   -->
-  <target name="test.prepare"
-      depends="sample">
-
-    <condition property="test.cactus.jar" value="${cactus.clover.jar}">
-      <isset property="clover.enable"/>
-    </condition>
-    <property name="test.cactus.jar" value="${cactus.jar}"/>
-    <condition property="test.cactus.ant.jar"
-        value="${cactus.ant.clover.jar}">
-      <isset property="clover.enable"/>
-    </condition>
-    <property name="test.cactus.ant.jar" value="${cactus.ant.jar}"/>
-
-    <mkdir dir="${target.test.dir}"/>
-
-  </target>
-  
-  <target name="test" 
-      depends="test.prepare"
-      description="Run the tests on all defined servers">
-
-    <ant dir="${target.sample.dir}" target="test">
-      <property name="src.dir" location="${target.sample.src.dir}"/>
-      <property name="src.java.dir"
-          location="${target.sample.src.java.dir}"/>
-      <property name="src.conf.dir"
-          location="${target.sample.src.conf.dir}"/>
-      <property name="src.cactus.dir"
-          location="${target.sample.src.cactus.dir}"/>
-      <property name="src.webapp.dir"
-          location="${target.sample.src.webapp.dir}"/>
-      <property name="target.dir" location="${target.test.dir}"/>
-      <property name="target.classes.dir"
-          location="${target.test.dir}/classes"/>
-      <property name="target.classes.java.dir"
-          location="${target.test.dir}/classes/java"/>
-      <property name="target.classes.cactus.dir"
-          location="${target.test.dir}/classes/cactus"/>
-      <property name="target.testreports.dir"
-          location="${target.test.dir}/test-reports"/>
-      <property name="cactus.jar" location="${test.cactus.jar}"/>
-      <property name="cactus.ant.jar" location="${test.cactus.ant.jar}"/>
-      <property name="servlet.jar" value="${servlet.jar}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="cargo.jar" location="${cargo.jar}"/>
-      <property name="cargo.ant.jar" location="${cargo.ant.jar}"/>
-    </ant>
-
-  </target>
-
+	<!--Note that if some dependency is missing in the classpath, instead of compilation errors,
+      Ivy reports to Maven 'No Compiler Found' error. -->
+	<target name="compile" depends="load.tasks">
+		
+		<javac srcdir="${src.dir}"
+		       destdir="${build.dir}"
+		       classpathref="cactus.classpath"/>
+		
+		<javac srcdir="${cactus.src.dir}"
+		       destdir="${build.dir}"
+			classpathref="cactus.classpath"/>
+	</target>
+	
   <!--
      ========================================================================
-       Generate the distributable files
+       Create the runtime war file.
      ========================================================================
   -->
-  <target name="dist" depends="checkstyle, test"
-      description="Generate the distributable files">
-
-    <mkdir dir="${dist.bin.dir}"/>
-    <copy todir="${dist.bin.dir}">
-      <fileset dir="${target.sample.dir}"/>
-    </copy>
-
-  </target>
-
+	<target name="package-war" depends="compile">
+		<war destfile="${archive.name}" webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
+			<classes dir="${build.dir}"/>
+			<lib dir="${ivy.lib.dir}">
+				<include name="**.jar"/>
+			</lib>	
+		</war>
+	</target>
+	
   <!--
      ========================================================================
-       Perform a code audit using CheckStyle. Only performs the audit if
-       the checkstyle jar is in the Ant classpasth.
+       Cactify the ready-made war file.
      ========================================================================
   -->
-  <target name="checkstyle" depends="init,init.checkstyle" 
-      if="checkstyle.available"
-      description="Perform a code audit using Checkstyle">
+	<target name="cactifywar" depends="package-war">
+		<cactifywar srcfile="${archive.name}" destfile="${cactified.archive.name}"/>	
+	</target>
+	
 
-    <mkdir dir="${target.dir}"/>
-    <checkstyle config="./checkstyle.xml" failOnViolation="true">
-      <fileset dir="${src.java.dir}">
-        <include name="**/*.java"/>
-      </fileset>
-      <fileset dir="${src.cactus.dir}">
-        <include name="**/*.java"/>
-      </fileset>
-      <formatter type="plain"/>
-      <formatter type="xml" tofile="${target.dir}/checkstyle_results.xml"/>
-      <property key="checkstyle.header.file" file="./checkstyle.license"/>
-    </checkstyle>
-
-  </target>
-
-  <!--
+	<!--
      ========================================================================
-       Clean generated files (including distributables)
+       Execute the tests.
      ========================================================================
   -->
-  <target name="clean" depends="init.display,init.properties"
-    description="Clean all generated files">
-
-    <delete dir="${target.dir}"/>
-    <delete dir="${dist.dir}"/>
-
-  </target>
-
+	<target name="test" depends="cactifywar">
+		<cactus warfile="${cactified.archive.name}"
+			printsummary="yes">
+			<classpath>
+				<path refid="cactus.classpath"/>
+				<pathelement location="${build.dir}"/>
+			</classpath>
+			<containerset>
+				<cargo containerId="${container.id}" home="${container.home}" output="${logs.dir}/output.log"
+				       log="${logs.dir}/cargo.log">
+					<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}"/>
+					</configuration>
+				</cargo>
+			</containerset>
+			
+			<formatter type="${cactus.formatter.type}"/>
+			<batchtest todir="${reports.dir}">
+				<fileset dir="${cactus.src.dir}">
+					<include name="**/Test*.java"/>
+				</fileset>
+			</batchtest>
+		</cactus>
+	</target>
 </project>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml?rev=612137&r1=612136&r2=612137&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml Tue Jan 15 07:24:41 2008
@@ -21,10 +21,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.cactus</groupId>
-		<artifactId>samples</artifactId>
+		<artifactId>cactus.samples</artifactId>
 		<version>1.8.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>samples-servlet</artifactId>
+	<artifactId>cactus.samples.servlet</artifactId>
 	<name>Cactus Servlet Samples - Parent Project</name>
 	<description>Cactus Servlet Sample Projects</description>
 	<packaging>war</packaging>
@@ -36,7 +36,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
-			<artifactId>javaEE-14-uberjar</artifactId>
+			<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
@@ -76,85 +76,29 @@
 	</properties>
 	<build>
 		<plugins>
-			<!--plugin>
-				<groupId>org.apache.cactus.integration.m2</groupId>
-				<artifactId>cactus-m2-plugin</artifactId>
-				<version>1.0-SNAPSHOT</version>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-junit</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.cactus</groupId>
-						<artifactId>javaEE-14-uberjar</artifactId>
-						<version>${version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.cactus</groupId>
-						<artifactId>integration-ant</artifactId>
-						<version>${version}</version>
-					</dependency>
-					<dependency>
-						<groupId>xerces</groupId>
-						<artifactId>xercesImpl</artifactId>
-						<version>2.6.2</version>
-					</dependency>
-					<dependency>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-						<version>2.5</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>
-				</dependencies>
-				<executions>
-					<execution>
-						<phase>test</phase>
-						<goals>
-							<goal>cactus:test</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin-->
-			<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>
-								
-								<!--
-								    Place any ant task here. You can add anything
-								    you can add between <target> and </target> in a
-								    build.xml.
-								    -->
-								<ant antfile="build.xml"/>
-							    </tasks>
-						</configuration>
-						    <goals>
-							    <goal>run</goal>
-						    </goals>
-					    </execution>
-				    </executions>
-			</plugin>
+		  <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>



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org