You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2009/01/31 21:40:55 UTC

svn commit: r739599 - in /tapestry/tapestry5/trunk: ./ quickstart/ quickstart/src/main/resources/ quickstart/src/main/resources/META-INF/ quickstart/src/main/resources/META-INF/maven/ quickstart/src/main/resources/archetype-resources/ quickstart/src/ma...

Author: hlship
Date: Sat Jan 31 20:40:54 2009
New Revision: 739599

URL: http://svn.apache.org/viewvc?rev=739599&view=rev
Log:
TAP5-458: Tapestry quickstart should include a basic, but visually pleasing, Layout component
TAP5-484: Quickstart should include a test scope dependency on EasyMock
TAP5-491: Quickstart archetype build should generate an archetype-catalog.xml into Tapestry360's maven-repository or maven-snapshot-repository, to faciliate the use of the mvn archetype:generate goal
TAP5-481: Quickstart archetype should include a test scope dependency on tapestry-test
TAP5-479: Quickstart archetype should include a basic site.xml and index.apt

Added:
    tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-catalog.xml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.properties
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img01.jpg   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img02.jpg   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img03.jpg   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img04.jpg   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img05.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img06.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img07.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img08.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img09.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img10.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img11.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img12.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img13.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img14.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img15.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img16.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img17.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img18.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img19.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img20.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/spacer.gif   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt   (with props)
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/index.apt
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/site.xml
Removed:
    tapestry/tapestry5/trunk/quickstart/.project
    tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/archetype.xml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.project
Modified:
    tapestry/tapestry5/trunk/pom.xml
    tapestry/tapestry5/trunk/quickstart/pom.xml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Sat Jan 31 20:40:54 2009
@@ -332,8 +332,8 @@
         </profile>
 
         <profile>
-            <!-- bamboo: running inside the Bamboo CI server and deploying to the snapshot repository and nightly web site. -->
-            <id>bamboo</id>
+            <!-- ci: Running inside the Bamboo CI server and deploying to the snapshot repository and nightly web site. -->
+            <id>ci</id>
             <distributionManagement>
                 <repository>
                     <id>tapestry</id>
@@ -422,7 +422,7 @@
     <distributionManagement>
         <site>
             <id>tapestry</id>
-            <url>scpexe://people.apache.org/www/tapestry.apache.org/tapestry5/</url>
+            <url>scpexe://people.apache.org/www/tapestry.apache.org/tapestry5.1/</url>
         </site>
         <repository>
             <id>tapestry</id>

Modified: tapestry/tapestry5/trunk/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/pom.xml?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/pom.xml (original)
+++ tapestry/tapestry5/trunk/quickstart/pom.xml Sat Jan 31 20:40:54 2009
@@ -4,6 +4,13 @@
     <groupId>org.apache.tapestry</groupId>
     <artifactId>quickstart</artifactId>
     <packaging>maven-plugin</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.4</version>
+        </dependency>
+    </dependencies>
     <parent>
         <groupId>org.apache.tapestry</groupId>
         <artifactId>tapestry-project</artifactId>
@@ -12,7 +19,45 @@
     <name>Tapestry 5 Quickstart Archetype</name>
     <inceptionYear>2007</inceptionYear>
     <url>http://tapestry.apache.org/tapestry5/${pom.artifactId}/</url>
