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 2011/09/14 01:55:52 UTC
svn commit: r1170394 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
Author: hlship
Date: Tue Sep 13 23:55:52 2011
New Revision: 1170394
URL: http://svn.apache.org/viewvc?rev=1170394&view=rev
Log:
TAP5-1643: Allow slashes inside classpath asset aliases and paths
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java?rev=1170394&r1=1170393&r2=1170394&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java Tue Sep 13 23:55:52 2011
@@ -14,17 +14,17 @@
package org.apache.tapestry5.internal.services;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.util.AvailableValues;
import org.apache.tapestry5.ioc.util.UnknownValueException;
import org.apache.tapestry5.services.ClasspathAssetAliasManager;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
public class ClasspathAssetAliasManagerImpl implements ClasspathAssetAliasManager
{
private final AssetPathConstructor assetPathConstructor;
@@ -49,24 +49,19 @@ public class ClasspathAssetAliasManagerI
*/
public ClasspathAssetAliasManagerImpl(AssetPathConstructor assetPathConstructor,
- Map<String, String> configuration)
+ Map<String, String> configuration)
{
this.assetPathConstructor = assetPathConstructor;
for (Map.Entry<String, String> e : configuration.entrySet())
{
- String alias = withOutSlash(e.getKey());
+ String alias = verify("folder name", e.getKey());
- if (alias.contains("/"))
- throw new RuntimeException(String.format(
- "Virtual folder names (for component libraries) may no longer contain slashes as of Tapestry 5.2. "
- + "You must change the ComponentClassAsssetAliasManager contribution for '%s'.", alias));
- String path = withOutSlash(e.getValue());
+ String path = verify("path", e.getValue());
aliasToPathPrefix.put(alias, path);
pathPrefixToAlias.put(path, alias);
-
}
Comparator<String> sortDescendingByLength = new Comparator<String>()
@@ -84,6 +79,17 @@ public class ClasspathAssetAliasManagerI
Collections.sort(sortedPathPrefixes, sortDescendingByLength);
}
+ private String verify(String name, String input)
+ {
+
+ if (input.startsWith("/") || input.endsWith("/"))
+ throw new RuntimeException(String.format("Contribution of %s '%s' is invalid as it may not start with or end with a slash.",
+ name, input));
+
+ return input;
+
+ }
+
private String withOutSlash(String input)
{
if (input.endsWith("/"))
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java?rev=1170394&r1=1170393&r2=1170394&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java Tue Sep 13 23:55:52 2011
@@ -18,7 +18,6 @@ import org.apache.tapestry5.internal.ser
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.util.UnknownValueException;
-
import org.apache.tapestry5.services.ClasspathAssetAliasManager;
import org.apache.tapestry5.services.Request;
import org.testng.annotations.DataProvider;
@@ -34,9 +33,9 @@ public class ClasspathAssetAliasManagerI
{
Map<String, String> configuration = CollectionFactory.newMap();
- configuration.put("tapestry", "org/apache/tapestry5/");
- configuration.put("tapestry-internal", "org/apache/tapestry5/internal/");
- configuration.put("mylib/", "com/example/mylib/");
+ configuration.put("tapestry", "org/apache/tapestry5");
+ configuration.put("tapestry-internal", "org/apache/tapestry5/internal");
+ configuration.put("mylib", "com/example/mylib");
return configuration;
}
@@ -46,16 +45,15 @@ public class ClasspathAssetAliasManagerI
{
Map<String, String> configuration = CollectionFactory.newMap();
- configuration.put("old/style", "com/myco/old/style/library");
+ configuration.put("slash/at/end/", "com/myco/old/style/library");
try
{
new ClasspathAssetAliasManagerImpl(null, configuration);
unreachable();
- }
- catch (RuntimeException ex)
+ } catch (RuntimeException ex)
{
- assertMessageContains(ex, "change the ComponentClassAsssetAliasManager contribution for 'old/style'.");
+ assertMessageContains(ex, "Contribution of folder name 'slash/at/end/' is invalid as it may not start with or end with a slash");
}
}
@@ -103,8 +101,7 @@ public class ClasspathAssetAliasManagerI
{
manager.toClientURL("org/example/icons/flag.gif");
unreachable();
- }
- catch (UnknownValueException ex)
+ } catch (UnknownValueException ex)
{
assertMessageContains(ex, "Unable to create a client URL for classpath resource org/example/icons/flag.gif");
@@ -117,11 +114,11 @@ public class ClasspathAssetAliasManagerI
public Object[][] to_client_url_data()
{
return new Object[][]
- {
- { "com/example/mylib/Foo.bar", "mylib/Foo.bar" },
- { "com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar" },
- { "org/apache/tapestry5/internal/Foo.bar", "tapestry-internal/Foo.bar" },
- { "org/apache/tapestry5/Foo.bar", "tapestry/Foo.bar" }, };
+ {
+ {"com/example/mylib/Foo.bar", "mylib/Foo.bar"},
+ {"com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar"},
+ {"org/apache/tapestry5/internal/Foo.bar", "tapestry-internal/Foo.bar"},
+ {"org/apache/tapestry5/Foo.bar", "tapestry/Foo.bar"},};
}
}