Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java Sat Mar 11 12:54:27 2006 @@ -75,4 +75,4 @@ _portletSession.invalidate(); } -} +} \ No newline at end of file
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicer.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicer.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicer.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicer.java Sat Mar 11 12:54:27 2006 @@ -29,6 +29,6 @@ */ public interface RenderRequestServicer { - void service(RenderRequest request, RenderResponse response) throws IOException, + public void service(RenderRequest request, RenderResponse response) throws IOException, PortletException; -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerFilter.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerFilter.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerFilter.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerFilter.java Sat Mar 11 12:54:27 2006 @@ -30,6 +30,6 @@ */ public interface RenderRequestServicerFilter { - void service(RenderRequest request, RenderResponse response, + public void service(RenderRequest request, RenderResponse response, RenderRequestServicer servicer) throws IOException, PortletException; -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerToWebRequestServicerBridge.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerToWebRequestServicerBridge.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerToWebRequestServicerBridge.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderRequestServicerToWebRequestServicerBridge.java Sat Mar 11 12:54:27 2006 @@ -64,4 +64,4 @@ _webRequestServicer = webRequestServicer; } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderService.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderService.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderService.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderService.java Sat Mar 11 12:54:27 2006 @@ -105,4 +105,4 @@ { _pageResolver = pageResolver; } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderWebResponse.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderWebResponse.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderWebResponse.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/RenderWebResponse.java Sat Mar 11 12:54:27 2006 @@ -58,4 +58,4 @@ { return _renderResponse.getNamespace(); } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/SetupPortletApplicationGlobals.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/SetupPortletApplicationGlobals.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/SetupPortletApplicationGlobals.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/SetupPortletApplicationGlobals.java Sat Mar 11 12:54:27 2006 @@ -34,4 +34,4 @@ initialize("portlet"); } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java (original) +++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -14,25 +14,18 @@ package org.apache.tapestry.portlet.bindings; -import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; /** * @author Howard M. Lewis Ship * @since 4.0 */ -final class BindingsMessages +class BindingsMessages { - - private final static Messages MESSAGES = new MessageFormatter(BindingsMessages.class); - - /** @since 4.1 */ - private BindingsMessages() - { - } + private final static MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class); static String noUserInfo() { - return MESSAGES.getMessage("no-user-info"); + return _formatter.getMessage("no-user-info"); } } Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestApplicationPortlet.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestApplicationPortlet.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestApplicationPortlet.java (original) +++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestApplicationPortlet.java Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -33,11 +33,8 @@ */ public class TestApplicationPortlet extends HiveMindTestCase { - - /** Test fixture. */ public static class ApplicationPortletFixture extends ApplicationPortlet { - private final Registry _constructRegistry; public ApplicationPortletFixture(Registry registry) @@ -53,26 +50,28 @@ private PortletApplicationInitializer newInitializer() { - return (PortletApplicationInitializer)newMock(PortletApplicationInitializer.class); + return (PortletApplicationInitializer) newMock(PortletApplicationInitializer.class); } private ActionRequestServicer newActionRequestServicer() { - return (ActionRequestServicer)newMock(ActionRequestServicer.class); + return (ActionRequestServicer) newMock(ActionRequestServicer.class); } private RenderRequestServicer newRenderRequestServicer() { - return (RenderRequestServicer)newMock(RenderRequestServicer.class); + return (RenderRequestServicer) newMock(RenderRequestServicer.class); } private Registry newRegistry(PortletApplicationInitializer initializer, ActionRequestServicer actionRequestServicer, RenderRequestServicer renderRequestServicer) { MockControl control = newControl(Registry.class); - Registry registry = (Registry)control.getMock(); + Registry registry = (Registry) control.getMock(); - registry.getService("tapestry.portlet.PortletApplicationInitializer", PortletApplicationInitializer.class); + registry.getService( + "tapestry.portlet.PortletApplicationInitializer", + PortletApplicationInitializer.class); control.setReturnValue(initializer); registry.getService("tapestry.portlet.ActionRequestServicer", ActionRequestServicer.class); @@ -86,39 +85,38 @@ private PortletConfig newConfig() { - return (PortletConfig)newMock(PortletConfig.class); + return (PortletConfig) newMock(PortletConfig.class); } private ActionRequest newActionRequest() { - return (ActionRequest)newMock(ActionRequest.class); + return (ActionRequest) newMock(ActionRequest.class); } private ActionResponse newActionResponse() { - return (ActionResponse)newMock(ActionResponse.class); + return (ActionResponse) newMock(ActionResponse.class); } private RenderRequest newRenderRequest() { - return (RenderRequest)newMock(RenderRequest.class); + return (RenderRequest) newMock(RenderRequest.class); } private RenderResponse newRenderResponse() { - return (RenderResponse)newMock(RenderResponse.class); + return (RenderResponse) newMock(RenderResponse.class); } - public void testParseOptionalDescriptors() - throws Exception + public void testParseOptionalDescriptors() throws Exception { MockControl configc = MockControl.createControl(PortletConfig.class); addControl(configc); - PortletConfig config = (PortletConfig)configc.getMock(); + PortletConfig config = (PortletConfig) configc.getMock(); MockControl contextc = MockControl.createControl(PortletContext.class); addControl(contextc); - PortletContext context = (PortletContext)contextc.getMock(); + PortletContext context = (PortletContext) contextc.getMock(); config.getPortletName(); configc.setReturnValue("myportlet", 3); @@ -155,8 +153,7 @@ assertEquals("parsed", ap._registry.expandSymbols("${module-plain}", null)); } - public void testInitAndDestroy() - throws Exception + public void testInitAndDestroy() throws Exception { PortletApplicationInitializer initializer = newInitializer(); ActionRequestServicer actionRequestServicer = newActionRequestServicer(); @@ -184,8 +181,7 @@ verifyControls(); } - public void testProcessAction() - throws Exception + public void testProcessAction() throws Exception { PortletApplicationInitializer initializer = newInitializer(); ActionRequestServicer actionRequestServicer = newActionRequestServicer(); @@ -209,7 +205,7 @@ ActionResponse response = newActionResponse(); registry.setupThread(); - + actionRequestServicer.service(request, response); registry.cleanupThread(); @@ -221,8 +217,7 @@ verifyControls(); } - public void testProcessRender() - throws Exception + public void testProcessRender() throws Exception { PortletApplicationInitializer initializer = newInitializer(); ActionRequestServicer actionRequestServicer = newActionRequestServicer(); @@ -246,7 +241,7 @@ RenderResponse response = newRenderResponse(); registry.setupThread(); - + renderRequestServicer.service(request, response); registry.cleanupThread(); @@ -257,4 +252,4 @@ verifyControls(); } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletLink.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletLink.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletLink.java (original) +++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletLink.java Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -24,7 +24,6 @@ import javax.portlet.WindowStateException; import org.apache.hivemind.test.HiveMindTestCase; -import org.apache.tapestry.IRequestCycle; import org.apache.tapestry.engine.ILink; import org.apache.tapestry.util.QueryParameterMap; import org.easymock.MockControl; @@ -37,11 +36,8 @@ */ public class TestPortletLink extends HiveMindTestCase { - - /** Test fixture. */ private static class PortletURLFixture implements PortletURL { - private final String _toString; public PortletURLFixture(String toString) @@ -54,13 +50,11 @@ return _toString; } - public void setWindowState(WindowState arg0) - throws WindowStateException + public void setWindowState(WindowState arg0) throws WindowStateException { } - public void setPortletMode(PortletMode arg0) - throws PortletModeException + public void setPortletMode(PortletMode arg0) throws PortletModeException { } @@ -76,37 +70,30 @@ { } - public void setSecure(boolean arg0) - throws PortletSecurityException + public void setSecure(boolean arg0) throws PortletSecurityException { } } - private IRequestCycle newCycle() - { - return (IRequestCycle)newMock(IRequestCycle.class); - } - private PortletURL newPortletURL() { - return (PortletURL)newMock(PortletURL.class); + return (PortletURL) newMock(PortletURL.class); } private QueryParameterMap newParameters() { - return (QueryParameterMap)newMock(QueryParameterMap.class); + return (QueryParameterMap) newMock(QueryParameterMap.class); } public void testGetAbsoluteURL() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); QueryParameterMap parameters = newParameters(); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); try { @@ -133,20 +120,20 @@ public void testGetParameterNames() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); MockControl control = newControl(QueryParameterMap.class); - QueryParameterMap parameters = (QueryParameterMap)control.getMock(); + QueryParameterMap parameters = (QueryParameterMap) control.getMock(); - String[] names = { "Fred", "Barney" }; + String[] names = + { "Fred", "Barney" }; parameters.getParameterNames(); control.setReturnValue(names); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); assertSame(names, link.getParameterNames()); @@ -155,20 +142,20 @@ public void testGetParameterValues() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); MockControl control = newControl(QueryParameterMap.class); - QueryParameterMap parameters = (QueryParameterMap)control.getMock(); + QueryParameterMap parameters = (QueryParameterMap) control.getMock(); - String[] values = { "Fred", "Barney" }; + String[] values = + { "Fred", "Barney" }; parameters.getParameterValues("bedrock"); control.setReturnValue(values); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); assertSame(values, link.getParameterValues("bedrock")); @@ -177,18 +164,17 @@ public void testGetURL() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); MockControl control = newControl(QueryParameterMap.class); - QueryParameterMap parameters = (QueryParameterMap)control.getMock(); + QueryParameterMap parameters = (QueryParameterMap) control.getMock(); parameters.getParameterNames(); control.setReturnValue(new String[0]); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); assertEquals(url.toString(), link.getURL()); @@ -197,43 +183,47 @@ public void testGetURLLongForm() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); - QueryParameterMap parameters = (QueryParameterMap)newMock(QueryParameterMap.class); + QueryParameterMap parameters = (QueryParameterMap) newMock(QueryParameterMap.class); parameters.getParameterNames(); - setReturnValue(parameters, new String[] { "page" }); + setReturnValue(parameters, new String[] + { "page" }); parameters.getParameterValues("page"); - String[] values = new String[] { "View" }; + String[] values = new String[] + { "View" }; setReturnValue(parameters, values); url.setParameter("page", values); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); - assertEquals("EasyMock for interface javax.portlet.PortletURL#anchor", link.getURL("scheme", "server", 99, - "anchor", true)); + assertEquals("EasyMock for interface javax.portlet.PortletURL#anchor", link.getURL( + "scheme", + "server", + 99, + "anchor", + true)); verifyControls(); } public void testGetURLUnencoding() { - IRequestCycle cycle = newCycle(); PortletURL url = new PortletURLFixture("this=foo&that=bar"); - QueryParameterMap parameters = (QueryParameterMap)newMock(QueryParameterMap.class); + QueryParameterMap parameters = (QueryParameterMap) newMock(QueryParameterMap.class); parameters.getParameterNames(); setReturnValue(parameters, new String[0]); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); assertEquals("this=foo&that=bar", link.getURL()); @@ -242,16 +232,17 @@ public void testGetURLIncludeParameters() { - IRequestCycle cycle = newCycle(); PortletURL url = newPortletURL(); MockControl control = newControl(QueryParameterMap.class); - QueryParameterMap parameters = (QueryParameterMap)control.getMock(); + QueryParameterMap parameters = (QueryParameterMap) control.getMock(); - String[] values = { "Fred", "Barney" }; + String[] values = + { "Fred", "Barney" }; parameters.getParameterNames(); - control.setReturnValue(new String[] { "bedrock" }); + control.setReturnValue(new String[] + { "bedrock" }); parameters.getParameterValues("bedrock"); control.setReturnValue(values); @@ -259,31 +250,25 @@ replayControls(); - ILink link = new PortletLink(cycle, url, parameters, false); + ILink link = new PortletLink(url, parameters); assertEquals(url.toString(), link.getURL()); verifyControls(); } - public void testGetURLStatefulWithAnchor() + public void testGetURLWithAnchor() { PortletURL url = newPortletURL(); - MockControl cyclec = newControl(IRequestCycle.class); - IRequestCycle cycle = (IRequestCycle)cyclec.getMock(); - - cycle.encodeURL(url.toString()); - cyclec.setReturnValue("/encoded-url"); - QueryParameterMap parameters = newParameters(); replayControls(); - ILink link = new PortletLink(cycle, url, parameters, true); + ILink link = new PortletLink(url, parameters); - assertEquals("/encoded-url#anchor", link.getURL("anchor", false)); + assertEquals("EasyMock for interface javax.portlet.PortletURL#anchor", link.getURL("anchor", false)); verifyControls(); } -} +} \ No newline at end of file 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=385164&r1=385163&r2=385164&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 Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -40,17 +40,13 @@ */ 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; @@ -58,15 +54,14 @@ } - 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); @@ -83,8 +78,7 @@ 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); @@ -93,15 +87,14 @@ 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); @@ -117,37 +110,33 @@ 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(); @@ -175,23 +164,21 @@ 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(); @@ -218,4 +205,4 @@ verifyControls(); } -} +} \ No newline at end of file Modified: jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java (original) +++ jakarta/tapestry/trunk/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java Sat Mar 11 12:54:27 2006 @@ -1,3 +1,17 @@ +// Copyright 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package org.apache.tapestry.portlet; import javax.portlet.PortletMode; 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=385164&r1=385163&r2=385164&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 Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -27,10 +27,9 @@ */ public class TestRenderWebResponse extends BasePortletWebTestCase { - private RenderResponse newResponse() { - return (RenderResponse)newMock(RenderResponse.class); + return (RenderResponse) newMock(RenderResponse.class); } public void testReset() @@ -48,11 +47,10 @@ 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); @@ -73,7 +71,7 @@ public void testGetNamespace() { MockControl control = newControl(RenderResponse.class); - RenderResponse response = (RenderResponse)control.getMock(); + RenderResponse response = (RenderResponse) control.getMock(); response.getNamespace(); control.setReturnValue("_NAMESPACE_"); @@ -86,4 +84,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=385164&r1=385163&r2=385164&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 Sat Mar 11 12:54:27 2006 @@ -1,4 +1,4 @@ -// Copyright 2005, 2006 The Apache Software Foundation +// Copyright 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. @@ -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 [EMAIL PROTECTED] org.apache.tapestry.portlet.bindings.UserAttributeBinding} - * and [EMAIL PROTECTED] org.apache.tapestry.portlet.bindings.UserAttributeBindingFactory}. + * Tests for [EMAIL PROTECTED] org.apache.tapestry.portlet.bindings.UserAttributeBinding} and + * [EMAIL PROTECTED] 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=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/project.properties (original) +++ jakarta/tapestry/trunk/project.properties Sat Mar 11 12:54:27 2006 @@ -13,7 +13,7 @@ # limitations under the License. project.name=jakarta-tapestry -project.version=4.1.0 +project.version=4.1 dist.name=tapestry Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/UsersGuide/page-class.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/UsersGuide/page-class.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/content/xdocs/UsersGuide/page-class.xml (original) +++ jakarta/tapestry/trunk/src/documentation/content/xdocs/UsersGuide/page-class.xml Sat Mar 11 12:54:27 2006 @@ -84,7 +84,7 @@ <note> These steps are specified in the -<link href="&hivedoc;/config/tapestry.page.PageClassProviderChain">tapestry.page.PageClassProviderChain</link> +<link href="&hivedoc;/config/tapestry.page.PageClassProviderChain.html">tapestry.page.PageClassProviderChain</link> configuration point. </note> @@ -112,7 +112,7 @@ <note> These steps are specified in the -<link href="&hivedoc;/config/tapestry.page.ComponentClassProviderChain">tapestry.page.ComponentClassProviderChain</link> +<link href="&hivedoc;/config/tapestry.page.ComponentClassProviderChain.html">tapestry.page.ComponentClassProviderChain</link> configuration point. </note> </section> Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/dependencies.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/dependencies.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/content/xdocs/dependencies.xml (original) +++ jakarta/tapestry/trunk/src/documentation/content/xdocs/dependencies.xml Sat Mar 11 12:54:27 2006 @@ -49,7 +49,15 @@ <td> <link href="&maven;/commons-fileupload/jars/">commons-fileupload</link> </td> - <td>1.0</td> + <td>1.1</td> + <td>ASL</td> + <td>File upload support.</td> + </tr> + <tr> + <td> + <link href="&maven;/commons-io/jars/">commons-io</link> + </td> + <td>1.1</td> <td>ASL</td> <td>File upload support.</td> </tr> @@ -65,7 +73,7 @@ <td> <link href="&maven;/hivemind/jars/">hivemind</link> </td> - <td> 1.1 </td> + <td> 1.1.1 </td> <td> ASL </td> <td> Services and configuration microkernel; provides service infrastructure for the framework. </td> </tr> @@ -73,7 +81,7 @@ <td> <link href="&maven;/hivemind/jars/">hivemind-lib</link> </td> - <td>1.1</td> + <td>1.1.1</td> <td>ASL</td> <td> Library of additional HiveMind services. </td> </tr> Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/links.ent URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/links.ent?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/content/xdocs/links.ent (original) +++ jakarta/tapestry/trunk/src/documentation/content/xdocs/links.ent Sat Mar 11 12:54:27 2006 @@ -51,7 +51,7 @@ <!ENTITY EvenOdd '<link href="&apiroot;/bean/EvenOdd.html">EvenOdd</link>'> <!ENTITY ExceptionAnalyzer '<link href="&apiroot;/util/exception/ExceptionAnalyzer.html">ExceptionAnalyzer</link>'> <!ENTITY ExceptionDescription '<link href="&apiroot;/util/exception/ExceptionDescription.html">ExceptionDescription</link>'> -<!ENTITY ExternalAsset '<link href="&apiroot;/ExternalAsset.html">ExternalAsset</link>'> +<!ENTITY ExternalAsset '<link href="&apiroot;/asset/ExternalAsset.html">ExternalAsset</link>'> <!ENTITY IAsset '<link href="&apiroot;/IAsset.html">IAsset</link>'> <!ENTITY IBeanProvider '<link href="&apiroot;/IBeanProvider.html">IBeanProvider</link>'> <!ENTITY IBinding '<link href="&apiroot;/IBinding.html">IBinding</link>'> Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/site.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/content/xdocs/site.xml (original) +++ jakarta/tapestry/trunk/src/documentation/content/xdocs/site.xml Sat Mar 11 12:54:27 2006 @@ -217,12 +217,12 @@ </info> <related label="Related Projects"> - <appfuse label="AppFuse" href="https://appfuse.dev.java.net/"/> - <item label="HiveMind" href="http://jakarta.apache.org/hivemind/"/> + <appfuse label="AppFuse" href="https://appfuse.dev.java.net/"/> + <item label="HiveMind" href="http://jakarta.apache.org/hivemind/"/> <item label="Spindle" href="http://spindle.sourceforge.net/"/> - <item label="Tacos" href="http://sf.net/projects/tacos/"/> + <item label="Tacos" href="http://tacos.sourceforge.net"/> <item label="Tapestry @ JavaForge" href="http://tapestry.javaforge.com/"/> - <item label="Tassel" href="http://equalitylearning.org/Tassel/"/> + <item label="Tassel" href="http://equalitylearning.org/Tassel/"/> <trails label="Trails" href="https://trails.dev.java.net/"/> </related> Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/tabs.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/tabs.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/content/xdocs/tabs.xml (original) +++ jakarta/tapestry/trunk/src/documentation/content/xdocs/tabs.xml Sat Mar 11 12:54:27 2006 @@ -23,7 +23,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink";> <tab label="Tapestry Project" dir="" href="index.html"/> - + <tab label="Quick Start" dir="QuickStart"/> <tab label="Users Guide" dir="UsersGuide" /> <tab label="Examples" dir="examples"/> Modified: jakarta/tapestry/trunk/src/documentation/skinconf.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/skinconf.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/src/documentation/skinconf.xml (original) +++ jakarta/tapestry/trunk/src/documentation/skinconf.xml Sat Mar 11 12:54:27 2006 @@ -81,10 +81,10 @@ <host-logo></host-logo> <!-- relative url of a favicon file, normally favicon.ico --> - <favicon-url></favicon-url> + <favicon-url>favicon.ico</favicon-url> <!-- The following are used to construct a copyright statement --> - <year>2005</year> + <year>2006</year> <vendor>Apache Software Foundation</vendor> <!-- The optional copyright-link URL will be used as a link in the copyright statement Modified: jakarta/tapestry/trunk/status.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=385164&r1=385163&r2=385164&view=diff ============================================================================== --- jakarta/tapestry/trunk/status.xml (original) +++ jakarta/tapestry/trunk/status.xml Sat Mar 11 12:54:27 2006 @@ -77,6 +77,71 @@ select values from a standard POJO object. </action> </release> + <release version="4.0.1" date="unreleased" > + <action type="fix" dev="JK" fixes-bug="TAPESTRY-863" due-to="unknown contributor"> + Form.set_focus() not compatible with some ie fields. Patch adds logic to check + more cross-browser friendly functions for setting focus. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-635" due-to="Raphael Jean" > + Applied patch upgrading tapestry to use commons-fileupload 1.1 as well as adding new + functionality enabling a more dynamic fileupload system for normal or portlet environments. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-831" > + Added error hint to encode message properties. It seems that 80% of the time the error + is caused by a class that doesn't implement Serializable. Added message hinting at this + in error strings. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-234" due-to="Matt Raible" > + Display name of SimpleTableColumn now replaces all instances of "." character with + "_". + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-802" due-to="Raphael Jean" > + In portlet mode, the portlet URLs obtained by createActionURL() or createRenderURL() + should NOT be encoded. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-525" due-to="Raphael Jean" > + When a Link component attempts to render its link during rewind, the + PortletLinkFactoryImpl crashes because _renderResponse is null. + </action> + <action type="fix" dev="JK" due-to="Andreas Andreou" > + Upload test was failing due to incorrect line number matching for + "Contents Match." string assertion. + </action> + <action type="fix" dev="JK" due-to="Zedros Schwart" > + Fixed links.ent reference to ExternalAsset, was missing asset package. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-875" due-to="Matthias Zitzmann/Brian K. Wallace" > + Using the DatePicker for a date format containing no "word delimiter" + doesn't work because of an inefficient limitational replacement-method + in DatePicker.js. I added a patch for this, because I've to work with a + date format of ddMMyy (without delimiter). With that patch it won't break + any more neither for regular date formats nor for this delimiter-free format + used in financial or touristics for example. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-170" due-to="Vjeran Marcinko/Brian K. Wallace"> + Modified contrib table column headers to use inlined style and css classes to + do table and image style definitions. Much more compatible with css now. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-876" due-to="Brian K. Wallace" > + Tapestry's resource finder throws a StringIndexOutOfBoundsException when + an asset doesn't contains a "." (the search result of 'lastIndexOf' is -1). + + The patch against trunk simply adds a check in the lastIndexOf as it is + assumed to be > -1 although the results of the check are used differently + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-880" due-to="Fernando Padilla" > + need 'port' parameter to supplement 'scheme' parameter for correct generation of urls + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-879" due-to="Olve Sæther Hansen" > + http://jakarta.apache.org/tapestry/UsersGuide/page-class.html + Has broken links to documentation about + tapestry.page.PageClassProviderChain and tapestry.page.ComponentClassProviderChain + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-453" > + Added new scriptAsset parameter, as well as param checking to be sure that only one + of scriptPath or scriptAsset can be set. + </action> + </release> <release version="4.0" date="Jan 6 2006"> <action type="update" dev="HLS">Add link to DeveloperWorks Tapestry article</action> </release> @@ -116,7 +181,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 interface for + <action type="fix" dev="HLS" fixes-bug="TAPESTRY-739">Change return type to inteface for: ListenerMapSource.createListenerMethodInvoker()</action> <action type="fix" dev="HLS" fixes-bug="TAPESTRY-387" due-to="Kevin J. Menard, Jr.">Typographical Errors in Documentation</action> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
