Author: gvanmatre
Date: Fri Feb 23 20:01:56 2007
New Revision: 511204
URL: http://svn.apache.org/viewvc?view=rev&rev=511204
Log:
Applied several patches to the shale-clay-started-archetype submitted by Hermod
Opstvedt (SHALE-391).
Modified:
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/META-INF/archetype.xml
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/pom.xml
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/faces-config.xml
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified:
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/META-INF/archetype.xml?view=diff&rev=511204&r1=511203&r2=511204
==============================================================================
---
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/META-INF/archetype.xml
(original)
+++
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/META-INF/archetype.xml
Fri Feb 23 20:01:56 2007
@@ -44,9 +44,8 @@
<resource
filtered="false">src/main/webapp/WEB-INF/chain-config.xml</resource>
<resource
filtered="false">src/main/webapp/WEB-INF/clay-config.xml</resource>
<resource
filtered="false">src/main/webapp/WEB-INF/clay-views-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- <resource
filtered="false">src/main/webapp/WEB-INF/validator-rules.xml</resource>
<resource
filtered="false">src/main/webapp/WEB-INF/web.xml</resource>
+ <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
</resources>
</archetype>
Modified:
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=511204&r1=511203&r2=511204
==============================================================================
---
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
shale/sandbox/maven/archetypes/shale-clay-starter-archetype/src/main/resources/archetype-resources/pom.xml
Fri Feb 23 20:01:56 2007
@@ -63,7 +63,7 @@
<build>
- <finalName>projectname</finalName>
+ <finalName>${artifactId}</finalName>
<plugins>
<!-- usage: mvn package cargo:start -->
<plugin>
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=511204&r1=511203&r2=511204
==============================================================================
---
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 Feb 23 20:01:56 2007
@@ -1,51 +0,0 @@
-<?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">
- <chain name="preprocess">
-
- <!-- Perform remote request processing for matching
requests -->
- <!-- Successful match will terminate the processing
chain -->
-<!--
- <command
-
className="org.apache.commons.chain.generic.LookupCommand"
- catalogName="shale" name="remote"
optional="true" />
- -->
- <!-- This command is only needed for full clay html
views with myfaces -->
-
- <command
-
className="org.apache.shale.clay.faces.ClayViewHandlerCommand" />
-
- <!-- This filter command wakes up the watchdog
monitoring the Clay configuration files for change. -->
- <command
-
className="org.apache.shale.clay.config.beans.ConfigDefinitionsWatchdogFilter"
-
includes="\S*\.faces,\S*\.html,/index\.jsp,\S*\.xml" />
-
- <!-- Disallow direct access to JSP and JSFP resources
-->
-<!--
- <command
-
className="org.apache.shale.application.ContextRelativePathFilter"
-
includes="\S*\.xml,\S*\.faces,\S*\.html,\S*\.gif,\S*\.css,\S*\.png,\S*\.jpg,/index\.jsp"
- excludes="\S*\.jsp,\S*\.jspf" />
- -->
- </chain>
-
- </catalog>
-</catalogs>
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=511204&r1=511203&r2=511204
==============================================================================
---
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 Feb 23 20:01:56 2007
@@ -61,9 +61,9 @@
<!-- Backing bean for page1 -->
<managed-bean id="page1">
- <managed-bean-name>page2</managed-bean-name>
+ <managed-bean-name>page1</managed-bean-name>
<managed-bean-class>
- com.example.projectname.TestVC
+ $package$dotTestVC
</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
@@ -71,13 +71,13 @@
<managed-bean id="page2">
<managed-bean-name>page2</managed-bean-name>
<managed-bean-class>
- com.example.projectname.TestVC
+ $package$dotTestVC
</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>person</property-name>
<property-class>
- com.example.projectname.Person
+ $package$dotPerson
</property-class>
<value>#{person}</value>
</managed-property>
@@ -86,7 +86,7 @@
<managed-bean id="person">
<managed-bean-name>person</managed-bean-name>
<managed-bean-class>
- com.example.projectname.Person
+ $package$dotPerson
</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=511204&r1=511203&r2=511204
==============================================================================
---
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 Feb 23 20:01:56 2007
@@ -66,17 +66,17 @@
</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>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
<!-- JavaServer Faces Servlet Configuration -->
<servlet>