-    <description>Archetype for creating a basic Tapestry 5 application, including Eclipse control
-        files.
-    </description>
+    <description>Archetype for creating a basic Tapestry 5 application.</description>
+
+    <profiles>
+        <profile>
+            <id>ci</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.2</version>
+                        <executions>
+                            <execution>
+                                <phase>deploy</phase>
+                                <configuration>
+
+                                    <tasks>
+                                        <echo>Copying Archetype Catalog to /var/www/maven-snapshot-repository</echo>
+                                        <copy todir="/var/www/maven-snapshot-repository" overwrite="true">
+                                            <fileset dir="src/main/resources" includes="*catalog.xml"/>
+                                            <filterset>
+                                                <filter token="project.version" value="${project.version}"/>
+                                            </filterset>
+                                        </copy>
+                                    </tasks>
+
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml Sat Jan 31 20:40:54 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor name="Tapestry 5 Quickstart Project">
+    <fileSets>
+        <fileSet filtered="true" packaged="true">
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+
+        <!-- Currently just a placeholder. -->
+        <fileSet filtered="true" packaged="false">
+            <directory>src/test/java</directory>
+        </fileSet>
+
+        <fileSet filtered="true">
+            <directory>src/main/webapp</directory>
+            <excludes>
+                <exclude>*.ico</exclude>
+                <exclude>**/*.jpg</exclude>
+                <exclude>**/*.gif</exclude>
+            </excludes>
+        </fileSet>
+
+        <!-- Don't want to filter binary files. -->
+
+        <fileSet filtered="false">
+            <directory>src/main/webapp</directory>
+            <includes>
+                <include>*.ico</include>
+                <include>**/*.jpg</include>
+                <include>**/*.gif</include>
+            </includes>
+        </fileSet>
+
+        <!-- This needs to stay at the root. -->
+        <fileSet filtered="true" packaged="false">
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>log4j.properties</include>
+            </includes>
+        </fileSet>
+
+        <!-- The rest should be packaged. -->
+        <fileSet filtered="true" packaged="true">
+            <directory>src/main/resources</directory>
+            <excludes>
+                <exclude>log4j.properties</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet filtered="true" packaged="false">
+            <directory>src/test/resources</directory>
+        </fileSet>
+
+        <fileSet filtered="true" packaged="false">
+            <directory>src/site</directory>
+        </fileSet>
+
+    </fileSets>
+</archetype-descriptor>
\ No newline at end of file

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-catalog.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-catalog.xml?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-catalog.xml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-catalog.xml Sat Jan 31 20:40:54 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-catalog>
+    <archetypes>
+        <archetype>
+            <groupId>org.apache.tapestry</groupId>
+            <artifactId>quickstart</artifactId>
+            <version>@project.version@</version>
+            <repository>http://tapestry.formos.com/maven-snapshot-repository</repository>
+            <description>Tapestry @project.version@ Quickstart Project</description>
+        </archetype>
+    </archetypes>
+</archetype-catalog>
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml Sat Jan 31 20:40:54 2009
@@ -6,13 +6,13 @@
     <version>${version}</version>
     <packaging>war</packaging>
     <name>${artifactId} Tapestry 5 Application</name>
+#set( $D = '$' )    
     <dependencies>
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-core</artifactId>
-            <version>${tapestry-release-version}</version>
+            <version>${D}{tapestry-release-version}</version>
         </dependency>
-
         <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the tests)
 will fail, preventing Maven from packaging the WAR. Tapestry includes a large number
 of testing facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
