You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2007/04/28 17:08:22 UTC
svn commit: r533354 - in /tapestry/tapestry4/trunk: ./ tapestry-framework/
tapestry-framework/src/descriptor/META-INF/
tapestry-framework/src/java/org/apache/tapestry/asset/
tapestry-framework/src/java/org/apache/tapestry/pageload/
tapestry-framework/s...
Author: jkuhnert
Date: Sat Apr 28 08:08:21 2007
New Revision: 533354
URL: http://svn.apache.org/viewvc?view=rev&rev=533354
Log:
Fixes TAPESTRY-1432 regression. New asset resolution changes didn't keep the resource parameter as the first argument to createAsset() and so completely broke the strategy pattern setup via hivemind.
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sat Apr 28 08:08:21 2007
@@ -279,7 +279,7 @@
<value>en_US</value>
</property>
</systemProperties>
- <parallel>tests</parallel>
+ <parallel>methods</parallel>
<threadCount>4</threadCount>
<excludedGroups>integration</excludedGroups>
</configuration>
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Sat Apr 28 08:08:21 2007
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.1</version>
+ <version>5.5</version>
<classifier>jdk15</classifier>
<scope>test</scope>
<exclusions>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml Sat Apr 28 08:08:21 2007
@@ -92,7 +92,6 @@
<strategy class="org.apache.hivemind.util.ClasspathResource" object="service:ClasspathAssetFactory"/>
<strategy class="ExternalResource" object="service:DefaultAssetFactory"/>
-
</contribution>
<service-point id="LookupAssetFactory" interface="AssetFactory">
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java Sat Apr 28 08:08:21 2007
@@ -64,7 +64,7 @@
* @throws org.apache.hivemind.ApplicationRuntimeException
* if no matching asset may be found.
*/
- IAsset createAsset(IComponentSpecification spec, Resource baseResource, String path, Locale locale, Location location);
+ IAsset createAsset(Resource baseResource, IComponentSpecification spec, String path, Locale locale, Location location);
/**
* Creates a new asset relative to the root of the domain defined by the type of asset.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java Sat Apr 28 08:08:21 2007
@@ -56,10 +56,10 @@
/**
* Finds an asset relative to the specified <code>base</code> resources OR {@link IComponentSpecification} passed in.
*
- * @param spec
- * The specification the resource may be relative to if not found relative to base.
* @param base
* The base resource used for resolving the asset
+ * @param spec
+ * The specification the resource may be relative to if not found relative to base.
* @param path
* the path relative to the base resource; alternately, the path may include a prefix
* that defines a domain (such as "classpath:" or "context:") in which case the base
@@ -72,5 +72,5 @@
*
* @return the asset, possibly localized
*/
- IAsset findAsset(IComponentSpecification spec, Resource base, String path, Locale locale, Location location);
+ IAsset findAsset(Resource base, IComponentSpecification spec, String path, Locale locale, Location location);
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java Sat Apr 28 08:08:21 2007
@@ -53,10 +53,10 @@
public IAsset findAsset(Resource base, String path, Locale locale, Location location)
{
- return findAsset(null, base, path, locale, location);
+ return findAsset(base, null, path, locale, location);
}
- public IAsset findAsset(IComponentSpecification spec, Resource base, String path, Locale locale, Location location)
+ public IAsset findAsset(Resource base, IComponentSpecification spec, String path, Locale locale, Location location)
{
Defense.notNull(path, "path");
Defense.notNull(location, "location");
@@ -99,7 +99,7 @@
// This can happen when a 3.0 DTD is read in
- return factory.createAsset(spec, assetBase, truePath, locale, location);
+ return factory.createAsset(assetBase, spec, truePath, locale, location);
}
AssetFactory findAssetFactory(IComponentSpecification spec, Resource baseResource, String path, Locale locale)
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java Sat Apr 28 08:08:21 2007
@@ -63,7 +63,7 @@
return localized != null;
}
- public IAsset createAsset(IComponentSpecification spec, Resource baseResource, String path, Locale locale, Location location)
+ public IAsset createAsset(Resource baseResource, IComponentSpecification spec, String path, Locale locale, Location location)
{
Resource asset = baseResource.getRelativeResource(path);
Resource localized = _localizer.findLocalization(asset, locale);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java Sat Apr 28 08:08:21 2007
@@ -77,7 +77,7 @@
return localized;
}
- public IAsset createAsset(IComponentSpecification spec, Resource baseResource, String path, Locale locale, Location location)
+ public IAsset createAsset(Resource baseResource, IComponentSpecification spec, String path, Locale locale, Location location)
{
Resource localized = findAsset(spec, baseResource, path, locale);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java Sat Apr 28 08:08:21 2007
@@ -47,7 +47,7 @@
}
}
- public IAsset createAsset(IComponentSpecification spec, Resource baseResource, String path, Locale locale, Location location)
+ public IAsset createAsset(Resource baseResource, IComponentSpecification spec, String path, Locale locale, Location location)
{
return new ExternalAsset(path, location);
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java Sat Apr 28 08:08:21 2007
@@ -651,7 +651,7 @@
IAssetSpecification assetSpec = specification.getAsset(name);
- IAsset asset = _assetSource.findAsset(specification, assetSpec.getLocation().getResource(),
+ IAsset asset = _assetSource.findAsset(assetSpec.getLocation().getResource(), specification,
assetSpec.getPath(), _locale, assetSpec.getLocation());
component.addAsset(name, asset);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java Sat Apr 28 08:08:21 2007
@@ -51,7 +51,7 @@
Resource base = newBaseResource();
- IAsset asset = factory.createAsset(spec, base, "relative-resource.txt", Locale.FRENCH, l);
+ IAsset asset = factory.createAsset(base, spec, "relative-resource.txt", Locale.FRENCH, l);
assertTrue(asset instanceof PrivateAsset);
assertEquals("/org/apache/tapestry/asset/relative-resource_fr.txt", asset.getResourceLocation().getPath());
@@ -98,7 +98,7 @@
try
{
- factory.createAsset(spec, base, "does-not-exist.txt", Locale.ENGLISH, l);
+ factory.createAsset(base, spec, "does-not-exist.txt", Locale.ENGLISH, l);
unreachable();
}
catch (ApplicationRuntimeException ex)
@@ -209,7 +209,7 @@
String path = "/dojo/dojo.js";
- IAsset asset = factory.createAsset(spec, shell, path,
+ IAsset asset = factory.createAsset(shell, spec, path,
Locale.getDefault(),
l);
@@ -238,7 +238,7 @@
String path = "/dojo/";
- IAsset asset = factory.createAsset(spec, shell, path,
+ IAsset asset = factory.createAsset(shell, spec, path,
Locale.getDefault(),
l);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java Sat Apr 28 08:08:21 2007
@@ -63,7 +63,7 @@
factory.setContextPath("/context");
- IAsset asset = factory.createAsset(spec, base, "asset.png", Locale.FRENCH, l);
+ IAsset asset = factory.createAsset(base, spec, "asset.png", Locale.FRENCH, l);
assertTrue(asset instanceof ContextAsset);
assertSame(localized, asset.getResourceLocation());
@@ -125,7 +125,7 @@
try
{
- factory.createAsset(spec, base, "asset.png", Locale.FRENCH, l);
+ factory.createAsset(base, spec, "asset.png", Locale.FRENCH, l);
unreachable();
}
catch (ApplicationRuntimeException ex)
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java Sat Apr 28 08:08:21 2007
@@ -28,8 +28,6 @@
/**
* Tests for {@link org.apache.tapestry.asset.AssetSourceImpl}.
*
- * @author Howard M. Lewis Ship
- * @since 4.0
*/
@Test
public class TestAssetSource extends BaseComponentTestCase
@@ -52,7 +50,7 @@
{
AssetFactory f = newMock(AssetFactory.class);
- expect(f.createAsset(null, base, path, locale, location)).andReturn(asset);
+ expect(f.createAsset(base, null, path, locale, location)).andReturn(asset);
return f;
}
@@ -154,4 +152,4 @@
verify();
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?view=diff&rev=533354&r1=533353&r2=533354
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Sat Apr 28 08:08:21 2007
@@ -14,13 +14,12 @@
package org.apache.tapestry.engine.state;
-import static org.easymock.EasyMock.checkOrder;
-import static org.easymock.EasyMock.expect;
-
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.SessionStoreOptimized;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.expect;
import org.testng.annotations.Test;
/**
@@ -29,7 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-@Test
+@Test(sequential = true)
public class TestSessionScopeManager extends BaseComponentTestCase
{
private WebRequest newRequest(boolean create, WebSession session)