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 2012/11/02 01:42:21 UTC

[2/2] git commit: Slight refactoring

Slight refactoring


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/97af1283
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/97af1283
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/97af1283

Branch: refs/heads/5.4-js-rewrite
Commit: 97af12836cc176ad3380b32588c25d1d9b3f2ad8
Parents: b70bcee
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Nov 1 16:51:22 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Nov 1 16:51:22 2012 -0700

----------------------------------------------------------------------
 .../apache/tapestry5/services/TapestryModule.java  |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/97af1283/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
index 6d5f82c..8dba498 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
@@ -2582,21 +2582,20 @@ public final class TapestryModule
     /**
      * Contributes:
      * <dl>
+     * <dt>Core</dt>
+     * <dd>Built in messages used by Tapestry's default validators and components</dd>
      * <dt>AppCatalog</dt>
      * <dd>The Resource defined by {@link SymbolConstants#APPLICATION_CATALOG}</dd>
-     * <dt>Core</dt>
-     * <dd>Built in messages used by Tapestry's default validators and components (before:AppCatalog)</dd>
      * <dt>
      *
      * @since 5.2.0
      */
-    public static void contributeComponentMessagesSource(AssetSource assetSource,
+    @Contribute(ComponentMessagesSource.class)
+    public static void setupGlobalMessageCatalog(AssetSource assetSource,
                                                          @Symbol(SymbolConstants.APPLICATION_CATALOG)
                                                          Resource applicationCatalog, OrderedConfiguration<Resource> configuration)
     {
-        configuration.add("Core",
-                assetSource.resourceForPath("org/apache/tapestry5/core.properties"),
-                "before:AppCatalog");
+        configuration.add("Core", assetSource.resourceForPath("org/apache/tapestry5/core.properties"));
         configuration.add("AppCatalog", applicationCatalog);
     }