@@ -24,6 +24,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tapestry</groupId>
+            <artifactId>tapestry-test</artifactId>
+            <version>${D}{tapestry-release-version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Provided by the servlet container, but sometimes referenced in the application
        code. -->
         <dependency>
@@ -71,9 +85,9 @@
             <plugin>
                 <groupId>org.apache.tapestry</groupId>
                 <artifactId>tapestry-component-report</artifactId>
-                <version>${tapestry-release-version}</version>
+                <version>${D}{tapestry-release-version}</version>
                 <configuration>
-                    <rootPackage>${packageName}</rootPackage>
+                    <rootPackage>${package}</rootPackage>
                 </configuration>
             </plugin>
         </plugins>

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java Sat Jan 31 20:40:54 2009
@@ -0,0 +1,16 @@
+package ${package}.components;
+
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.BindingConstants;
+
+/**
+ * Layout component for pages of application ${artifactId}.
+ */
+@IncludeStylesheet("context:layout/layout.css")
+public class Layout
+{
+    /** The page title, for the <title> element and the <h1> element. */
+    @Property
+    @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL)
+    private String title;
+}

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java Sat Jan 31 20:40:54 2009
@@ -1,4 +1,4 @@
-package ${packageName}.pages;
+package ${package}.pages;
 
 import java.util.Date;
 

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java Sat Jan 31 20:40:54 2009
@@ -1,4 +1,4 @@
-package ${packageName}.services;
+package ${package}.services;
 
 import java.io.IOException;
 

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml Sat Jan 31 20:40:54 2009
@@ -0,0 +1,213 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+
+Title      : Concrete
+Version    : 1.0
+Released   : 20080825
+Description: A Web 2.0 design with fluid width suitable for blogs and small websites.
+
+-->
+#set( $D = '$' )
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
+      xmlns:p="tapestry:parameter">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+        <title>${D}{title}</title>
+        <meta name="keywords" content=""/>
+        <meta name="description" content=""/>
+        <link href="default.css" rel="stylesheet" type="text/css" media="screen"/>
+    </head>
+    <body>
+        <!-- start header -->
+        <div id="header">
+            <div id="logo">
+                <h1>
+                    <t:pagelink page="index">${groupId}:${artifactId}</t:pagelink>
+                </h1>
+            </div>
+            <div id="menu">
+                <ul>
+                    <li class="current_page_item">
+                        <t:pagelink page="index">Home</t:pagelink>
+                    </li>
+                    <li>
+                        <a href="#">About</a>
+                    </li>
+                    <li class="last">
+                        <a href="#">Contact</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <!-- end header -->
+        <!-- start page -->
+        <div id="page">
+            <!-- start sidebar -->
+            <div id="sidebar">
+                <ul>
+                    <li id="search" style="background: none;">
+                        <form id="searchform" method="get" action="">
+                            <div>
+                                <input type="text" name="s" id="s" size="15"/>
+                                <br/>
+                                <input type="submit" value="Search"/>
+                            </div>
+                        </form>
+                    </li>
+                    <li id="categories">
+                        <h2>Categories</h2>
+                        <ul>
+                            <li>
+                                <a href="#">Lorem Ipsum</a>
+                                (1)
+                            </li>
+                            <li>
+                                <a href="#">Uncategorized</a>
+                                (4)
+                            </li>
+                        </ul>
+                    </li>
+                    <li>
+                        <h2>Lorem Ipsum Dolor</h2>
+                        <ul>
+                            <li>
+                                <a href="#">Nulla luctus eleifend purus</a>
+                            </li>
+                            <li>
+                                <a href="#">Praesent scelerisque scelerisque</a>
+                            </li>
+                            <li>
+                                <a href="#">Ut nonummy rutrum sem</a>
+                            </li>
+                            <li>
+                                <a href="#">Pellentesque tempus quis nulla</a>
+                            </li>
+                            <li>
+                                <a href="#">Fusce ultrices fringilla metus</a>
+                            </li>
+                            <li>
+                                <a href="#">Praesent mattis condimentum</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <li>
+                        <h2>Lorem Ipsum Dolor</h2>
+                        <ul>
+                            <li>
+                                <a href="#">Nulla luctus eleifend purus</a>
+                            </li>
+                            <li>
+                                <a href="#">Praesent scelerisque scelerisque</a>
+                            </li>
+                            <li>
+                                <a href="#">Ut nonummy rutrum sem</a>
+                            </li>
+                            <li>
+                                <a href="#">Pellentesque tempus quis nulla</a>
+                            </li>
+                            <li>
+                                <a href="#">Fusce ultrices fringilla metus</a>
+                            </li>
+                            <li>
+                                <a href="#">Praesent mattis condimentum</a>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+            </div>
+            <!-- end sidebar -->
+            <!-- start content -->
+            <div id="content">
+
+                <div class="post">
+                    <div class="title">
+                        <h2>${D}{title}</h2>
+                    </div>
+                    <div class="entry">
+                        <t:body/>
+                    </div>
+                </div>
+
+                <!-- The rest of the template is placeholder text that can easily be removed. -->
+
+
+                <div class="post">
+                    <div class="title">
+                        <h2>
+                            <a href="#">Etiam rhoncus volutpat</a>
+                        </h2>
+                        <p>
+                            <small>Posted on August 20th, 2007 by
+                                <a href="#">Free CSS Templates</a>
+                            </small>
+                        </p>
+                    </div>
+                    <div class="entry">
+                        <p>Maecenas pede nisl, elementum eu, ornare ac, malesuada at, erat. Proin gravida orci porttitor
+                            enim accumsan lacinia. Donec condimentum, urna non molestie semper, ligula enim ornare nibh,
+                            quis laoreet eros quam eget ante. Aliquam libero. Vivamus nisl nibh, iaculis vitae, viverra
+                            sit amet, ullamcorper vitae, turpis. Aliquam erat volutpat. Vestibulum dui sem, pulvinar
+                            sed, imperdiet nec, iaculis nec, leo. Fusce odio.
+                        </p>
+                        <p>Etiam arcu dui, faucibus eget, placerat vel, sodales eget, orci. Donec ornare neque ac sem.
+                            Mauris aliquet. Aliquam sem leo, vulputate sed, convallis at, ultricies quis, justo. Donec
+                            nonummy magna quis risus. Quisque eleifend. Phasellus tempor vehicula justo. Aliquam lacinia
+                            metus ut elit. Suspendisse iaculis mauris nec lorem.
+                            <br/>
+                        </p>
+                    </div>
+                    <p class="links">
+                        <a href="#" class="more">Read More</a>
+                        <a href="#" class="comments">No Comments</a>
+                    </p>
+                </div>
+                <div class="post">
+                    <div class="title">
+                        <h2>
+                            <a href="#">Praesent condimentum</a>
+                        </h2>
+                        <p>
+                            <small>Posted on August 20th, 2007 by
+                                <a href="#">Free CSS Templates</a>
+                            </small>
+                        </p>
+                    </div>
+                    <div class="entry">
+                        <p>Etiam arcu dui, faucibus eget, placerat vel, sodales eget, orci. Donec ornare neque ac sem.
+                            Mauris aliquet. Aliquam sem leo, vulputate sed, convallis at, ultricies quis, justo. Donec
+                            nonummy magna quis risus. Quisque eleifend. Phasellus tempor vehicula justo. Aliquam lacinia
+                            metus ut elit. Suspendisse iaculis mauris nec lorem.
+                            <br/>
+                        </p>
+                    </div>
+                    <p class="links">
+                        <a href="#" class="more">Read More</a>
+                        <a href="#" class="comments">No Comments</a>
+                    </p>
+                </div>
+            </div>
+            <!-- end content -->
+            <br style="clear: both;"/>
+        </div>
+        <!-- end page -->
+        <!-- start footer -->
+        <div id="footer">
+
+            <p class="legal">
+                &copy;2009 ${groupId}. All Rights Reserved.
+                &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+                Design by
+                <a href="http://www.freecsstemplates.org/">Free CSS Templates</a>
+                &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+                Icons by
+                <a href="http://famfamfam.com/">FAMFAMFAM</a>.
+            </p>
+        </div>
+        <!-- end footer -->
+    </body>
+</html>

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml
------------------------------------------------------------------------------
    svn:executable = *

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties Sat Jan 31 20:40:54 2009
@@ -10,7 +10,7 @@
 
 # Service category names are the name of the defining module class
 # and then the service id.
