Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java Sat Aug 27 12:34:14 2011 @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -38,7 +37,7 @@ import org.apache.commons.chain.web.MapE * @version $Revision$ $Date$ */ -final class ServletSessionScopeMap implements Map { +final class ServletSessionScopeMap implements Map<String, Object> { public ServletSessionScopeMap(HttpServletRequest request) { @@ -51,16 +50,17 @@ final class ServletSessionScopeMap imple private HttpServletRequest request = null; + @Override public void clear() { if (sessionExists()) { - Iterator keys = keySet().iterator(); - while (keys.hasNext()) { - session.removeAttribute((String) keys.next()); + for (String key : keySet()) { + session.removeAttribute(key); } } } + @Override public boolean containsKey(Object key) { if (sessionExists()) { return (session.getAttribute(key(key)) != null); @@ -70,13 +70,14 @@ final class ServletSessionScopeMap imple } + @Override public boolean containsValue(Object value) { if (value == null || !sessionExists()) { return (false); } - Enumeration keys = session.getAttributeNames(); + Enumeration<String> keys = session.getAttributeNames(); while (keys.hasMoreElements()) { - Object next = session.getAttribute((String) keys.nextElement()); + Object next = session.getAttribute(keys.nextElement()); if (value.equals(next)) { return (true); } @@ -85,13 +86,14 @@ final class ServletSessionScopeMap imple } - public Set entrySet() { - Set set = new HashSet(); + @Override + public Set<Entry<String, Object>> entrySet() { + Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>(); if (sessionExists()) { - Enumeration keys = session.getAttributeNames(); + Enumeration<String> keys = session.getAttributeNames(); String key; while (keys.hasMoreElements()) { - key = (String) keys.nextElement(); + key = keys.nextElement(); set.add(new MapEntry(key, session.getAttribute(key), true)); } } @@ -99,6 +101,7 @@ final class ServletSessionScopeMap imple } + @Override public boolean equals(Object o) { if (sessionExists()) { return (session.equals(o)); @@ -108,6 +111,7 @@ final class ServletSessionScopeMap imple } + @Override public Object get(Object key) { if (sessionExists()) { return (session.getAttribute(key(key))); @@ -117,6 +121,7 @@ final class ServletSessionScopeMap imple } + @Override public int hashCode() { if (sessionExists()) { return (session.hashCode()); @@ -126,6 +131,7 @@ final class ServletSessionScopeMap imple } + @Override public boolean isEmpty() { if (sessionExists() && session.getAttributeNames().hasMoreElements()) { @@ -136,10 +142,11 @@ final class ServletSessionScopeMap imple } - public Set keySet() { - Set set = new HashSet(); + @Override + public Set<String> keySet() { + Set<String> set = new HashSet<String>(); if (sessionExists()) { - Enumeration keys = session.getAttributeNames(); + Enumeration<String> keys = session.getAttributeNames(); while (keys.hasMoreElements()) { set.add(keys.nextElement()); } @@ -148,7 +155,8 @@ final class ServletSessionScopeMap imple } - public Object put(Object key, Object value) { + @Override + public Object put(String key, Object value) { if (value == null) { return (remove(key)); } @@ -160,22 +168,21 @@ final class ServletSessionScopeMap imple request = null; } - String skey = key(key); - Object previous = session.getAttribute(skey); - session.setAttribute(skey, value); + Object previous = session.getAttribute(key); + session.setAttribute(key, value); return (previous); } - public void putAll(Map map) { - Iterator entries = map.entrySet().iterator(); - while (entries.hasNext()) { - Map.Entry entry = (Map.Entry)entries.next(); - put(entry.getKey(), entry.getValue()); + @Override + public void putAll(Map<? extends String, ? extends Object> map) { + for (Entry<? extends String, ? extends Object> entry : map.entrySet()) { + put(key(entry.getKey()), entry.getValue()); } } + @Override public Object remove(Object key) { if (sessionExists()) { String skey = key(key); @@ -188,10 +195,11 @@ final class ServletSessionScopeMap imple } + @Override public int size() { int n = 0; if (sessionExists()) { - Enumeration keys = session.getAttributeNames(); + Enumeration<String> keys = session.getAttributeNames(); while (keys.hasMoreElements()) { keys.nextElement(); n++; @@ -201,12 +209,13 @@ final class ServletSessionScopeMap imple } - public Collection values() { - List list = new ArrayList(); + @Override + public Collection<Object> values() { + List<Object> list = new ArrayList<Object>(); if (sessionExists()) { - Enumeration keys = session.getAttributeNames(); + Enumeration<String> keys = session.getAttributeNames(); while (keys.hasMoreElements()) { - list.add(session.getAttribute((String) keys.nextElement())); + list.add(session.getAttribute(keys.nextElement())); } } return (list);
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommand.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommand.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommand.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommand.java Sat Aug 27 12:34:14 2011 @@ -26,9 +26,12 @@ import org.apache.commons.chain.web.Abst /** * <p>Concrete implementation of {@link AbstractSetLocaleCommand} for * the Servlet API.</p> + * + * @param <T> Type of the context associated with this command + * */ -public class ServletSetLocaleCommand extends AbstractSetLocaleCommand { +public class ServletSetLocaleCommand<T extends Context> extends AbstractSetLocaleCommand<T> { // ------------------------------------------------------- Protected Methods @@ -40,7 +43,7 @@ public class ServletSetLocaleCommand ext * @param context The {@link Context} we are operating on. * @param locale The Locale for the request. */ - protected void setLocale(Context context, Locale locale) { + protected void setLocale(T context, Locale locale) { HttpServletResponse response = (HttpServletResponse) context.get("response"); Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java Sat Aug 27 12:34:14 2011 @@ -19,6 +19,7 @@ package org.apache.commons.chain.web.ser import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.chain.web.WebContext; @@ -71,7 +72,7 @@ public class ServletWebContext extends W * <p>The lazily instantiated <code>Map</code> of application scope * attributes.</p> */ - private Map applicationScope = null; + private Map<String, Object> applicationScope = null; /** @@ -84,41 +85,41 @@ public class ServletWebContext extends W * <p>The lazily instantiated <code>Map</code> of header name-value * combinations (immutable).</p> */ - private Map header = null; + private Map<String, String> header = null; /** * <p>The lazily instantitated <code>Map</code> of header name-values * combinations (immutable).</p> */ - private Map headerValues = null; + private Map<String, String[]> headerValues = null; /** * <p>The lazily instantiated <code>Map</code> of context initialization * parameters.</p> */ - private Map initParam = null; + private Map<String, String> initParam = null; /** * <p>The lazily instantiated <code>Map</code> of cookies.</p> */ - private Map cookieValues = null; + private Map<String, Cookie> cookieValues = null; /** * <p>The lazily instantiated <code>Map</code> of request * parameter name-value.</p> */ - private Map param = null; + private Map<String, String> param = null; /** * <p>The lazily instantiated <code>Map</code> of request * parameter name-values.</p> */ - private Map paramValues = null; + private Map<String, String[]> paramValues = null; /** @@ -131,7 +132,7 @@ public class ServletWebContext extends W * <p>The lazily instantiated <code>Map</code> of request scope * attributes.</p> */ - private Map requestScope = null; + private Map<String, Object> requestScope = null; /** @@ -144,7 +145,7 @@ public class ServletWebContext extends W * <p>The lazily instantiated <code>Map</code> of session scope * attributes.</p> */ - private Map sessionScope = null; + private Map<String, Object> sessionScope = null; // ---------------------------------------------------------- Public Methods @@ -244,7 +245,8 @@ public class ServletWebContext extends W * * @return Application scope Map. */ - public Map getApplicationScope() { + @Override + public Map<String, Object> getApplicationScope() { if ((applicationScope == null) && (context != null)) { applicationScope = new ServletApplicationScopeMap(context); @@ -259,7 +261,8 @@ public class ServletWebContext extends W * * @return Header values Map. */ - public Map getHeader() { + @Override + public Map<String, String> getHeader() { if ((header == null) && (request != null)) { header = new ServletHeaderMap(request); @@ -274,7 +277,8 @@ public class ServletWebContext extends W * * @return Header values Map. */ - public Map getHeaderValues() { + @Override + public Map<String, String[]> getHeaderValues() { if ((headerValues == null) && (request != null)) { headerValues = new ServletHeaderValuesMap(request); @@ -289,7 +293,8 @@ public class ServletWebContext extends W * * @return Initialization parameter Map. */ - public Map getInitParam() { + @Override + public Map<String, String> getInitParam() { if ((initParam == null) && (context != null)) { initParam = new ServletInitParamMap(context); @@ -304,7 +309,8 @@ public class ServletWebContext extends W * * @return Request parameter Map. */ - public Map getParam() { + @Override + public Map<String, String> getParam() { if ((param == null) && (request != null)) { param = new ServletParamMap(request); @@ -319,7 +325,8 @@ public class ServletWebContext extends W * * @return Request parameter Map. */ - public Map getParamValues() { + @Override + public Map<String, String[]> getParamValues() { if ((paramValues == null) && (request != null)) { paramValues = new ServletParamValuesMap(request); @@ -335,7 +342,8 @@ public class ServletWebContext extends W * @return Map of Cookies. * @since Chain 1.1 */ - public Map getCookies() { + @Override + public Map<String, Cookie> getCookies() { if ((cookieValues == null) && (request != null)) { cookieValues = new ServletCookieMap(request); @@ -350,7 +358,8 @@ public class ServletWebContext extends W * * @return Request scope Map. */ - public Map getRequestScope() { + @Override + public Map<String, Object> getRequestScope() { if ((requestScope == null) && (request != null)) { requestScope = new ServletRequestScopeMap(request); @@ -365,7 +374,8 @@ public class ServletWebContext extends W * * @return Session scope Map. */ - public Map getSessionScope() { + @Override + public Map<String, Object> getSessionScope() { if ((sessionScope == null) && (request != null)) { sessionScope = new ServletSessionScopeMap(request); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParser2TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParser2TestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParser2TestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParser2TestCase.java Sat Aug 27 12:34:14 2011 @@ -111,7 +111,7 @@ public class ConfigParser2TestCase exten // Load the default test-config.xml file and examine the results - public void testDefaut() throws Exception { + public void testDefault() throws Exception { // Check overall command count load(DEFAULT_XML); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java Sat Aug 27 12:34:14 2011 @@ -109,7 +109,7 @@ public class ConfigParserTestCase extend // Load the default test-config.xml file and examine the results - public void testDefaut() throws Exception { + public void testDefault() throws Exception { // Check overall command count load(DEFAULT_XML); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -126,17 +126,19 @@ public class DispatchCommandTestCase ext } - class TestAlternateContext extends java.util.HashMap implements Context { + class TestAlternateContext extends java.util.HashMap<String, Object> implements Context { Context wrappedContext = null; TestAlternateContext(Context context) { this.wrappedContext = context; } + @Override public Object get(Object o) { return this.wrappedContext.get(o); } - public Object put(Object key, Object value) { + @Override + public Object put(String key, Object value) { return this.wrappedContext.put(key, value); } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchLookupCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchLookupCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchLookupCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/DispatchLookupCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -47,7 +47,7 @@ public class DispatchLookupCommandTestCa /** * The {@link DispatchLookupCommand} instance under test. */ - protected DispatchLookupCommand command; + protected DispatchLookupCommand<Context> command; /** * The {@link Context} instance on which to execute the chain. @@ -76,7 +76,7 @@ public class DispatchLookupCommandTestCa public void setUp() { catalog = new CatalogBase(); CatalogFactoryBase.getInstance().setCatalog(catalog); - command = new DispatchLookupCommand(); + command = new DispatchLookupCommand<Context>(); context = new ContextBase(); } @@ -95,7 +95,7 @@ public class DispatchLookupCommandTestCa */ public void tearDown() { catalog = null; - CatalogFactoryBase.getInstance().clear(); + CatalogFactoryBase.clear(); command = null; context = null; } @@ -109,7 +109,7 @@ public class DispatchLookupCommandTestCa public void testExecuteDispatchLookup_1a() { // use default catalog - catalog.addCommand("fooCommand", new TestCommand("1")); + catalog.addCommand("fooCommand", new TestCommand<Context>("1")); // command should lookup the fooCommand and execute the fooMethod command.setName("fooCommand"); @@ -209,19 +209,19 @@ public class DispatchLookupCommandTestCa // ---------------------------------------------------------- Inner Classes - class TestCommand extends NonDelegatingCommand { + class TestCommand<T extends Context> extends NonDelegatingCommand<T> { public TestCommand(String id) { super(id); } - public boolean fooMethod(Context context) { + public boolean fooMethod(T context) { log(context, id); return true; } - public boolean barMethod(Context context) { + public boolean barMethod(T context) { log(context, id); return true; } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/LookupCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/LookupCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/LookupCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/generic/LookupCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -20,6 +20,7 @@ package org.apache.commons.chain.generic import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.chain.Chain; import org.apache.commons.chain.Context; import org.apache.commons.chain.Catalog; import org.apache.commons.chain.impl.CatalogBase; @@ -49,7 +50,7 @@ public class LookupCommandTestCase exten /** * The {@link LookupCommand} instance under test. */ - protected LookupCommand command; + protected LookupCommand<Context> command; /** * The {@link Context} instance on which to execute the chain. @@ -78,7 +79,7 @@ public class LookupCommandTestCase exten public void setUp() { catalog = new CatalogBase(); CatalogFactoryBase.getInstance().setCatalog(catalog); - command = new LookupCommand(); + command = new LookupCommand<Context>(); context = new ContextBase(); } @@ -95,7 +96,7 @@ public class LookupCommandTestCase exten */ public void tearDown() { catalog = null; - CatalogFactoryBase.getInstance().clear(); + CatalogFactoryBase.clear(); command = null; context = null; } @@ -123,7 +124,7 @@ public class LookupCommandTestCase exten // Test ability to lookup and execute a chain public void testExecuteMethodLookup_1b() { - ChainBase chain = new ChainBase(); + ChainBase<Context> chain = new ChainBase<Context>(); chain.addCommand(new DelegatingCommand("1b1")); chain.addCommand(new DelegatingCommand("1b2")); chain.addCommand(new NonDelegatingCommand("1b3")); @@ -162,7 +163,7 @@ public class LookupCommandTestCase exten // Test ability to lookup and execute a chain using the context public void testExecuteMethodLookup_2b() { - ChainBase chain = new ChainBase(); + Chain<Context> chain = new ChainBase<Context>(); chain.addCommand(new DelegatingCommand("2b1")); chain.addCommand(new DelegatingCommand("2b2")); chain.addCommand(new NonDelegatingCommand("2b3")); @@ -185,7 +186,7 @@ public class LookupCommandTestCase exten public void testExecuteMethodLookup_3a() { // use default catalog - catalog.addCommand("foo", new NonDelegatingCommand("3a")); + catalog.addCommand("foo", new NonDelegatingCommand<Context>("3a")); command.setIgnoreExecuteResult(true); command.setName("foo"); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/impl/NonDelegatingCommand.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/impl/NonDelegatingCommand.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/impl/NonDelegatingCommand.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/impl/NonDelegatingCommand.java Sat Aug 27 12:34:14 2011 @@ -29,7 +29,7 @@ import org.apache.commons.chain.Context; * @version $Revision$ $Date$ */ -public class NonDelegatingCommand implements Command { +public class NonDelegatingCommand<T extends Context> implements Command<T> { // ------------------------------------------------------------ Constructor @@ -65,7 +65,7 @@ public class NonDelegatingCommand implem // Execution method for this Command - public boolean execute(Context context) throws Exception { + public boolean execute(T context) throws Exception { if (context == null) { throw new IllegalArgumentException(); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletContext.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletContext.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletContext.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletContext.java Sat Aug 27 12:34:14 2011 @@ -135,4 +135,8 @@ public class MockPortletContext implemen attributes.put(name, value); } + public Enumeration<String> getContainerRuntimeOptions() { + throw new UnsupportedOperationException("Not supported yet."); + } + } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletRequest.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletRequest.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletRequest.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletRequest.java Sat Aug 27 12:34:14 2011 @@ -17,6 +17,7 @@ package org.apache.commons.chain.web.portlet; +import javax.servlet.http.Cookie; import org.apache.commons.chain.web.MockEnumeration; import org.apache.commons.chain.web.MockPrincipal; @@ -312,4 +313,21 @@ public class MockPortletRequest implemen } } + public Cookie[] getCookies() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Map<String, String[]> getPrivateParameterMap() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Map<String, String[]> getPublicParameterMap() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String getWindowID() { + throw new UnsupportedOperationException("Not supported yet."); + } + + } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletSession.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletSession.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletSession.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/MockPortletSession.java Sat Aug 27 12:34:14 2011 @@ -172,4 +172,13 @@ public class MockPortletSession implemen } } + public Map<String, Object> getAttributeMap() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Map<String, Object> getAttributeMap(int scope) { + throw new UnsupportedOperationException("Not supported yet."); + } + + } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -125,7 +125,7 @@ public class PortletGetLocaleCommandTest // Test default behavior - public void testDefaut() throws Exception { + public void testDefault() throws Exception { assertEquals("locale", command.getLocaleKey()); check(context, command); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/MockServletContext.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/MockServletContext.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/MockServletContext.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/MockServletContext.java Sat Aug 27 12:34:14 2011 @@ -149,5 +149,8 @@ public class MockServletContext implemen attributes.put(name, value); } + public String getContextPath() { + throw new UnsupportedOperationException("Not supported yet."); + } } Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -128,7 +128,7 @@ public class ServletGetLocaleCommandTest // Test default behavior - public void testDefaut() throws Exception { + public void testDefault() throws Exception { assertEquals("locale", command.getLocaleKey()); check(context, command); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommandTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommandTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommandTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommandTestCase.java Sat Aug 27 12:34:14 2011 @@ -127,7 +127,7 @@ public class ServletSetLocaleCommandTest // Test default behavior - public void testDefaut() throws Exception { + public void testDefault() throws Exception { assertEquals("locale", command.getLocaleKey()); check(context, command); Modified: commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletWebContextTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletWebContextTestCase.java?rev=1162332&r1=1162331&r2=1162332&view=diff ============================================================================== --- commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletWebContextTestCase.java (original) +++ commons/proper/chain/branches/version-2.0-work/src/test/java/org/apache/commons/chain/web/servlet/ServletWebContextTestCase.java Sat Aug 27 12:34:14 2011 @@ -500,7 +500,7 @@ public class ServletWebContextTestCase e try { map.put("ckey3", "XXX"); fail("Should have thrown UnsupportedOperationException"); - } catch (UnsupportedOperationException e) { + } catch (ClassCastException e) { ; // expected result } try {
