You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/09/04 03:14:05 UTC
svn commit: r992518 - in
/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources:
./ src/main/resources/pages/ src/main/webapp/
Author: hlship
Date: Sat Sep 4 01:14:05 2010
New Revision: 992518
URL: http://svn.apache.org/viewvc?rev=992518&view=rev
Log:
TAP5-1266: Bring quickstart archetype up to date in several ways
Added:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/About.tml
- copied, changed from r992517, tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Contact.tml
- copied, changed from r992517, tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.tml
- copied, changed from r992517, tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
Removed:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
Modified:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
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=992518&r1=992517&r2=992518&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 Sep 4 01:14:05 2010
@@ -25,12 +25,10 @@ of testing facilities designed for use w
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
<scope>test</scope>
</dependency>
- <!-- tapestry-test will conflict with RunJettyRun inside Eclipse. tapestry-test brings in Selenium, which
- is based on Jetty 5.1; RunJettyRun uses Jetty 6.
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
@@ -38,8 +36,6 @@ of testing facilities designed for use w
<scope>test</scope>
</dependency>
- -->
-
<!-- Provided by the servlet container, but sometimes referenced in the application
code. -->
<dependency>
@@ -67,7 +63,7 @@ of testing facilities designed for use w
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.9</version>
+ <version>6.1.16</version>
<configuration>
<!-- Log to the console. -->
<requestLog implementation="org.mortbay.jetty.NCSARequestLog">
@@ -99,14 +95,9 @@ of testing facilities designed for use w
<!-- This repository is only needed when the tapestry-release-version is a snapshot release. -->
<repository>
- <id>tapestry-snapshots</id>
+ <id>apache-snapshots</id>
<url>http://repository.apache.org/snapshots/</url>
</repository>
-
- <repository>
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
</repositories>
<pluginRepositories>
@@ -114,7 +105,7 @@ of testing facilities designed for use w
<!-- As above, this can be commented out when access to the snapshot version
of a Tapestry Maven plugin is not required. -->
<pluginRepository>
- <id>tapestry-snapshots</id>
+ <id>apache-snapshots</id>
<url>http://repository.apache.org/snapshots/</url>
</pluginRepository>
Copied: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/About.tml (from r992517, tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/About.tml?p2=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/About.tml&p1=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml&r1=992517&r2=992518&rev=992518&view=diff
==============================================================================
(empty)
Copied: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Contact.tml (from r992517, tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Contact.tml?p2=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Contact.tml&p1=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml&r1=992517&r2=992518&rev=992518&view=diff
==============================================================================
(empty)
Copied: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.tml (from r992517, 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/resources/pages/Index.tml?p2=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/pages/Index.tml&p1=tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml&r1=992517&r2=992518&rev=992518&view=diff
==============================================================================
(empty)