-log4j.category.${packageName}.services.AppModule.TimingFilter=info
+log4j.category.${package}.services.AppModule.TimingFilter=info
 
 # Outputs a list of pages, components and mixins at startup.
 log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info
@@ -24,21 +24,21 @@
 # will show all of the code changes that occur when the
 # class is loaded.
 
-# log4j.category.tapestry.transformer.${packageName}.pages.Index=debug
+# log4j.category.tapestry.transformer.${package}.pages.Index=debug
 
 # Turning on debug mode for a component's events logger will show all the events triggered on the
 # component, and which component methods are invoked as a result.
 
-# log4j.category.tapestry.events.${packageName}.pages.Index=debug
+# log4j.category.tapestry.events.${package}.pages.Index=debug
 
 # Turning on trace mode for a page's render logger provides extended information about every step
 # in rendering (this is not generally helpful).  Turning on debug mode will add a one-line
 # summary that includes the elapsed render time, which can be useful in tracking down
 # performance issues.
 
-# log4j.category.tapestry.render.${packageName}.pages.Index=debug
+# log4j.category.tapestry.render.${package}.pages.Index=debug
 
 # Turn on some verbose debugging about everything in the application. This is nice initially,
 # while getting everything set up.  You'll probably want to remove this once you are 
 # up and running, replacing it with more selective debugging output.
