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 2005/09/24 13:19:02 UTC
svn commit: r291279 - in /jakarta/tapestry/trunk: ./ config/
framework/src/test/org/apache/tapestry/
framework/src/test/org/apache/tapestry/asset/
framework/src/test/org/apache/tapestry/bean/
framework/src/test/org/apache/tapestry/binding/ framework/sr...
Author: hlship
Date: Sat Sep 24 04:18:50 2005
New Revision: 291279
URL: http://svn.apache.org/viewcvs?rev=291279&view=rev
Log:
Update to HiveMind 1.1-rc-1
Modified:
jakarta/tapestry/trunk/.classpath
jakarta/tapestry/trunk/config/common.properties
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/TestTapestryUtils.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebResponse.java
Modified: jakarta/tapestry/trunk/.classpath
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.classpath?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/config/common.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/config/common.properties?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/config/common.properties (original)
+++ jakarta/tapestry/trunk/config/common.properties Sat Sep 24 04:18:50 2005
@@ -1,4 +1,4 @@
-\# Copyright 2004, 2005 The Apache Software Foundation
+# Copyright 2004, 2005 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hivemind.version=1.1-beta-3
+hivemind.version=1.1-rc-1
javassist.version=3.0
ognl.version=2.6.7
codec.version=1.3
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Sat Sep 24 04:18:50 2005
@@ -102,7 +102,7 @@
protected void trainIsRewinding(IRequestCycle cycle, boolean rewinding)
{
cycle.isRewinding();
- getControl(cycle).setReturnValue(rewinding);
+ setReturnValue(cycle,rewinding);
}
protected IRequestCycle newCycleGetPage(String pageName, IPage page)
@@ -279,14 +279,14 @@
{
page.getPageName();
- getControl(page).setReturnValue(pageName);
+ setReturnValue(page,pageName);
}
protected void trainBuildURL(IAsset asset, IRequestCycle cycle, String URL)
{
asset.buildURL(cycle);
- getControl(asset).setReturnValue(URL);
+ setReturnValue(asset,URL);
}
protected IAsset newAsset()
@@ -299,7 +299,7 @@
IEngine engine = (IEngine) newMock(IEngine.class);
engine.getClassResolver();
- getControl(engine).setReturnValue(resolver);
+ setReturnValue(engine,resolver);
return engine;
}
@@ -308,7 +308,7 @@
{
page.getEngine();
- getControl(page).setReturnValue(engine);
+ setReturnValue(page,engine);
}
protected IComponent newComponent()
@@ -319,19 +319,19 @@
protected void trainGetPage(IComponent component, IPage page)
{
component.getPage();
- getControl(component).setReturnValue(page);
+ setReturnValue(component,page);
}
protected void trainGetExtendedId(IComponent component, String extendedId)
{
component.getExtendedId();
- getControl(component).setReturnValue(extendedId);
+ setReturnValue(component,extendedId);
}
protected void trainGetLocation(Locatable locatable, Location location)
{
locatable.getLocation();
- getControl(locatable).setReturnValue(location);
+ setReturnValue(locatable,location);
}
protected IBinding newBinding()
@@ -342,6 +342,6 @@
protected void trainGetComponent(IComponent container, String componentId, IComponent containee)
{
container.getComponent(componentId);
- getControl(container).setReturnValue(containee);
+ setReturnValue(container,containee);
}
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/TestTapestryUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/TestTapestryUtils.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/TestTapestryUtils.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/TestTapestryUtils.java Sat Sep 24 04:18:50 2005
@@ -296,7 +296,9 @@
}
catch (ApplicationRuntimeException ex)
{
- assertEquals("Component Flintstone/fred is not assignable to type java.lang.String.", ex.getMessage());
+ assertEquals(
+ "Component Flintstone/fred is not assignable to type java.lang.String.",
+ ex.getMessage());
assertSame(l, ex.getLocation());
}
@@ -312,7 +314,7 @@
Throwable t = new RuntimeException("Poof!");
container.getComponent("fred");
- getControl(container).setThrowable(t);
+ setThrowable(container, t);
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java Sat Sep 24 04:18:50 2005
@@ -106,7 +106,7 @@
trainGetResourceURL(relative, null);
classpathFactory.createAbsoluteAsset("/asset.png", Locale.FRENCH, l);
- getControl(classpathFactory).setReturnValue(asset);
+ setReturnValue(classpathFactory, asset);
replayControls();
@@ -175,24 +175,24 @@
private void trainGetLocalization(Resource resource, Locale locale, Resource localized)
{
resource.getLocalization(locale);
- getControl(resource).setReturnValue(localized);
+ setReturnValue(resource, localized);
}
protected void trainGetResourceURL(Resource resource, URL url)
{
resource.getResourceURL();
- getControl(resource).setReturnValue(url);
+ setReturnValue(resource, url);
}
protected void trainGetResource(WebContext context, String path, URL url)
{
context.getResource(path);
- getControl(context).setReturnValue(url);
+ setReturnValue(context, url);
}
protected void trainGetRelativeResource(Resource base, String path, Resource relative)
{
base.getRelativeResource(path);
- getControl(base).setReturnValue(relative);
+ setReturnValue(base, relative);
}
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java Sat Sep 24 04:18:50 2005
@@ -63,7 +63,7 @@
protected void trainGetClassName(IBeanSpecification spec, String className)
{
spec.getClassName();
- getControl(spec).setReturnValue(className);
+ setReturnValue(spec, className);
}
public void testResolveClassFailure()
@@ -168,22 +168,22 @@
trainGetPage(component, page);
page.getRequestCycle();
- getControl(page).setReturnValue(cycle);
+ setReturnValue(page, cycle);
cycle.getInfrastructure();
- getControl(cycle).setReturnValue(infrastructure);
+ setReturnValue(cycle, infrastructure);
infrastructure.getClassResolver();
- getControl(infrastructure).setReturnValue(resolver);
+ setReturnValue(infrastructure, resolver);
component.getNamespace();
- getControl(component).setReturnValue(namespace);
+ setReturnValue(component, namespace);
namespace.getPropertyValue("org.apache.tapestry.bean-class-packages");
- getControl(namespace).setReturnValue("mypackage");
+ setReturnValue(namespace, "mypackage");
infrastructure.getClassFinder();
- getControl(infrastructure).setReturnValue(classFinder);
+ setReturnValue(infrastructure, classFinder);
}
protected ClassFinder newClassFinder()
@@ -251,6 +251,6 @@
private void trainFindClass(ClassFinder finder, String className, Class clazz)
{
finder.findClass("mypackage", className);
- getControl(finder).setReturnValue(clazz);
+ setReturnValue(finder, clazz);
}
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java Sat Sep 24 04:18:50 2005
@@ -95,7 +95,7 @@
listener.actionTriggered(sourceComponent, cycle);
Throwable t = new PageRedirectException("TargetPage");
- getControl(listener).setThrowable(t);
+ setThrowable(listener, t);
replayControls();
@@ -129,7 +129,7 @@
listener.actionTriggered(sourceComponent, cycle);
Throwable t = new RedirectException("http://foo.bar");
- getControl(listener).setThrowable(t);
+ setThrowable(listener, t);
replayControls();
@@ -163,7 +163,7 @@
listener.actionTriggered(sourceComponent, cycle);
Throwable t = new RuntimeException("Failure.");
- getControl(listener).setThrowable(t);
+ setThrowable(listener, t);
trainGetExtendedId(component, "Fred/barney");
@@ -203,13 +203,13 @@
private void trainGetListener(ListenerMap map, String methodName, IActionListener listener)
{
map.getListener(methodName);
- getControl(map).setReturnValue(listener);
+ setReturnValue(map, listener);
}
private void trainGetListeners(IComponent component, ListenerMap lm)
{
component.getListeners();
- getControl(component).setReturnValue(lm);
+ setReturnValue(component,lm);
}
private ListenerMap newListenerMap()
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Sat Sep 24 04:18:50 2005
@@ -161,7 +161,7 @@
{
session.getAttribute(name);
- getControl(session).setReturnValue(attribute);
+ setReturnValue(session,attribute);
}
public void testStore()
@@ -195,7 +195,7 @@
SessionStoreOptimized optimized = (SessionStoreOptimized) newMock(SessionStoreOptimized.class);
optimized.isStoreToSessionNeeded();
- getControl(optimized).setReturnValue(dirty);
+ setReturnValue(optimized,dirty);
return optimized;
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java Sat Sep 24 04:18:50 2005
@@ -77,27 +77,27 @@
Class propertyType)
{
op.getPropertyType(propertyName);
- getControl(op).setReturnValue(propertyType);
+ setReturnValue(op, propertyType);
}
protected void trainGetAccessorMethodName(EnhancementOperation op, String propertyName,
String methodName)
{
op.getAccessorMethodName(propertyName);
- getControl(op).setReturnValue(methodName);
+ setReturnValue(op, methodName);
}
protected void trainGetClassReference(EnhancementOperation op, Class clazz, String reference)
{
op.getClassReference(clazz);
- getControl(op).setReturnValue(reference);
+ setReturnValue(op, reference);
}
protected void trainAddInjectedField(EnhancementOperation op, String fieldName,
Class fieldType, Object fieldValue, String uniqueFieldName)
{
op.addInjectedField(fieldName, fieldType, fieldValue);
- getControl(op).setReturnValue(uniqueFieldName);
+ setReturnValue(op, uniqueFieldName);
}
public void testSuccess()
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java Sat Sep 24 04:18:50 2005
@@ -42,7 +42,7 @@
{
delegate.isInError();
- getControl(delegate).setReturnValue(isInError);
+ setReturnValue(delegate,isInError);
}
protected IForm newForm()
@@ -54,41 +54,41 @@
{
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- getControl(cycle).setReturnValue(form);
+ setReturnValue(cycle,form);
}
protected void trainGetDelegate(IForm form, IValidationDelegate delegate)
{
form.getDelegate();
- getControl(form).setReturnValue(delegate);
+ setReturnValue(form,delegate);
}
protected void trainGetParameter(IRequestCycle cycle, String parameterName,
String parameterValue)
{
cycle.getParameter(parameterName);
- getControl(cycle).setReturnValue(parameterValue);
+ setReturnValue(cycle,parameterValue);
}
protected void trainWasPrerendered(IForm form, IMarkupWriter writer, IComponent component,
boolean wasPrerendered)
{
form.wasPrerendered(writer, component);
- getControl(form).setReturnValue(wasPrerendered);
+ setReturnValue(form,wasPrerendered);
}
protected void trainIsRewinding(IForm form, boolean isRewinding)
{
form.isRewinding();
- getControl(form).setReturnValue(isRewinding);
+ setReturnValue(form,isRewinding);
}
protected void trainGetElementId(IForm form, IFormComponent component, String name)
{
form.getElementId(component);
component.setName(name);
- getControl(form).setReturnValue(name);
+ setReturnValue(form,name);
}
protected IBinding newBinding()
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java Sat Sep 24 04:18:50 2005
@@ -45,7 +45,7 @@
// Training
factory.createBinding(component, "foo", "a literal value without a prefix", l);
- getControl(factory).setReturnValue(binding);
+ setReturnValue(factory,binding);
replayControls();
@@ -76,7 +76,7 @@
// Training
factory.createBinding(component, "foo", "an-expression", l);
- getControl(factory).setReturnValue(binding);
+ setReturnValue(factory,binding);
BindingPrefixContribution c = new BindingPrefixContribution();
c.setPrefix(BindingConstants.OGNL_PREFIX);
@@ -110,7 +110,7 @@
// Training
factory.createBinding(component, "bar", "path part of locator", l);
- getControl(factory).setReturnValue(binding);
+ setReturnValue(factory,binding);
BindingPrefixContribution c = new BindingPrefixContribution();
c.setPrefix("prefix");
@@ -145,7 +145,7 @@
// Training
factory.createBinding(component, "zip", "unknown:path part of locator", l);
- getControl(factory).setReturnValue(binding);
+ setReturnValue(factory,binding);
BindingPrefixContribution c = new BindingPrefixContribution();
c.setPrefix(BindingConstants.LITERAL_PREFIX);
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java Sat Sep 24 04:18:50 2005
@@ -42,13 +42,13 @@
protected void trainGetRelativeResource(Resource parent, String path, Resource child)
{
parent.getRelativeResource(path);
- getControl(parent).setReturnValue(child);
+ setReturnValue(parent,child);
}
protected void trainGetResourceURL(Resource resource, URL url)
{
resource.getResourceURL();
- getControl(resource).setReturnValue(url);
+ setReturnValue(resource,url);
}
protected ISpecificationSource newSource()
@@ -95,10 +95,10 @@
IAsset asset = newAsset();
assetSource.findAsset(parent, childPath, null, location);
- getControl(assetSource).setReturnValue(asset);
+ setReturnValue(assetSource,asset);
asset.getResourceLocation();
- getControl(asset).setReturnValue(child);
+ setReturnValue(asset,child);
}
protected IAsset newAsset()
@@ -115,7 +115,7 @@
ILibrarySpecification spec)
{
source.getLibrarySpecification(resource);
- getControl(source).setReturnValue(spec);
+ setReturnValue(source,spec);
}
protected IComponentSpecification newComponentSpec()
@@ -135,7 +135,7 @@
trainResolveChildResource(assetSource, libraryResource, "Foo.page", l, specResource);
source.getPageSpecification(specResource);
- getControl(source).setReturnValue(spec);
+ setReturnValue(source,spec);
replayControls();
@@ -158,7 +158,7 @@
trainResolveChildResource(assetSource, libraryResource, "Foo.jwc", l, specResource);
source.getComponentSpecification(specResource);
- getControl(source).setReturnValue(spec);
+ setReturnValue(source,spec);
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java Sat Sep 24 04:18:50 2005
@@ -35,7 +35,7 @@
ServletContext servletContext = (ServletContext) newMock(ServletContext.class);
servlet.getServletContext();
- getControl(servlet).setReturnValue(servletContext);
+ setReturnValue(servlet,servletContext);
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebResponse.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebResponse.java?rev=291279&r1=291278&r2=291279&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebResponse.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebResponse.java Sat Sep 24 04:18:50 2005
@@ -48,7 +48,7 @@
response.setContentType("foo/bar");
response.getOutputStream();
- getControl(response).setReturnValue(stream);
+ setReturnValue(response,stream);
replayControls();
@@ -67,7 +67,7 @@
response.setContentType("foo/bar");
response.getOutputStream();
- getControl(response).setThrowable(t);
+ setThrowable(response, t);
replayControls();
@@ -95,7 +95,7 @@
response.setContentType("foo/bar");
response.getWriter();
- getControl(response).setReturnValue(writer);
+ setReturnValue(response,writer);
replayControls();
@@ -115,7 +115,7 @@
response.setContentType("foo/bar");
response.getWriter();
- getControl(response).setReturnValue(writer1);
+ setReturnValue(response,writer1);
replayControls();
@@ -128,7 +128,7 @@
response.reset();
response.setContentType("zip/zap");
response.getWriter();
- getControl(response).setReturnValue(writer2);
+ setReturnValue(response,writer2);
replayControls();
@@ -145,7 +145,7 @@
response.setContentType("foo/bar");
response.getWriter();
- getControl(response).setThrowable(t);
+ setThrowable(response, t);
replayControls();
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org