tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r653257 - in /tapestry/tapestry5/trunk: quickstart/src/main/resources/archetype-resources/pom.xml tapestry-tutorial1/pom.xml tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
Date Sun, 04 May 2008 17:44:58 GMT
Author: hlship
Date: Sun May  4 10:44:58 2008
New Revision: 653257

URL: http://svn.apache.org/viewvc?rev=653257&view=rev
Log:
TAPESTRY-2371: The QuickStart Archetype should lock down the version of Jetty used (to 6.0,
now that 7.0 snapshots are starting to turn up)

Modified:
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
    tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
    tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java

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=653257&r1=653256&r2=653257&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 Sun
May  4 10:44:58 2008
@@ -1,4 +1,5 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
@@ -41,6 +42,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.9</version>
                 <configuration>
                     <!-- Log to the console. -->
                     <requestLog implementation="org.mortbay.jetty.NCSARequestLog">

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml?rev=653257&r1=653256&r2=653257&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml Sun May  4 10:44:58 2008
@@ -1,4 +1,5 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tapestry</groupId>
     <artifactId>tutorial1</artifactId>
@@ -64,6 +65,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.9</version>
                 <configuration>
                     <!-- Log to the console. -->
                     <requestLog implementation="org.mortbay.jetty.NCSARequestLog">

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java?rev=653257&r1=653256&r2=653257&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
Sun May  4 10:44:58 2008
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry.tutorial.services;
 
+import org.apache.tapestry.TapestryConstants;
 import org.apache.tapestry.ioc.MappedConfiguration;
 import org.apache.tapestry.ioc.OrderedConfiguration;
 import org.apache.tapestry.ioc.annotations.Marker;
@@ -26,8 +27,8 @@
 import java.io.IOException;
 
 /**
- * This module is automatically included as part of the Tapestry IoC Registry, it's a good
place to
- * configure and extend Tapestry, or to place your own services.
+ * This module is automatically included as part of the Tapestry IoC Registry, it's a good
place to configure and extend
+ * Tapestry, or to place your own services.
  */
 @Marker(Local.class)
 public class AppModule
@@ -41,15 +42,15 @@
         // you can extend this list of locales (it's a comma seperated series of locale names;
         // the first locale name is the default when there's no reasonable match).
 
-        configuration.add("tapestry.supported-locales", "en");
+        configuration.add(TapestryConstants.SUPPORTED_LOCALES_SYMBOL, "en");
+        configuration.add(TapestryConstants.PRODUCTION_MODE_SYMBOL, "false");
     }
 
     /**
-     * This is a service definition, the service will be named TimingFilter. The interface,
-     * RequestFilter, is used within the RequestHandler service pipeline, which is built
from the
-     * RequestHandler service configuration. Tapestry IoC is responsible for passing in an
-     * appropriate Log instance. Requests for static resources are handled at a higher level,
so
-     * this filter will only be invoked for Tapestry related requests.
+     * This is a service definition, the service will be named TimingFilter. The interface,
RequestFilter, is used
+     * within the RequestHandler service pipeline, which is built from the RequestHandler
service configuration.
+     * Tapestry IoC is responsible for passing in an appropriate Log instance. Requests for
static resources are handled
+     * at a higher level, so this filter will only be invoked for Tapestry related requests.
      */
     public RequestFilter buildTimingFilter(final Logger logger)
     {
@@ -79,9 +80,8 @@
     }
 
     /**
-     * This is a contribution to the RequestHandler service configuration. This is how we
extend
-     * Tapestry using the timing filter. A common use for this kind of filter is transaction
-     * management or security.
+     * This is a contribution to the RequestHandler service configuration. This is how we
extend Tapestry using the
+     * timing filter. A common use for this kind of filter is transaction management or security.
      */
     public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
 



Mime
View raw message