-log4j.category.${packageName}=debug
\ No newline at end of file
+log4j.category.${package}=debug
\ No newline at end of file

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.properties?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.properties (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.properties Sat Jan 31 20:40:54 2009
@@ -0,0 +1 @@
+greeting=Welcome to Tapestry 5!  We hope that this project template will get you going in style.
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml Sat Jan 31 20:40:54 2009
@@ -1,18 +1,20 @@
-<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-    <head>
-        <title>${artifactId} Start Page</title>
-    </head>
-    <body>
-        <h1>${artifactId} Start Page</h1>
-
-        <p> This is the start page for this application, a good place to start your modifications.
-            Just to prove this is live: </p>
-
-        <p> The current time is: ${currentTime}. </p>
-
-
-        <p>
-            [<t:pagelink t:page="Index">refresh</t:pagelink>]
-        </p>
-    </body>
+<html t:type="layout" title="${artifactId} Home Page"
+      xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
+      xmlns:p="tapestry:parameter">
+#set( $D = '$' )
+    <!-- Most of the page content, including <head>, <body>, etc. tags, comes from Layout.tml -->
+
+    <p>${D}{message:greeting}</p>
+
+    <p>
+        Just to prove this is live:
+    </p>
+
+    <p>The current time is: ${D}{currentTime}.</p>
+
+
+    <p>
+        [<t:pagelink t:page="Index">refresh</t:pagelink>]
+    </p>
+
 </html>

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=739599&r1=739598&r2=739599&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Sat Jan 31 20:40:54 2009
@@ -24,7 +24,7 @@
         <!-- The only significant configuration for Tapestry 5, this informs Tapestry
 of where to look for pages, components and mixins. -->
         <param-name>tapestry.app-package</param-name>
-        <param-value>${packageName}</param-value>
+        <param-value>${package}</param-value>
     </context-param>
     <filter>
         <filter-name>app</filter-name>

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img01.jpg
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img01.jpg?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img01.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img01.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img02.jpg
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img02.jpg?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img02.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img02.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img03.jpg
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img03.jpg?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img03.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img03.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img04.jpg
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img04.jpg?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img04.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img04.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img05.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img05.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img05.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img05.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img06.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img06.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img06.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img06.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img07.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img07.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img07.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img07.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img08.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img08.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img08.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img08.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img09.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img09.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img09.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img09.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img10.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img10.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img10.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img10.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img11.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img11.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img11.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img11.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img12.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img12.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img12.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img12.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img13.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img13.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img13.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img13.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img14.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img14.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img14.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img14.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img15.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img15.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img15.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img15.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img16.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img16.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img16.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img17.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img17.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img17.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img17.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img18.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img18.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img18.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img18.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img19.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img19.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img19.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img19.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img20.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img20.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img20.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/img20.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/spacer.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/spacer.gif?rev=739599&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/spacer.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/images/spacer.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css Sat Jan 31 20:40:54 2009
@@ -0,0 +1,364 @@
+/*
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+*/
+
+body {
+	margin: 0;
+	padding: 0;
+	background: #FFFFFF url(images/img01.jpg) repeat-x;
+	text-align: justify;
+	font: 15px Arial, Helvetica, sans-serif;
+	color: #626262;
+}
+
+form {
+	margin: 0;
+	padding: 0;
+}
+
+input {
+	padding: 5px;
+	background: #FEFEFE url(images/img13.gif) repeat-x;
+	border: 1px solid #626262;
+	font: normal 1em Arial, Helvetica, sans-serif;
+}
+
+h1, h1 a, h2, h2 a, h3, h3 a {
+	margin: 0;
+	text-decoration: none;
+	font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
+	font-weight: normal;
+	color: #444444;
+}
+
+h1 {
+	letter-spacing: -1px;
+	font-size: 2.2em;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+h2 {
+	letter-spacing: -1px;
+	font-size: 2em;
+}
+
+h3 {
+	font-size: 1em;
+}
+
+p, ol, ul {
+	margin-bottom: 2em;
+	line-height: 200%;
+}
+
+blockquote {
+	margin: 0 0 0 1.5em;
+	padding-left: 1em;
+	border-left: 5px solid #DDDDDD;
+}
+
+a {
+	color: #1692B8;
+}
+
+a:hover {
+	text-decoration: none;
+}
+
+/* Header */
+
+#header {
+	height: 42px;
+}
+
+#logo h1, #logo p {
+	float: left;
+	text-transform: lowercase;
+}
+
+#logo h1 {
+	padding: 0px 0 0 40px;
+}
+
+#logo p {
+	margin: 0;
+	padding: 14px 0 0 4px;
+	line-height: normal;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+}
+
+#logo a {
+	text-decoration: none;
+	color: #D0C7A6;
+}
+
+#menu {
+	float: right;
+}
+
+#menu ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#menu li {
+	display: block;
+	float: left;
+	height: 42px;
+}
+
+#menu a {
+	display: block;
+	padding: 8px 20px 0px 20px;
+	text-decoration: none;
+	text-align: center;
+	text-transform: lowercase;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: normal;
+	font-size: 14px;
+	color: #CEC5A4;
+}
+
+#menu .last {
+	margin-right: 20px;
+}
+
+#menu a:hover {
+	color: #FFFFFF;
+}
+
+#menu .current_page_item {
+}
+
+#menu .current_page_item a {
+}
+
+/* Page */
+
+#page {
+	padding: 40px 40px 0 40px;
+}
+
+/* Content */
+
+#content {
+	margin-right: 340px;
+}
+
+.post {
+	margin-bottom: 10px;
+}
+
+.post .title {
+	border-bottom: 1px #999999 dashed;
+	font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
+}
+
+.post .title h2 {
+	padding: 30px 30px 0 0px;
+	text-transform: lowercase;
+	font-weight: normal;
+	font-size: 2.2em;
+}
+
+.post .title p {
+	margin: 0;
+	padding: 0 0 10px 0px;
+	line-height: normal;
+	color: #BABABA;
+}
+
+.post .title p a {
+	color: #BABABA;
+}
+
+.post .entry {
+	padding: 20px 0px 20px 0px;
+}
+
+.post .links {
+	margin: 0;
+	padding: 0 30px 30px 0px;
+}
+
+.post .links a {
+	display: block;
+	float: left;
+	margin-right: 10px;
+	margin-bottom: 5px;
+	text-align: center;
+	text-decoration: none;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+
+.post .links a:hover {
+}
+
+.post .links .more {
+	width: 128px;
+	height: 30px;
+	background: url(images/img03.jpg) no-repeat left center;
+}
+
+.post .links .comments {
+	width: 152px;
+	height: 30px;
+	background: url(images/img04.jpg) no-repeat left center;
+}
+
+/* Sidebar */
+
+#sidebar {
+	float: right;
+	width: 300px;
+	margin-top: 30px;
+}
+
+#sidebar ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#sidebar li {
+	margin-bottom: 10px;
+	background: url(images/img10.gif) no-repeat left bottom;
+}
+
+#sidebar li ul {
+	padding: 0 30px 40px 30px;
+}
+
+#sidebar li li {
+	margin: 0;
+	padding-left: 20px;
+	background: url(images/img11.gif) no-repeat 5px 50%;
+}
+
+#sidebar h2 {
+	padding: 30px 30px 20px 30px;
+	background: url(images/img09.gif) no-repeat;
+	text-transform: lowercase;
+	font-weight: normal;
+	font-size: 1.6em;
+	color: #302D26;
+}
+
+
+/* Search */
+
+#search {
+	padding: 20px 30px 40px 30px;
+}
+
+#search input {
+	padding: 0;
+	width: 70px;
+	height: 29px;
+	background: #DFDFDF url(images/img14.gif) repeat-x;
+	font-weight: bold;
+}
+
+#search #s {
+	padding: 5px;
+	width: 150px;
+	height: auto;
+	background: #FEFEFE url(images/img13.gif) repeat-x;
+	border: 1px solid #626262;
+	font: normal 1em Arial, Helvetica, sans-serif;
+}
+
+#search br {
+	display: none;
+}
+
+/* Categories */
+
+#sidebar #categories li {
+	background: url(images/img12.gif) no-repeat left center;
+}
+
+/* Calendar */
+
+#calendar_wrap {
+	padding: 0 30px 40px 30px;
+}
+
+#calendar table {
+	width: 100%;
+	text-align: center;
+}
+
+#calendar thead {
+	background: #F1F1F1;
+}
+
+#calendar tbody td {
+	border: 1px solid #F1F1F1;
+}
+
+#calendar #prev {
+	text-align: left;
+}
+
+#calendar #next {
+	text-align: right;
+}
+
+#calendar tfoot a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+#calendar #today {
+	background: #FFF3A7;
+	border: 1px solid #EB1400;
+	font-weight: bold;
+	color: #EB1400
+}
+
+/* Footer */
+
+#footer {
+	padding: 70px 0 50px 0;
+	background: #757575 url(images/img08.gif) repeat-x;
+}
+
+#footer p {
+	margin-bottom: 1em;
+	text-align: center;
+	line-height: normal;
+	font-size: .9em;
+	color: #BABABA;
+}
+
+#footer a {
+	padding: 0 20px;
+	text-decoration: none;
+	color: #DDDDDD;
+}
+
+#footer a:hover {
+	color: #FFFFFF;
+}
+
+#footer .rss {
+	background: url(images/img18.gif) no-repeat left center;
+}
+
+#footer .xhtml {
+	background: url(images/img19.gif) no-repeat left center;
+}
+
+#footer .css {
+	background: url(images/img20.gif) no-repeat left center;
+}
+
+#footer .legal a {
+	padding: 0;
+}
\ No newline at end of file

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css
------------------------------------------------------------------------------
    svn:executable = *

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt Sat Jan 31 20:40:54 2009
@@ -0,0 +1,243 @@
+Creative Commons </>
+
+Creative Commons Legal Code
+
+*Attribution 2.5*
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
+ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
+INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ITS USE.
+
+/License/
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
+RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
+AND CONDITIONS.
+
+*1. Definitions*
+
+   1. *"Collective Work"* means a work, such as a periodical issue,
+      anthology or encyclopedia, in which the Work in its entirety in
+      unmodified form, along with a number of other contributions,
+      constituting separate and independent works in themselves, are
+      assembled into a collective whole. A work that constitutes a
+      Collective Work will not be considered a Derivative Work (as
+      defined below) for the purposes of this License.
+   2. *"Derivative Work"* means a work based upon the Work or upon the
+      Work and other pre-existing works, such as a translation, musical
+      arrangement, dramatization, fictionalization, motion picture
+      version, sound recording, art reproduction, abridgment,
+      condensation, or any other form in which the Work may be recast,
+      transformed, or adapted, except that a work that constitutes a
+      Collective Work will not be considered a Derivative Work for the
+      purpose of this License. For the avoidance of doubt, where the
+      Work is a musical composition or sound recording, the
+      synchronization of the Work in timed-relation with a moving image
+      ("synching") will be considered a Derivative Work for the purpose
+      of this License.
+   3. *"Licensor"* means the individual or entity that offers the Work
+      under the terms of this License.
+   4. *"Original Author"* means the individual or entity who created the
+      Work.
+   5. *"Work"* means the copyrightable work of authorship offered under
+      the terms of this License.
+   6. *"You"* means an individual or entity exercising rights under this
+      License who has not previously violated the terms of this License
+      with respect to the Work, or who has received express permission
+      from the Licensor to exercise rights under this License despite a
+      previous violation.
+
+*2. Fair Use Rights.* Nothing in this license is intended to reduce,
+limit, or restrict any rights arising from fair use, first sale or other
+limitations on the exclusive rights of the copyright owner under
+copyright law or other applicable laws.
+
+*3. License Grant.* Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+   1. to reproduce the Work, to incorporate the Work into one or more
+      Collective Works, and to reproduce the Work as incorporated in the
+      Collective Works;
+   2. to create and reproduce Derivative Works;
+   3. to distribute copies or phonorecords of, display publicly, perform
+      publicly, and perform publicly by means of a digital audio
+      transmission the Work including as incorporated in Collective Works;
+   4. to distribute copies or phonorecords of, display publicly, perform
+      publicly, and perform publicly by means of a digital audio
+      transmission Derivative Works.
+   5.
+
+      For the avoidance of doubt, where the work is a musical composition:
+
+         1. *Performance Royalties Under Blanket Licenses*. Licensor
+            waives the exclusive right to collect, whether individually
+            or via a performance rights society (e.g. ASCAP, BMI,
+            SESAC), royalties for the public performance or public
+            digital performance (e.g. webcast) of the Work.
+         2. *Mechanical Rights and Statutory Royalties*. Licensor waives
+            the exclusive right to collect, whether individually or via
+            a music rights agency or designated agent (e.g. Harry Fox
+            Agency), royalties for any phonorecord You create from the
+            Work ("cover version") and distribute, subject to the
+            compulsory license created by 17 USC Section 115 of the US
+            Copyright Act (or the equivalent in other jurisdictions).
+   6. *Webcasting Rights and Statutory Royalties*. For the avoidance of
+      doubt, where the Work is a sound recording, Licensor waives the
+      exclusive right to collect, whether individually or via a
+      performance-rights society (e.g. SoundExchange), royalties for the
+      public digital performance (e.g. webcast) of the Work, subject to
+      the compulsory license created by 17 USC Section 114 of the US
+      Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights
+in other media and formats. All rights not expressly granted by Licensor
+are hereby reserved.
+
+*4. Restrictions.*The license granted in Section 3 above is expressly
+made subject to and limited by the following restrictions:
+
+   1. You may distribute, publicly display, publicly perform, or
+      publicly digitally perform the Work only under the terms of this
+      License, and You must include a copy of, or the Uniform Resource
+      Identifier for, this License with every copy or phonorecord of the
+      Work You distribute, publicly display, publicly perform, or
+      publicly digitally perform. You may not offer or impose any terms
+      on the Work that alter or restrict the terms of this License or
+      the recipients' exercise of the rights granted hereunder. You may
+      not sublicense the Work. You must keep intact all notices that
+      refer to this License and to the disclaimer of warranties. You may
+      not distribute, publicly display, publicly perform, or publicly
+      digitally perform the Work with any technological measures that
+      control access or use of the Work in a manner inconsistent with
+      the terms of this License Agreement. The above applies to the Work
+      as incorporated in a Collective Work, but this does not require
+      the Collective Work apart from the Work itself to be made subject
+      to the terms of this License. If You create a Collective Work,
+      upon notice from any Licensor You must, to the extent practicable,
+      remove from the Collective Work any credit as required by clause
+      4(b), as requested. If You create a Derivative Work, upon notice
+      from any Licensor You must, to the extent practicable, remove from
+      the Derivative Work any credit as required by clause 4(b), as
+      requested.
+   2. If you distribute, publicly display, publicly perform, or publicly
+      digitally perform the Work or any Derivative Works or Collective
+      Works, You must keep intact all copyright notices for the Work and
+      provide, reasonable to the medium or means You are utilizing: (i)
+      the name of the Original Author (or pseudonym, if applicable) if
+      supplied, and/or (ii) if the Original Author and/or Licensor
+      designate another party or parties (e.g. a sponsor institute,
+      publishing entity, journal) for attribution in Licensor's
+      copyright notice, terms of service or by other reasonable means,
+      the name of such party or parties; the title of the Work if
+      supplied; to the extent reasonably practicable, the Uniform
+      Resource Identifier, if any, that Licensor specifies to be
+      associated with the Work, unless such URI does not refer to the
+      copyright notice or licensing information for the Work; and in the
+      case of a Derivative Work, a credit identifying the use of the
+      Work in the Derivative Work (e.g., "French translation of the Work
+      by Original Author," or "Screenplay based on original Work by
+      Original Author"). Such credit may be implemented in any
+      reasonable manner; provided, however, that in the case of a
+      Derivative Work or Collective Work, at a minimum such credit will
+      appear where any other comparable authorship credit appears and in
+      a manner at least as prominent as such other comparable authorship
+      credit.
+
+*5. Representations, Warranties and Disclaimer*
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+*6. Limitation on Liability.* EXCEPT TO THE EXTENT REQUIRED BY
+APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL
+THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
+DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
+LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+*7. Termination*
+
+   1. This License and the rights granted hereunder will terminate
+      automatically upon any breach by You of the terms of this License.
+      Individuals or entities who have received Derivative Works or
+      Collective Works from You under this License, however, will not
+      have their licenses terminated provided such individuals or
+      entities remain in full compliance with those licenses. Sections
+      1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted
+      here is perpetual (for the duration of the applicable copyright in
+      the Work). Notwithstanding the above, Licensor reserves the right
+      to release the Work under different license terms or to stop
+      distributing the Work at any time; provided, however that any such
+      election will not serve to withdraw this License (or any other
+      license that has been, or is required to be, granted under the
+      terms of this License), and this License will continue in full
+      force and effect unless terminated as stated above.
+
+*8. Miscellaneous*
+
+   1. Each time You distribute or publicly digitally perform the Work or
+      a Collective Work, the Licensor offers to the recipient a license
+      to the Work on the same terms and conditions as the license
+      granted to You under this License.
+   2. Each time You distribute or publicly digitally perform a
+      Derivative Work, Licensor offers to the recipient a license to the
+      original Work on the same terms and conditions as the license
+      granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability
+      of the remainder of the terms of this License, and without further
+      action by the parties to this agreement, such provision shall be
+      reformed to the minimum extent necessary to make such provision
+      valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no
+      breach consented to unless such waiver or consent shall be in
+      writing and signed by the party to be charged with such waiver or
+      consent.
+   5. This License constitutes the entire agreement between the parties
+      with respect to the Work licensed here. There are no
+      understandings, agreements or representations with respect to the
+      Work not specified here. Licensor shall not be bound by any
+      additional provisions that may appear in any communication from
+      You. This License may not be modified without the mutual written
+      agreement of the Licensor and You.
+
+Creative Commons is not a party to this License, and makes no warranty
+whatsoever in connection with the Work. Creative Commons will not be
+liable to You or any party on any legal theory for any damages
+whatsoever, including without limitation any general, special,
+incidental or consequential damages arising in connection to this
+license. Notwithstanding the foregoing two (2) sentences, if Creative
+Commons has expressly identified itself as the Licensor hereunder, it
+shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work
+is licensed under the CCPL, neither party will use the trademark
+"Creative Commons" or any related trademark or logo of Creative Commons
+without the prior written consent of Creative Commons. Any permitted use
+will be in compliance with Creative Commons' then-current trademark
+usage guidelines, as may be published on its website or otherwise made
+available upon request from time to time.
+
+Creative Commons may be contacted at http://creativecommons.org/
+<http://creativecommons.org>.
+
+« Back to Commons Deed <./>

Propchange: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/license.txt
------------------------------------------------------------------------------
    svn:executable = *

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/index.apt?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/index.apt (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/apt/index.apt Sat Jan 31 20:40:54 2009
@@ -0,0 +1,9 @@
+ ----
+ Module ${groupId}:${artifactId}
+ ----
+
+${groupId}:${artifactId} Documentation
+
+  This is where you can start to document your module.
+
+  Create new files in the Maven APT format, and update the site.xml file to point to them.

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/site.xml?rev=739599&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/site.xml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/site/site.xml Sat Jan 31 20:40:54 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Generated site for ${artifactId}">
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <version/>
+
+    <body>
+
+        <menu name="${artifactId} Project">
+            <item name="About" href="index.html"/>
+        </menu>
+
+        <menu ref="reports"/>
+
+    </body>
+</project>