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 2006/01/12 18:21:30 UTC
svn commit: r368417 [2/2] - in /jakarta/tapestry/trunk: ./ .settings/
eclipse/ portlet/src/java/org/apache/tapestry/portlet/
portlet/src/java/org/apache/tapestry/portlet/bindings/
portlet/src/test/org/apache/tapestry/portlet/ portlet/src/test/org/apach...
Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletServicerBridges.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletServicerBridges.java?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletServicerBridges.java (original)
+++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletServicerBridges.java Thu Jan 12 09:21:21 2006
@@ -1,4 +1,4 @@
-// Copyright 2005 The Apache Software Foundation
+// Copyright 2005, 2006 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.
@@ -40,13 +40,17 @@
*/
public class TestPortletServicerBridges extends HiveMindTestCase
{
+
+ /** Test fixture. */
private class WebRequestServicerFixture implements WebRequestServicer
{
+
WebRequest _request;
WebResponse _response;
- public void service(WebRequest request, WebResponse response) throws IOException
+ public void service(WebRequest request, WebResponse response)
+ throws IOException
{
_request = request;
_response = response;
@@ -54,14 +58,15 @@
}
- public void testActionBridgeSuccess() throws Exception
+ public void testActionBridgeSuccess()
+ throws Exception
{
- ActionRequest request = (ActionRequest) newMock(ActionRequest.class);
+ ActionRequest request = (ActionRequest)newMock(ActionRequest.class);
MockControl responsec = newControl(ActionResponse.class);
- ActionResponse response = (ActionResponse) responsec.getMock();
+ ActionResponse response = (ActionResponse)responsec.getMock();
- PortletRequestGlobals prg = (PortletRequestGlobals) newMock(PortletRequestGlobals.class);
+ PortletRequestGlobals prg = (PortletRequestGlobals)newMock(PortletRequestGlobals.class);
WebRequestServicerFixture wrs = new WebRequestServicerFixture();
prg.store(request, response);
@@ -78,7 +83,8 @@
bridge.service(request, response);
- // Test that the WebXXX wrappers createde by the bridge and passed to the WebRequestServicer
+ // Test that the WebXXX wrappers createde by the bridge and passed to
+ // the WebRequestServicer
// encapsulate the ActionRequest and ActionResponse
wrs._request.setAttribute("FOO", null);
@@ -87,14 +93,15 @@
verifyControls();
}
- public void testRenderBridgeSuccess() throws Exception
+ public void testRenderBridgeSuccess()
+ throws Exception
{
- RenderRequest request = (RenderRequest) newMock(RenderRequest.class);
+ RenderRequest request = (RenderRequest)newMock(RenderRequest.class);
MockControl responsec = newControl(RenderResponse.class);
- RenderResponse response = (RenderResponse) responsec.getMock();
+ RenderResponse response = (RenderResponse)responsec.getMock();
- PortletRequestGlobals prg = (PortletRequestGlobals) newMock(PortletRequestGlobals.class);
+ PortletRequestGlobals prg = (PortletRequestGlobals)newMock(PortletRequestGlobals.class);
WebRequestServicerFixture wrs = new WebRequestServicerFixture();
prg.store(request, response);
@@ -110,33 +117,37 @@
bridge.service(request, response);
- // Test that the WebXXX wrappers createde by the bridge and passed to the WebRequestServicer
+ // Test that the WebXXX wrappers createde by the bridge and passed to
+ // the WebRequestServicer
// encapsulate the RenderRequest and RenderResponse
wrs._request.setAttribute("FOO", null);
- // Prove that the *correct* wrapper type, RenderWebResponse, has been used.
+ // Prove that the *correct* wrapper type, RenderWebResponse, has been
+ // used.
wrs._response.reset();
verifyControls();
}
- public void testActionBridgeFailure() throws Exception
+ public void testActionBridgeFailure()
+ throws Exception
{
- ActionRequest request = (ActionRequest) newMock(ActionRequest.class);
- ActionResponse response = (ActionResponse) newMock(ActionResponse.class);
- PortletRequestGlobals prg = (PortletRequestGlobals) newMock(PortletRequestGlobals.class);
+ ActionRequest request = (ActionRequest)newMock(ActionRequest.class);
+ ActionResponse response = (ActionResponse)newMock(ActionResponse.class);
+ PortletRequestGlobals prg = (PortletRequestGlobals)newMock(PortletRequestGlobals.class);
MockControl control = newControl(WebRequestServicer.class);
- WebRequestServicer servicer = (WebRequestServicer) control.getMock();
+ WebRequestServicer servicer = (WebRequestServicer)control.getMock();
Throwable t = new RuntimeException("Failure.");
prg.store(request, response);
servicer.service(new PortletWebRequest(request), new PortletWebResponse(response));
- control.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new TypeMatcher(), new TypeMatcher() }));
+ control
+ .setMatcher(new AggregateArgumentsMatcher(
+ new ArgumentMatcher[] { new TypeMatcher(), new TypeMatcher() }));
control.setThrowable(t);
replayControls();
@@ -164,21 +175,23 @@
verifyControls();
}
- public void testRenderBridgeFailure() throws Exception
+ public void testRenderBridgeFailure()
+ throws Exception
{
- RenderRequest request = (RenderRequest) newMock(RenderRequest.class);
- RenderResponse response = (RenderResponse) newMock(RenderResponse.class);
- PortletRequestGlobals prg = (PortletRequestGlobals) newMock(PortletRequestGlobals.class);
+ RenderRequest request = (RenderRequest)newMock(RenderRequest.class);
+ RenderResponse response = (RenderResponse)newMock(RenderResponse.class);
+ PortletRequestGlobals prg = (PortletRequestGlobals)newMock(PortletRequestGlobals.class);
MockControl control = newControl(WebRequestServicer.class);
- WebRequestServicer servicer = (WebRequestServicer) control.getMock();
+ WebRequestServicer servicer = (WebRequestServicer)control.getMock();
Throwable t = new RuntimeException("Failure.");
prg.store(request, response);
servicer.service(new PortletWebRequest(request), new RenderWebResponse(response));
- control.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new TypeMatcher(), new TypeMatcher() }));
+ control
+ .setMatcher(new AggregateArgumentsMatcher(
+ new ArgumentMatcher[] { new TypeMatcher(), new TypeMatcher() }));
control.setThrowable(t);
replayControls();
@@ -205,4 +218,4 @@
verifyControls();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java (original)
+++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java Thu Jan 12 09:21:21 2006
@@ -1,4 +1,4 @@
-// Copyright 2005 The Apache Software Foundation
+// Copyright 2005, 2006 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.
@@ -27,9 +27,10 @@
*/
public class TestRenderWebResponse extends BasePortletWebTestCase
{
+
private RenderResponse newResponse()
{
- return (RenderResponse) newMock(RenderResponse.class);
+ return (RenderResponse)newMock(RenderResponse.class);
}
public void testReset()
@@ -47,10 +48,11 @@
verifyControls();
}
- public void testGetOutputStream() throws Exception
+ public void testGetOutputStream()
+ throws Exception
{
MockControl control = newControl(RenderResponse.class);
- RenderResponse response = (RenderResponse) control.getMock();
+ RenderResponse response = (RenderResponse)control.getMock();
replayControls();
RenderWebResponse rwr = new RenderWebResponse(response);
@@ -71,7 +73,7 @@
public void testGetNamespace()
{
MockControl control = newControl(RenderResponse.class);
- RenderResponse response = (RenderResponse) control.getMock();
+ RenderResponse response = (RenderResponse)control.getMock();
response.getNamespace();
control.setReturnValue("_NAMESPACE_");
@@ -84,4 +86,4 @@
verifyControls();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java (original)
+++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java Thu Jan 12 09:21:21 2006
@@ -1,4 +1,4 @@
-// Copyright 2005 The Apache Software Foundation
+// Copyright 2005, 2006 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.
@@ -24,20 +24,20 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.coerce.ValueConverter;
-import org.apache.tapestry.portlet.bindings.UserAttributeBindingFactory;
import org.easymock.MockControl;
/**
- * Tests for {@link org.apache.tapestry.portlet.bindings.UserAttributeBinding} and
- * {@link org.apache.tapestry.portlet.bindings.UserAttributeBindingFactory}.
+ * Tests for {@link org.apache.tapestry.portlet.bindings.UserAttributeBinding}
+ * and {@link org.apache.tapestry.portlet.bindings.UserAttributeBindingFactory}.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
public class TestUserAttributeBinding extends HiveMindTestCase
{
- private IBinding newBinding(String bindingDescription, ValueConverter converter,
- Location location, PortletRequest request, String attributeName)
+
+ private IBinding newBinding(String bindingDescription, ValueConverter converter, Location location,
+ PortletRequest request, String attributeName)
{
UserAttributeBindingFactory factory = new UserAttributeBindingFactory();
factory.setValueConverter(converter);
@@ -49,7 +49,7 @@
private Map newMap(String key, String value)
{
MockControl control = newControl(Map.class);
- Map map = (Map) control.getMock();
+ Map map = (Map)control.getMock();
map.get(key);
control.setReturnValue(value);
@@ -59,13 +59,13 @@
private ValueConverter newConverter()
{
- return (ValueConverter) newMock(ValueConverter.class);
+ return (ValueConverter)newMock(ValueConverter.class);
}
private PortletRequest newRequest(Map userInfo)
{
MockControl control = newControl(PortletRequest.class);
- PortletRequest request = (PortletRequest) control.getMock();
+ PortletRequest request = (PortletRequest)control.getMock();
request.getAttribute(PortletRequest.USER_INFO);
control.setReturnValue(userInfo);
@@ -124,7 +124,7 @@
Map map = new HashMap();
MockControl converterc = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterc.getMock();
+ ValueConverter converter = (ValueConverter)converterc.getMock();
PortletRequest request = newRequest(map);
Location l = newLocation();
Modified: jakarta/tapestry/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/project.properties?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/project.properties (original)
+++ jakarta/tapestry/trunk/project.properties Thu Jan 12 09:21:21 2006
@@ -13,7 +13,7 @@
# limitations under the License.
project.name=jakarta-tapestry
-project.version=4.0-rc-2
+project.version=4.1.0
dist.name=tapestry
Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml (original)
+++ jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml Thu Jan 12 09:21:21 2006
@@ -119,7 +119,23 @@
</section>
-
+ <section>
+ <title>Beyond Tapestry 4.0</title>
+
+ <p>
+ It isn't clear whether the next release of Tapestry will be numbered 4.1 or 5.0 ... it depends on the
+ number and kind of API changes that occur. In any case, we hope to have it out in a much shorter
+ time span than the 4.0 release (which took almost two years); preferably about six months. You may
+ see the code name <em>Magritte</em> as a placeholder name until the version number is tied down (Tapestry 4.0
+ was <em>Picasso</em>).
+ </p>
+
+ <p>
+ We're still working on the feature set right now, and any thing available from Subversion trunk
+ is very definately unstable and alpha.
+ </p>
+
+ </section>
<section>
<title>Tapestry 4.0</title>
Modified: jakarta/tapestry/trunk/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=368417&r1=368416&r2=368417&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Thu Jan 12 09:21:21 2006
@@ -55,7 +55,7 @@
-->
</todo>
<changes>
- <release version="4.1-alpha-1" date="unreleased">
+ <release version="4.1.0" date="unreleased">
<action type="update" dev="JK" >Cleaned up warnings/imports showing on eclipse problem pane.</action>
<action type="add" dev="JK" fixes-bug="TAPESTRY-821">ResourceMatcher service added with configurable regexp pattern
hivemind contributions to conditionally allow some resources to not
@@ -63,8 +63,24 @@
<action type="add" dev="JK" fixes-bug="TAPESTRY-812" due-to="Takashi Okamoto">
Added japanese localized validator strings.
</action>
+ <release version="4.1.0" date="unreleased">
+ <action type="update" dev="JK" >Cleaned up warnings/imports showing on eclipse problem pane.</action>
+ <action type="add" dev="JK" fixes-bug="TAPESTRY-821">ResourceMatcher service added with configurable regexp pattern
+ hivemind contributions to conditionally allow some resources to not
+ require md5sum digest checks.</action>
+ <action type="add" dev="JK" fixes-bug="TAPESTRY-812" due-to="Takashi Okamoto">
+ Added japanese localized validator strings.
+ </action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-787">Port late bug fixes from 4.0 branch to trunk</action>
+ <action type="update" dev="HLS">Add a checkstyle configuration for the project, and fix a number of related warnings and errors</action>
+ </release>
+ <release version="4.0" date="Jan 6 2006">
+ <action type="update" dev="HLS">Add link to DeveloperWorks Tapestry article</action>
</release>
- <release version="4.0-rc-2" date="unreleased">
+ <release version="4.0-rc-3" date="Dec 27 2005">
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-815">PageAttachListener not called on initial page load</action>
+ </release>
+ <release version="4.0-rc-2" date="Dec 18 2005">
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-789">DefaultResourceLocalizerTest is under framework/src not framework/test</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-658" due-to="Leonardo Quijano Vincenzi">LabeledPropertySelectionModel throws NPE on null value</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-808">Engine Service proxies don't correctly forward "post" parameter of IEngineService.getLink</action>
@@ -72,6 +88,8 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-760">Application startup fails occasionally because of undefined order of contributions</action>
<action type="add" dev="JK">Document validation inside the Users Guide</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-459" due-to="Andreas Andreou">Documentation for DatePicker component is incomplete</action>
+ </release>
+ <release version="4.0-rc-1" date="Dec 6 2005">
<action type="update" dev="HLS">Make default binding prefix configurable</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-752">XTile service passes null list of listener parameters to
listener method</action>
@@ -95,7 +113,7 @@
are used in thread-unsafe manner</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-767">tapestry.url.ServiceEncoders has reversed the descriptions
of the after and before attributes</action>
- <action type="fix" dev="HLS" fixes-bug="TAPESTRY-739">Change return type to inteface for:
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-739">Change return type to interface for
ListenerMapSource.createListenerMethodInvoker()</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-387" due-to="Kevin J. Menard, Jr.">Typographical Errors in
Documentation</action>
@@ -802,6 +820,34 @@
</release>
</changes>
<votes>
+ <vote title="4.0 Final Release" date="Dec 30 2005" dev="HLS">
+ <motion>
+ I think 4.0 is ready for a wider release and a new release
+ announcement to ring in 2006. I know I'm anxious to start putting
+ together 4.1 features. The most critical missing documentation, about
+ validation, has been remedied by Jesse and some irritating bugs have
+ been fixed.
+ </motion>
+ <response>HLS: JK, KT, EH, RLS, GL, PF, HK, DS: +1</response>
+ </vote>
+ <vote title="4.0 Final Release" date="Dec 15 2005" dev="HLS">
+ <motion>
+ I think it is high time for a final 4.0 release. The release
+ candidate has exposed a couple of minor issues, now fixed in the
+ trunk, and there's nothing stopping us from following up with a 4.0.1
+ release if anything else turns up.
+ </motion>
+ <response>
+ HLS, JK, DS, HK: +1
+ </response>
+ <response>
+ GL: +0
+ </response>
+ <response>
+ KT: -1
+ </response>
+ </vote>
+
<vote title="Tapestry 4.0-rc-1" date="Nov 30 2005" dev="HLS">
<motion>
By the time this vote ends, we'll have some kind of fix for
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org