Author: wsmoak
Date: Sun Jun 18 22:53:33 2006
New Revision: 415249
URL: http://svn.apache.org/viewvc?rev=415249&view=rev
Log:
Initial restructuring of the Shale Blank archetype into a multi-module project
archetype.
Added:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
(with props)
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java
- copied, changed from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/package.html
- copied unchanged from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/package.html
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/overview.html
- copied unchanged from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/overview.html
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/blank/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/blank/Bundle.properties
- copied unchanged from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/resources/Bundle.properties
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java
- copied, changed from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
(with props)
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/shale/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/shale/blank/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/shale/blank/systest/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
(with props)
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/
- copied from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/
Removed:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/overview.html
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/package.html
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/resources/Bundle.properties
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java
struts/sandbox/trunk/archetypes/shale-blank/src/web/
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/messages.jspf
Added:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml?rev=415249&view=auto
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
(added)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
Sun Jun 18 22:53:33 2006
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-parent</artifactId>
+ <version>${version}</version>
+ </parent>
+ <artifactId>${artifactId}-core</artifactId>
+ <packaging>jar</packaging>
+ <name>Shale Starter Archetype - Core</name>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+</project>
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java
(from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java?p2=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java&p1=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java&r1=414999&r2=415249&rev=415249&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java
Sun Jun 18 22:53:33 2006
@@ -15,7 +15,7 @@
*
*/
-package $package;
+package org.apache.shale.blank;
import java.util.Date;
import org.apache.shale.view.AbstractViewController;
Copied:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java
(from r414999,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java?p2=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java&p1=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java&r1=414999&r2=415249&rev=415249&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java
Sun Jun 18 22:53:33 2006
@@ -15,7 +15,7 @@
*
*/
-package $package;
+package org.apache.shale.blank;
import junit.framework.Test;
import junit.framework.TestSuite;
Added:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml?rev=415249&view=auto
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
(added)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
Sun Jun 18 22:53:33 2006
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-parent</artifactId>
+ <version>${version}</version>
+ </parent>
+ <artifactId>${artifactId}-it</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Shale Starter Archetype - Integration Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- WelcomeTestCase needs the resource bundle from the core jar -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-core</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <testSourceDirectory>src/it/java</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>itest</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compiler-it</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+
<exclude>**/WelcomeTestCase.java</exclude>
+ </excludes>
+ <!-- 'basedir' gets filtered and
archetype:create time, rather than build-time. -->
+ <systemProperties>
+ <property>
+ <name>url</name>
+
<value>http://localhost:8080/${artifactId}</value>
+ </property>
+ <property>
+ <name>cargo.tomcat5x.home</name>
+
<value>c:/java/apache-tomcat-5.5.17</value>
+ </property>
+ <property>
+ <name>cargo.tomcat5x.output</name>
+ <value>target/tomcat5x.out</value>
+ </property>
+ <property>
+ <name>cargo.tomcat5x.log</name>
+ <value>target/tomcat5x.log</value>
+ </property>
+ <property>
+ <name>cargo.deployable</name>
+
<value>../webapp/target/${artifactId}.war</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml?rev=415249&r1=415248&r2=415249&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
Sun Jun 18 22:53:33 2006
@@ -4,12 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
+ <artifactId>${artifactId}-parent</artifactId>
+ <packaging>pom</packaging>
<version>${version}</version>
- <name>Shale Blank Archetype</name>
+ <name>Shale Starter Archetype</name>
<url>http://struts.apache.org/struts-shale</url>
+ <modules>
+ <module>core</module>
+ <module>webapp</module>
+ <module>integration</module>
+ </modules>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -60,34 +66,10 @@
</dependencies>
<build>
- <plugins>
-
- <!-- mvn package cargo:start -->
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <configuration>
- <container>
- <containerId>tomcat5x</containerId>
- <home>c:/java/apache-tomcat-5.5.17</home>
- <!--zipUrlInstaller>
-
<url>http://mirrors.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zip</url>
-
<installDir>${project.build.directory}/tomcat-zip</installDir>
- </zipUrlInstaller-->
- <log>target/tomcat5x.log</log>
- <output>target/tomcat5x.out</output>
- </container>
- <configuration>
- <home>target/tomcat5x</home>
- </configuration>
- </configuration>
- </plugin>
-
- </plugins>
-
<finalName>${artifactId}</finalName>
+ <defaultGoal>install</defaultGoal>
</build>
-
+
<!-- Remove before releasing the archetype. This is only necessary when
using snapshot dependencies that can't be retrieved from the
central Maven repo -->
Added:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml?rev=415249&view=auto
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
(added)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
Sun Jun 18 22:53:33 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-parent</artifactId>
+ <version>${version}</version>
+ </parent>
+
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+ <name>Shale Starter Archetype - Webapp</name>
+ <url>http://struts.apache.org/struts-shale</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+ <plugins>
+
+ <!-- mvn package cargo:start -->
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>c:/java/apache-tomcat-5.5.17</home>
+ <!--zipUrlInstaller>
+
<url>http://mirrors.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zip</url>
+
<installDir>${project.build.directory}/tomcat-zip</installDir>
+ </zipUrlInstaller-->
+ <log>target/tomcat5x.log</log>
+ <output>target/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>target/tomcat5x</home>
+ </configuration>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ <finalName>${artifactId}</finalName>
+ </build>
+
+</project>
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/messages.jspf
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/messages.jspf?rev=415249&r1=414999&r2=415249&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/messages.jspf
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/webapp/src/main/webapp/messages.jspf
Sun Jun 18 22:53:33 2006
@@ -19,5 +19,5 @@
<%-- The Bundle.properties file is in the src/main/resources directory. --%>
<f:loadBundle var="messages"
- basename="Bundle"/>
+ basename="org.apache.shale.blank.Bundle"/>
