You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ws...@apache.org on 2006/01/30 05:33:36 UTC
svn commit: r373428 - in /struts/sandbox/trunk/archetypes/shale-blank: ./
src/main/resources/META-INF/ src/main/resources/archetype-resources/
src/main/resources/archetype-resources/src/main/webapp-filtered/
src/main/resources/archetype-resources/src/m...
Author: wsmoak
Date: Sun Jan 29 20:33:27 2006
New Revision: 373428
URL: http://svn.apache.org/viewcvs?rev=373428&view=rev
Log:
Added plugin and archetype-resources poms.
Moved web.xml and messages.jspf to webapp-filtered to work around MWAR-12.
Added:
struts/sandbox/trunk/archetypes/shale-blank/pom.xml (with props)
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml (with props)
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml
- copied, changed from r373424, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/messages.jspf
- copied, changed from r373424, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/messages.jspf
Removed:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/messages.jspf
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/welcome.jsp
Added: struts/sandbox/trunk/archetypes/shale-blank/pom.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/pom.xml?rev=373428&view=auto
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/pom.xml (added)
+++ struts/sandbox/trunk/archetypes/shale-blank/pom.xml Sun Jan 29 20:33:27 2006
@@ -0,0 +1,13 @@
+<?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>
+ <groupId>struts</groupId>
+ <artifactId>struts-archetype-shale-blank</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>Shale Blank Archetype</name>
+
+</project>
+
Propchange: struts/sandbox/trunk/archetypes/shale-blank/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/archetypes/shale-blank/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml?rev=373428&r1=373427&r2=373428&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml Sun Jan 29 20:33:27 2006
@@ -15,25 +15,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * $Id:$
+ * $Id$
*/
-->
<archetype>
<id>shale-blank</id>
- <sources>
- <source>src/main/java/WelcomeBean.java</source>
- <source>src/main/resources/Bundle.properties</source>
- </sources>
- <testSources>
- <source>src/test/java/WelcomeBeanTestCase.java</source>
- </testSources>
- <resources>
+ <sources>
+ <source>src/main/java/WelcomeBean.java</source>
+ <source>src/main/resources/Bundle.properties</source>
+ </sources>
+ <testSources>
+ <source>src/test/java/WelcomeBeanTestCase.java</source>
+ </testSources>
+ <resources>
+ <resource>src/main/java/overview.html</resource>
<resource>src/main/webapp/index.jsp</resource>
- <resource>src/main/webapp/messages.jspf</resource>
<resource>src/main/webapp/welcome.jsp</resource>
<resource>src/main/webapp/WEB-INF/chain-config.xml</resource>
<resource>src/main/webapp/WEB-INF/dialog-config.xml</resource>
<resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- </resources>
+ <resource>src/main/webapp-filtered/messages.jspf</resource>
+ <resource>src/main/webapp-filtered/WEB-INF/web.xml</resource>
+ </resources>
</archetype>
+
Added: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml?rev=373428&view=auto
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml (added)
+++ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml Sun Jan 29 20:33:27 2006
@@ -0,0 +1,88 @@
+<?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>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+ <version>${version}</version>
+ <name>Shale Blank Archetype</name>
+ <url>http://struts.apache.org/struts-shale</url>
+
+ <repositories>
+ <repository>
+ <id>apache-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources/</directory>
+ </resource>
+ <resource>
+ <directory>src/main/webapp-filtered</directory>
+ <targetPath>../${artifactId}/</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+ <properties>
+ <state.saving.method>client</state.saving.method>
+ </properties>
+
+</project>
Propchange: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml (from r373424, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml?p2=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml&p1=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml&r1=373424&r2=373428&rev=373428&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml Sun Jan 29 20:33:27 2006
@@ -26,7 +26,7 @@
<!-- Select JSF State Saving Mode -->
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>@stateSaving@</param-value>
+ <param-value>${state.saving.method}</param-value>
</context-param>
<!-- JSF Configuration Resources (comma-separated list) -->
Copied: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/messages.jspf (from r373424, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/messages.jspf)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/messages.jspf?p2=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/messages.jspf&p1=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/messages.jspf&r1=373424&r2=373428&rev=373428&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/messages.jspf (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/messages.jspf Sun Jan 29 20:33:27 2006
@@ -14,10 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id$
-
--%>
<f:loadBundle var="messages"
- basename="org.apache.shale.blank.Bundle"/>
+ basename="${package}.Bundle"/>
Modified: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/welcome.jsp?rev=373428&r1=373427&r2=373428&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/welcome.jsp (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/welcome.jsp Sun Jan 29 20:33:27 2006
@@ -14,8 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id$
-
--%>
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core" %>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org