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/12/31 02:28:38 UTC
[9/9] git commit: Rename the virtual folder used to access JavaScript
modules from "module-root" to "modules"
Updated Branches:
refs/heads/master 32848b2c3 -> 5c4ff6ad7
Rename the virtual folder used to access JavaScript modules from "module-root" to "modules"
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5c4ff6ad
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5c4ff6ad
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5c4ff6ad
Branch: refs/heads/master
Commit: 5c4ff6ad74cdd4ea0c7414303ee6c5bbfb511acd
Parents: da8633b
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sun Dec 30 17:28:31 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sun Dec 30 17:28:31 2012 -0800
----------------------------------------------------------------------
.../javascript/ModuleAssetRequestHandler.java | 2 +-
.../services/javascript/ModuleManagerImpl.java | 5 ++---
.../services/javascript/JavaScriptModule.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5c4ff6ad/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java
index 63580b8..68ce9f3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java
@@ -29,7 +29,7 @@ import org.apache.tapestry5.services.javascript.ModuleManager;
import java.io.IOException;
/**
- * Handler contributed to {@link AssetDispatcher} with key "module-root". It interprets the extra path as a module name,
+ * Handler contributed to {@link AssetDispatcher} with key "modules". It interprets the extra path as a module name,
* and searches for the corresponding JavaScript module.
*/
public class ModuleAssetRequestHandler implements AssetRequestHandler
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5c4ff6ad/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
index 5895d65..dd31e18 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
@@ -28,7 +28,6 @@ import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONLiteral;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.AssetSource;
-import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
import org.apache.tapestry5.services.assets.StreamableResourceSource;
import org.apache.tapestry5.services.javascript.JavaScriptModuleConfiguration;
@@ -57,7 +56,7 @@ public class ModuleManagerImpl implements ModuleManager
// Note: ConcurrentHashMap does not support null as a value, alas. We use classpathRoot as a null.
private final Map<String, Resource> cache = CollectionFactory.newConcurrentMap();
- public ModuleManagerImpl(AssetPathConstructor constructor, final ComponentClassResolver resolver, AssetSource assetSource,
+ public ModuleManagerImpl(AssetPathConstructor constructor, AssetSource assetSource,
@Path("${" + SymbolConstants.REQUIRE_JS + "}")
Asset requireJS,
Map<String, JavaScriptModuleConfiguration> configuration,
@@ -72,7 +71,7 @@ public class ModuleManagerImpl implements ModuleManager
this.globalMessages = globalMessages;
this.compactJSON = compactJSON;
- this.requireConfig = buildRequireJSConfig(constructor.constructAssetPath("module-root", ""), configuration, !productionMode);
+ this.requireConfig = buildRequireJSConfig(constructor.constructAssetPath("modules", ""), configuration, !productionMode);
classpathRoot = assetSource.resourceForPath("");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5c4ff6ad/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java
index ea05fa4..8d098cb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java
@@ -212,7 +212,7 @@ public class JavaScriptModule
@AssetRequestDispatcher
public static void handleModuleAssetRequests(MappedConfiguration<String, AssetRequestHandler> configuration)
{
- configuration.addInstance("module-root", ModuleAssetRequestHandler.class);
+ configuration.addInstance("modules", ModuleAssetRequestHandler.class);
}
@Contribute(ModuleManager.class)