You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by ra...@apache.org on 2007/01/26 16:52:19 UTC

svn commit: r500269 - in /shale/sandbox/maven/archetypes/shale-clay-starter-archetype: ./ src/main/resources/archetype-resources/src/main/webapp/ src/main/resources/archetype-resources/src/main/webapp/WEB-INF/ src/main/resources/archetype-resources/src...

Author: rahul
Date: Fri Jan 26 07:52:18 2007
New Revision: 500269

URL: http://svn.apache.org/viewvc?view=rev&rev=500269
Log:
* License header updates for shale-clay-starter-archetype
* Various other cleanup bits
Patch by Hermod Opstvedt <hermod AT opstvedt DOT com>
SHALE-393

Modified:
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/NOTICE.txt
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/README.txt
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/chain-config.xml
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-config.xml
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-views-config.xml
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultBody.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultFooter.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultHeader.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultLeftNav.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page1Body.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page2Body.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page3Body.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/templates/standard.html
    shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/theme/styles.css

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/NOTICE.txt
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/NOTICE.txt?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/NOTICE.txt (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/NOTICE.txt Fri Jan 26 07:52:18 2007
@@ -1,3 +1,5 @@
+Apache Shale Clay Starter Archetype
+Copyright 2004-2007 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/README.txt
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/README.txt?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/README.txt (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/README.txt Fri Jan 26 07:52:18 2007
@@ -1,10 +1,26 @@
+/*
+* Copyright 2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 Shale Blank Archetype
 =====================
 
 This directory contains the Shale Clay Blank Archetype for Maven 2.
 
-To use the archetype to create a blank project:
+To use the archetype to create a blank project (substituting in names 
+that apply to your settings):
 
    $ cd ~/projects
    $ mvn archetype:create                                             \
@@ -25,16 +41,10 @@
    $ cd projectname
    $ mvn eclipse:eclipse -Dwtpversion=1.5
 
-To start Tomcat and deploy your new webapp:
+To start Tomcat and deploy your new webapp (substituting the path to your
+Tomcat installation) :
 
-  Modify pom.xml to provide the path to a local Tomcat 5.x installation:
-       <plugin>
-         <groupId>org.codehaus.cargo</groupId>
-         <artifactId>cargo-maven2-plugin</artifactId>
-         ...
-               <home>c:/java/apache-tomcat-5.5.17</home>
-
-  $ mvn package cargo:start
+   $ mvn package cargo:start -Dcargo.tomcat5x.home=/apache/tomcat-5.5.17
 
    Open a browser and visit http://localhost:8080/projectname
 

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/chain-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/chain-config.xml?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/chain-config.xml (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/chain-config.xml Fri Jan 26 07:52:18 2007
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	
+	Copyright 2004-2005 The Apache Software Foundation.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+-->
 <catalogs>
 	<!-- Define preprocessing command chain for Shale to execute -->
 	<catalog name="shale">

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-config.xml?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-config.xml (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-config.xml Fri Jan 26 07:52:18 2007
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 	
 	Copyright 2004-2005 The Apache Software Foundation.
@@ -35,12 +34,6 @@
 			<set name="bodyContent" value="/pages/defaultBody.html" />
 			<set name="footerContent" value="/pages/defaultFooter.html" />
 		</symbols>
-	</component>
-
-	<component jsfid="testpage" extends="clay" id="base">
-		<attributes>
-			<set name="clayJsfid" value="/pages/page3Body.html" />
-		</attributes>
 	</component>
 
 </view>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-views-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-views-config.xml?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-views-config.xml (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/clay-views-config.xml Fri Jan 26 07:52:18 2007
@@ -1,25 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!DOCTYPE view PUBLIC
+<!--
+	
+	Copyright 2004-2005 The Apache Software Foundation.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+-->
+<!DOCTYPE view PUBLIC
       "-//Apache Software Foundation//DTD Shale Clay View Configuration 1.0//EN"
       "http://struts.apache.org/dtds/shale-clay-config_1_0.dtd">
 
 <view>
-    <component jsfid="/page1.xml" extends="baseLayout">
-        <symbols>
-              <set name="title" value="Page 1"/>
-              <set name="bodyContent" value="/pages/page1Body.html"/>
-        </symbols>
-    </component>
-    <component jsfid="/page2.xml" extends="baseLayout">
-        <symbols>
-              <set name="title" value="Page 2"/>
-              <set name="bodyContent" value="/pages/page2Body.html"/>
-        </symbols>
-    </component>
-    <component jsfid="/page3.xml" extends="baseLayout">
-        <symbols>
-              <set name="title" value="Page 3"/>
-              <set name="bodyContent" value="/pages/page3Body.html"/>
-        </symbols>
-    </component>
+	<component jsfid="/page1.jsf" extends="baseLayout">
+		<symbols>
+			<set name="title" value="Page 1" />
+			<set name="bodyContent" value="/pages/page1Body.html" />
+		</symbols>
+	</component>
+	<component jsfid="/page2.jsf" extends="baseLayout">
+		<symbols>
+			<set name="title" value="Page 2" />
+			<set name="bodyContent" value="/pages/page2Body.html" />
+		</symbols>
+	</component>
+	<component jsfid="/page3.jsf" extends="baseLayout">
+		<symbols>
+			<set name="title" value="Page 3" />
+			<set name="bodyContent" value="/pages/page3Body.html" />
+		</symbols>
+	</component>
 </view>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml Fri Jan 26 07:52:18 2007
@@ -1,12 +1,4 @@
 <?xml version="1.0"?>
-#set( $dotPerson = ".Person" )
-#set( $dotTestVC = ".TestVC" )
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-
 <!--
 	
 	Copyright 2004-2005 The Apache Software Foundation.
@@ -24,7 +16,12 @@
 	limitations under the License.
 	
 -->
+#set( $dotPerson = ".Person" )
+#set( $dotTestVC = ".TestVC" )
 
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
 
 <faces-config>
 
@@ -34,12 +31,9 @@
 
 	<application>
 		<locale-config>
-			<default-locale>no</default-locale>
+			<default-locale>en</default-locale>
 			<supported-locale>no</supported-locale>
 			<supported-locale>en</supported-locale>
-			<supported-locale>fr</supported-locale>
-			<supported-locale>de</supported-locale>
-			<supported-locale>es</supported-locale>
 		</locale-config>
 	</application>
 
@@ -50,17 +44,17 @@
 
 		<navigation-case>
 			<from-outcome>home</from-outcome>
-			<to-view-id>/page1.xml</to-view-id>
+			<to-view-id>/page1.jsf</to-view-id>
 		</navigation-case>
 
 		<navigation-case>
 			<from-outcome>page2</from-outcome>
-			<to-view-id>/page2.xml</to-view-id>
+			<to-view-id>/page2.jsf</to-view-id>
 		</navigation-case>
 
 		<navigation-case>
 			<from-outcome>page3</from-outcome>
-			<to-view-id>/page3.xml</to-view-id>
+			<to-view-id>/page3.jsf</to-view-id>
 		</navigation-case>
 
 	</navigation-rule>
@@ -69,7 +63,7 @@
 	<managed-bean id="page1">
 		<managed-bean-name>page2</managed-bean-name>
 		<managed-bean-class>
-			$package$dotTestVC
+			com.example.projectname.TestVC
 		</managed-bean-class>
 		<managed-bean-scope>request</managed-bean-scope>
 	</managed-bean>
@@ -77,13 +71,13 @@
 	<managed-bean id="page2">
 		<managed-bean-name>page2</managed-bean-name>
 		<managed-bean-class>
-			$package$dotTestVC
+			com.example.projectname.TestVC
 		</managed-bean-class>
 		<managed-bean-scope>request</managed-bean-scope>
 		<managed-property>
 			<property-name>person</property-name>
 			<property-class>
-				$package$dotPerson
+				com.example.projectname.Person
 			</property-class>
 			<value>#{person}</value>
 		</managed-property>
@@ -92,7 +86,7 @@
 	<managed-bean id="person">
 		<managed-bean-name>person</managed-bean-name>
 		<managed-bean-class>
-			$package$dotPerson
+			com.example.projectname.Person
 		</managed-bean-class>
 		<managed-bean-scope>session</managed-bean-scope>
 	</managed-bean>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Fri Jan 26 07:52:18 2007
@@ -1,25 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	
+	Copyright 2004-2005 The Apache Software Foundation.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+-->
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee                      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
 	<display-name>Clay template application</display-name>
 
-	<!-- Select JSF State Saving Mode -->
+	<!-- Override the default suffix for extension-mapped -->
 	<context-param>
-		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-		<param-value>client</param-value>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.jsf</param-value>
 	</context-param>
 
-	<!-- Commons Chain Configuration Resources -->
+	<!-- Select JSF State Saving Mode -->
 	<context-param>
-		<param-name>
-			org.apache.commons.chain.CONFIG_WEB_RESOURCE
-		</param-name>
-		<param-value>/WEB-INF/chain-config.xml</param-value>
+		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+		<param-value>client</param-value>
 	</context-param>
 
-	<!-- Clay Configuration Resources -->
+	<!-- Clay Common Configuration Resources -->
 	<context-param>
 		<param-name>
 			org.apache.shale.clay.COMMON_CONFIG_FILES
@@ -34,68 +49,13 @@
 		</param-name>
 		<param-value>/WEB-INF/clay-views-config.xml</param-value>
 	</context-param>
-	
-	<context-param>
-		<description>
-			Whether or not to create pretty HTML code
-		</description>
-		<param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	
-	<context-param>
-		<description>Whether or not to allow javascript</description>
-		<param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	
-	<context-param>
-		<description></description>
-		<param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-		<param-value>false</param-value>
-	</context-param>
-	
-	<context-param>
-		<description></description>
-		<param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-		<param-value>false</param-value>
-	</context-param>
-	
-	<context-param>
-		<description></description>
-		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-		<param-value>.xml</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			A very common problem in configuring
-			MyFaces-web-applications is that the Extensions-Filter is
-			not configured at all or improperly configured. This
-			parameter will check for a properly configured
-			Extensions-Filter if it is needed by the web-app. In most
-			cases this check will work just fine, there might be cases
-			where an internal forward will bypass the Extensions-Filter
-			and the check will not work. If this is the case, you can
-			disable the check by setting this parameter to false.
-		</description>
-		<param-name>
-			org.apache.myfaces.CHECK_EXTENSIONS_FILTER
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
 
+	<!-- Clay XML View Suffix -->
 	<context-param>
-		<description>
-			Change the url-pattern from the ExtensionsFilter Default is
-			"/faces/myFacesExtensionResource" Note: The filter-mapping
-			for ExtensionsFilter, the url-pattern is this value + "/*",
-			else there comes a exception
-		</description>
 		<param-name>
-			org.apache.myfaces.RESOURCE_VIRTUAL_PATH
+			org.apache.shale.clay.XML_TEMPLATE_SUFFIX
 		</param-name>
-		<param-value>/faces/extensionResource</param-value>
+		<param-value>.jsf</param-value>
 	</context-param>
 
 	<!-- Shale Application Controller Filter -->
@@ -106,19 +66,18 @@
 		</filter-class>
 	</filter>
 
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
 	<!-- Shale Application Controller Filter Mapping -->
 	<filter-mapping>
 		<filter-name>shale</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<!-- Commons Chain Configuration Listener -->
-	<listener>
-		<listener-class>
-			org.apache.commons.chain.web.ChainListener
-		</listener-class>
-	</listener>
-
 	<!-- JavaServer Faces Servlet Configuration -->
 	<servlet>
 		<servlet-name>faces</servlet-name>
@@ -129,24 +88,11 @@
 	<!-- JavaServer Faces Servlet Mapping -->
 	<servlet-mapping>
 		<servlet-name>faces</servlet-name>
-		<url-pattern>*.faces</url-pattern>
-	</servlet-mapping>
-
-	<!-- JavaServer Faces Servlet Mapping for Clay HTML Full View -->
-	<servlet-mapping>
-		<servlet-name>faces</servlet-name>
-		<url-pattern>*.html</url-pattern>
-	</servlet-mapping>
-
-	<!-- JavaServer Faces Servlet Mapping for Clay XML Full View -->
-	<servlet-mapping>
-		<servlet-name>faces</servlet-name>
-		<url-pattern>*.xml</url-pattern>
+		<url-pattern>*.jsf</url-pattern>
 	</servlet-mapping>
 
-	<!-- Make sure that the xml extetion is treated the right way -->
 	<mime-mapping>
-		<extension>xml</extension>
+		<extension>jsf</extension>
 		<mime-type>text/html</mime-type>
 	</mime-mapping>
 

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp Fri Jan 26 07:52:18 2007
@@ -1,4 +1,21 @@
+<!--
+	
+	Copyright 2004-2005 The Apache Software Foundation.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+-->
 <%
-        String redirectURL = "./page1.xml";
+        String redirectURL = "./page1.jsf";
         response.sendRedirect(redirectURL);
-%>
\ No newline at end of file
+%>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultBody.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultBody.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultBody.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultBody.html Fri Jan 26 07:52:18 2007
@@ -1,2 +1,21 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <h3>Standard frontpage</h3>
-<p>This is standard frontpage content</p>
\ No newline at end of file
+<p>This is standard frontpage content</p>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultFooter.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultFooter.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultFooter.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultFooter.html Fri Jan 26 07:52:18 2007
@@ -1 +1,20 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <p><span jsfid="outputText" value="#{messages['application.footer']}" allowBody="false">Clay template application footer</span></p>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultHeader.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultHeader.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultHeader.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultHeader.html Fri Jan 26 07:52:18 2007
@@ -1 +1,20 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <h1><span jsfid="outputText" value="#{messages['application.title']}" allowBody="false">Clay template header</span></h1>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultLeftNav.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultLeftNav.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultLeftNav.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/defaultLeftNav.html Fri Jan 26 07:52:18 2007
@@ -1,3 +1,22 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <div id="menu">
 <div id="button" class="button"><span jsfid="form">
 <p class="menu"><span jsfid="outputText" value="#{messages['menu']}" allowBody="false">Menu</span></p>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page1Body.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page1Body.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page1Body.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page1Body.html Fri Jan 26 07:52:18 2007
@@ -1,2 +1,21 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <h3><span jsfid="outputText" value="#{messages['content.title.page1']}" allowBody="false">Clay template application - Page 1</span></h3>
 <p><span jsfid="outputText" value="#{messages['content.message.page1']}" allowBody="false">This is Page 1 content</span></p>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page2Body.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page2Body.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page2Body.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page2Body.html Fri Jan 26 07:52:18 2007
@@ -1,3 +1,22 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <h3><span jsfid="outputText"
 	value="#{messages['content.title.page2']}" allowBody="false">Clay
 template application - Page 2</span></h3>
@@ -17,4 +36,4 @@
 		</tr>
 		</tbody>
 </table>
-</span>
\ No newline at end of file
+</span>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page3Body.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page3Body.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page3Body.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/pages/page3Body.html Fri Jan 26 07:52:18 2007
@@ -1,3 +1,22 @@
+<!-- ### clay:remove ### -->
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+<!-- ### /clay:remove ### -->
 <h3><span jsfid="outputText"
 	value="#{messages['content.title.page3']}" allowBody="false">Clay
 template application - Page 3</span></h3>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/templates/standard.html
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/templates/standard.html?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/templates/standard.html (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/templates/standard.html Fri Jan 26 07:52:18 2007
@@ -1,4 +1,21 @@
 <html>
+<!--
+	/*
+	* Copyright 2006 The Apache Software Foundation.
+	*
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	*
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	*
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title><span jsfid="outputText" value="@title"></span></title>

Modified: shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/theme/styles.css
URL: http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/theme/styles.css?view=diff&rev=500269&r1=500268&r2=500269
==============================================================================
--- shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/theme/styles.css (original)
+++ shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/theme/styles.css Fri Jan 26 07:52:18 2007
@@ -1,3 +1,18 @@
+/*
+* Copyright 2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 @CHARSET "ISO-8859-1";
 
 html {
@@ -538,4 +553,4 @@
 
 #leftcol a a:visited a:hover {
 	background-color: transparent;
-}
\ No newline at end of file
+}