You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/07/19 13:42:55 UTC
svn commit: r1363305 [1/3] - in /commons/proper/chain/trunk:
apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/
apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/
apps/cookbook-examples/s...
Author: simonetripodi
Date: Thu Jul 19 11:42:53 2012
New Revision: 1363305
URL: http://svn.apache.org/viewvc?rev=1363305&view=rev
Log:
just removed empty lines, no functional modifications
Modified:
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Controller.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/ProcessException.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Request.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/RequestHandler.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Response.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ControllerCatalog.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/HandlerCommand.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/RequestContext.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ResponseContext.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReader.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReaderServlet.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LocaleChange.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LogonUser.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/ProfileCheck.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/Profile.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileCheck.java
commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileContext.java
commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/WebContext.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Controller.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Controller.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Controller.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Controller.java Thu Jul 19 11:42:53 2012
@@ -20,7 +20,11 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public interface Controller {
+
void addHandler(RequestHandler handler);
+
RequestHandler getHandler(String name);
+
void process(Request request);
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/ProcessException.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/ProcessException.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/ProcessException.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/ProcessException.java Thu Jul 19 11:42:53 2012
@@ -20,7 +20,9 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public class ProcessException extends RuntimeException {
+
public ProcessException(Throwable cause) {
super(cause);
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Request.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Request.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Request.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Request.java Thu Jul 19 11:42:53 2012
@@ -20,7 +20,11 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public interface Request {
+
String getName();
+
Response getResponse();
+
void setResponse(Response response);
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/RequestHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/RequestHandler.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/RequestHandler.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/RequestHandler.java Thu Jul 19 11:42:53 2012
@@ -20,6 +20,9 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public interface RequestHandler {
+
String getName();
+
void handle(Request request);
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Response.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Response.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Response.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/Response.java Thu Jul 19 11:42:53 2012
@@ -20,5 +20,7 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public interface Response {
+
String getName();
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ControllerCatalog.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ControllerCatalog.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ControllerCatalog.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ControllerCatalog.java Thu Jul 19 11:42:53 2012
@@ -48,4 +48,5 @@ public class ControllerCatalog extends C
handler.handle(request);
}
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/HandlerCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/HandlerCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/HandlerCommand.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/HandlerCommand.java Thu Jul 19 11:42:53 2012
@@ -27,6 +27,7 @@ import org.apache.commons.chain2.cookboo
*/
public class HandlerCommand implements Command<String, Object, RequestContext>,
RequestHandler {
+
private String name = null;
public HandlerCommand(String name) {
@@ -52,4 +53,5 @@ public class HandlerCommand implements C
return CONTINUE_PROCESSING;
}
-}
\ No newline at end of file
+
+}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/RequestContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/RequestContext.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/RequestContext.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/RequestContext.java Thu Jul 19 11:42:53 2012
@@ -26,6 +26,7 @@ import org.apache.commons.chain2.impl.Co
public class RequestContext extends ContextBase implements Request {
private String name;
+
private Response response;
public RequestContext(String name) {
@@ -44,4 +45,5 @@ public class RequestContext extends Cont
public void setResponse(Response response) {
this.response = response;
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ResponseContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ResponseContext.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ResponseContext.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/agility/impl/ResponseContext.java Thu Jul 19 11:42:53 2012
@@ -34,4 +34,5 @@ public class ResponseContext extends Con
public String getName() {
return name;
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReader.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReader.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReader.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReader.java Thu Jul 19 11:42:53 2012
@@ -29,6 +29,7 @@ public class MailReader extends ContextB
public static final String LOCALE_KEY = "locale";
private Writer logger;
+
private Locale locale;
public MailReader() {
@@ -49,4 +50,5 @@ public class MailReader extends ContextB
public void setLogger(Writer logger) {
this.logger = logger;
}
-}
\ No newline at end of file
+
+}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReaderServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReaderServlet.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReaderServlet.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/MailReaderServlet.java Thu Jul 19 11:42:53 2012
@@ -30,6 +30,7 @@ import java.io.IOException;
* @version $Id$
*/
public class MailReaderServlet extends HttpServlet {
+
public MailReaderServlet() {
}
@@ -53,4 +54,5 @@ public class MailReaderServlet extends H
profileCheckCmd.execute(context);
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LocaleChange.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LocaleChange.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LocaleChange.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LocaleChange.java Thu Jul 19 11:42:53 2012
@@ -26,6 +26,7 @@ import java.io.Writer;
* @version $Id$
*/
public class LocaleChange implements Command<String, Object, MailReader> {
+
public LocaleChange() {
}
@@ -40,4 +41,5 @@ public class LocaleChange implements Com
return CONTINUE_PROCESSING;
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LogonUser.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LogonUser.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LogonUser.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/LogonUser.java Thu Jul 19 11:42:53 2012
@@ -25,6 +25,7 @@ import java.io.IOException;
* @version $Id$
*/
public class LogonUser implements Command<String, Object, MailReader> {
+
public LogonUser() {
}
@@ -37,4 +38,5 @@ public class LogonUser implements Comman
return CONTINUE_PROCESSING;
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/ProfileCheck.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/ProfileCheck.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/ProfileCheck.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/mailreader/commands/ProfileCheck.java Thu Jul 19 11:42:53 2012
@@ -25,6 +25,7 @@ import java.io.IOException;
* @version $Id$
*/
public class ProfileCheck implements Command<String, Object, MailReader> {
+
public ProfileCheck() {
}
@@ -37,4 +38,5 @@ public class ProfileCheck implements Com
return CONTINUE_PROCESSING;
}
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/Profile.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/Profile.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/Profile.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/Profile.java Thu Jul 19 11:42:53 2012
@@ -20,5 +20,7 @@ package org.apache.commons.chain2.cookbo
* @version $Id$
*/
public class Profile {
+
public static final String PROFILE_KEY = "profile";
+
}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileCheck.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileCheck.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileCheck.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileCheck.java Thu Jul 19 11:42:53 2012
@@ -33,4 +33,5 @@ public class ProfileCheck implements Com
}
return false;
}
-}
\ No newline at end of file
+
+}
Modified: commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileContext.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileContext.java (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/src/main/java/org/apache/commons/chain2/cookbook/profile/ProfileContext.java Thu Jul 19 11:42:53 2012
@@ -22,6 +22,7 @@ import org.apache.commons.chain2.impl.Co
* @version $Id$
*/
public class ProfileContext extends ContextBase {
+
private Profile profile;
public ProfileContext() {
@@ -34,4 +35,5 @@ public class ProfileContext extends Cont
public void setProfile(Profile profile) {
this.profile = profile;
}
-}
\ No newline at end of file
+
+}
Modified: commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java Thu Jul 19 11:42:53 2012
@@ -16,30 +16,25 @@
*/
package org.apache.commons.chain2.apps.example;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.WebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Bar Command</p>
*
* @version $Id$
*/
-
public class CountCommand implements Command<String, Object, WebContext> {
-
private Log log = LogFactory.getLog(CountCommand.class);
private int count;
private String attribute = "count";
-
/**
* Return the request attribute name to store the count under.
*
@@ -49,7 +44,6 @@ public class CountCommand implements Com
return attribute;
}
-
/**
* Set the request attribute name to store the count under.
*
@@ -59,7 +53,6 @@ public class CountCommand implements Com
this.attribute = attribute;
}
-
/**
* <p>Execute the command.</p>
*
@@ -67,15 +60,12 @@ public class CountCommand implements Com
* @return <code>false</code> so that processng will continue
*/
public boolean execute(WebContext context) {
-
count++;
log.info("Executing: " + attribute + "=" + count);
context.getSessionScope().put(attribute, new Integer(count));
return false;
-
}
-
}
Modified: commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.apps.example;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.servlet.ServletWebContext;
@@ -32,15 +31,12 @@ import java.lang.RuntimeException;
*
* @version $Id$
*/
-
public class ForwardCommand implements Command<String, Object, ServletWebContext> {
-
private Log log = LogFactory.getLog(ForwardCommand.class);
private String forward;
-
/**
* Return the uri to forward to.
*
@@ -50,7 +46,6 @@ public class ForwardCommand implements C
return forward;
}
-
/**
* Set the uri to forward to.
*
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java Thu Jul 19 11:42:53 2012
@@ -16,30 +16,25 @@
*/
package org.apache.commons.chain2.apps.example;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.WebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Bar Command</p>
*
* @version $Id$
*/
-
public class CountCommand implements Command<String, Object, WebContext> {
-
private Log log = LogFactory.getLog(CountCommand.class);
private int count;
private String attribute = "count";
-
/**
* Return the request attribute name to store the count under.
*
@@ -49,7 +44,6 @@ public class CountCommand implements Com
return attribute;
}
-
/**
* Set the request attribute name to store the count under.
*
@@ -59,7 +53,6 @@ public class CountCommand implements Com
this.attribute = attribute;
}
-
/**
* <p>Execute the command.</p>
*
@@ -67,15 +60,12 @@ public class CountCommand implements Com
* @return <code>false</code> so that processng will continue
*/
public boolean execute(WebContext context) {
-
count++;
log.info("Executing: " + attribute + "=" + count);
context.getSessionScope().put(attribute, new Integer(count));
return false;
-
}
-
}
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java Thu Jul 19 11:42:53 2012
@@ -58,7 +58,6 @@ public class ExampleServlet extends Http
}
}
-
/**
* <p>Configure a {@link ServletWebContext} for the current request, and
* pass it to the <code>execute()</code> method of the specified
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ForwardCommand.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.apps.example;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.servlet.ServletWebContext;
@@ -31,15 +30,12 @@ import java.io.IOException;
*
* @version $Id$
*/
-
public class ForwardCommand implements Command<String, Object, ServletWebContext> {
-
private Log log = LogFactory.getLog(ForwardCommand.class);
private String forward;
-
/**
* Return the uri to forward to.
*
@@ -49,7 +45,6 @@ public class ForwardCommand implements C
return forward;
}
-
/**
* Set the uri to forward to.
*
Modified: commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java (original)
+++ commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.config;
-
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
import org.apache.commons.digester3.Rule;
@@ -24,7 +23,6 @@ import org.xml.sax.Attributes;
import java.util.Map;
-
/**
* <p>Digester rule that will cause the top-most element on the Digester
* stack (if it is a {@link Catalog} to be registered with the
@@ -37,10 +35,8 @@ import java.util.Map;
*/
class ConfigCatalogRule extends Rule {
-
// ----------------------------------------------------------- Constructors
-
/**
* <p>Construct a new instance of this rule that looks for an attribute
* with the specified name.</p>
@@ -56,27 +52,22 @@ class ConfigCatalogRule extends Rule {
this.catalogClass = catalogClass;
}
-
// ----------------------------------------------------- Instance Variables
-
/**
* <p>The fully qualified class name of a {@link Catalog} class to use for
* instantiating new instances.</p>
*/
private String catalogClass = null;
-
/**
* <p>The name of the attribute under which we can retrieve the name
* this catalog should be registered with (if any).</p>
*/
private String nameAttribute = null;
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Retrieve or create a {@link Catalog} with the name specified by
* the <code>nameAttribute</code> attribute, or the default {@link Catalog}
@@ -91,9 +82,7 @@ class ConfigCatalogRule extends Rule {
* @param attributes The attribute list of this element
*/
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
-
+ public void begin(String namespace, String name, Attributes attributes) throws Exception {
// Retrieve any current Catalog with the specified name
Catalog<Object, Object, Map<Object, Object>> catalog;
CatalogFactory<Object, Object, Map<Object, Object>> factory = CatalogFactory.getInstance();
Modified: commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java (original)
+++ commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java Thu Jul 19 11:42:53 2012
@@ -16,11 +16,9 @@
*/
package org.apache.commons.chain2.config;
-
import org.apache.commons.digester3.Rule;
import org.xml.sax.Attributes;
-
/**
* <p>Digester rule that will dynamically register a new set of rules
* for a specified element name and default implementation class. This
@@ -32,13 +30,10 @@ import org.xml.sax.Attributes;
*
* @version $Id$
*/
-
class ConfigDefineRule extends Rule {
-
// ----------------------------------------------------------- Constructors
-
/**
* <p>Construct a new instance of this rule that will in turn
* dynamically register appropriate rules for a new alias element.</p>
@@ -54,10 +49,8 @@ class ConfigDefineRule extends Rule {
this.classAttribute = classAttribute;
}
-
// ----------------------------------------------------- Instance Variables
-
/**
* <p>The name of the attribute under which we can retrieve the
* fully qualified class name of the implementation class for this
@@ -65,17 +58,14 @@ class ConfigDefineRule extends Rule {
*/
private String classAttribute = null;
-
/**
* <p>The name of the attribute under which we can retrieve the name
* this element for which rules should be created.</p>
*/
private String nameAttribute = null;
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Register new rules for the specified name and class.</p>
*
@@ -86,9 +76,7 @@ class ConfigDefineRule extends Rule {
* the element name otherwise
* @param attributes The attribute list of this element
*/
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
-
+ public void begin(String namespace, String name, Attributes attributes) throws Exception {
// Extract the actual name and implementation class to use
String nameValue = attributes.getValue(nameAttribute);
String classValue = attributes.getValue(classAttribute);
@@ -96,10 +84,7 @@ class ConfigDefineRule extends Rule {
// Add rules for this new element
getDigester().addObjectCreate("*/" + nameValue, classValue);
getDigester().addSetProperties("*/" + nameValue);
- getDigester().addRule("*/" + nameValue,
- new ConfigRegisterRule(nameAttribute));
-
+ getDigester().addRule("*/" + nameValue, new ConfigRegisterRule(nameAttribute));
}
-
}
Modified: commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigParser.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigParser.java (original)
+++ commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigParser.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.config;
-
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.Context;
import org.apache.commons.digester3.Digester;
@@ -24,7 +23,6 @@ import org.apache.commons.digester3.Rule
import java.net.URL;
-
/**
* <p>Class to parse the contents of an XML configuration file (using
* Commons Digester) that defines and configures commands and command chains
@@ -38,33 +36,27 @@ import java.net.URL;
*/
public class ConfigParser {
-
// ----------------------------------------------------- Instance Variables
-
/**
* <p>The <code>RuleSet</code> to be used for configuring our Digester
* parsing rules.</p>
*/
private RuleSet ruleSet = new ConfigRuleSet();
-
/**
* <p>Should Digester use the context class loader?
*/
private boolean useContextClassLoader = true;
-
// ------------------------------------------------------------- Properties
-
/**
* <p>Return the <code>Digester</code> instance to be used for
* parsing, creating one if necessary.</p>
* @return A Digester instance.
*/
public Digester getDigester() {
-
Digester digester = new Digester();
RuleSet ruleSet = getRuleSet();
digester.setNamespaceAware(ruleSet.getNamespaceURI() != null);
@@ -72,22 +64,17 @@ public class ConfigParser {
digester.setValidating(false);
digester.addRuleSet(ruleSet);
return (digester);
-
}
-
/**
* <p>Return the <code>RuleSet</code> to be used for configuring
* our <code>Digester</code> parsing rules, creating one if necessary.</p>
* @return The RuleSet for configuring a Digester instance.
*/
public RuleSet getRuleSet() {
-
return (ruleSet);
-
}
-
/**
* <p>Set the <code>RuleSet</code> to be used for configuring
* our <code>Digester</code> parsing rules.</p>
@@ -95,12 +82,9 @@ public class ConfigParser {
* @param ruleSet The new RuleSet to use
*/
public void setRuleSet(RuleSet ruleSet) {
-
this.ruleSet = ruleSet;
-
}
-
/**
* <p>Return the "use context class loader" flag. If set to
* <code>true</code>, Digester will attempt to instantiate new
@@ -108,27 +92,20 @@ public class ConfigParser {
* @return <code>true</code> if Digester should use the context class loader.
*/
public boolean getUseContextClassLoader() {
-
return (this.useContextClassLoader);
-
}
-
/**
* <p>Set the "use context class loader" flag.</p>
*
* @param useContextClassLoader The new flag value
*/
public void setUseContextClassLoader(boolean useContextClassLoader) {
-
this.useContextClassLoader = useContextClassLoader;
-
}
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Parse the XML document at the specified URL, using the configured
* <code>RuleSet</code>, registering top level commands into the specified
@@ -151,7 +128,6 @@ public class ConfigParser {
*/
@Deprecated
public <K, V, C extends Context<K, V>> void parse(Catalog<K, V, C> catalog, URL url) throws Exception {
-
// Prepare our Digester instance
Digester digester = getDigester();
digester.clear();
@@ -159,10 +135,8 @@ public class ConfigParser {
// Parse the configuration document
digester.parse(url);
-
}
-
/**
* <p>Parse the XML document at the specified URL using the configured
* <code>RuleSet</code>, registering catalogs with nested chains and
@@ -175,15 +149,12 @@ public class ConfigParser {
* @exception Exception if a parsing error occurs
*/
public void parse(URL url) throws Exception {
-
// Prepare our Digester instance
Digester digester = getDigester();
digester.clear();
// Parse the configuration document
digester.parse(url);
-
}
-
}
Modified: commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java (original)
+++ commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.config;
-
import java.util.Map;
import org.apache.commons.chain2.Catalog;
@@ -25,7 +24,6 @@ import org.apache.commons.chain2.Command
import org.apache.commons.digester3.Rule;
import org.xml.sax.Attributes;
-
/**
* <p>Digester rule that will cause the top-most element on the Digester
* stack (if it is a {@link Command} to be registered with the next-to-top
@@ -38,10 +36,8 @@ import org.xml.sax.Attributes;
*/
class ConfigRegisterRule extends Rule {
-
// ----------------------------------------------------------- Constructors
-
/**
* <p>Construct a new instance of this rule that looks for an attribute
* with the specified name.</p>
@@ -54,20 +50,16 @@ class ConfigRegisterRule extends Rule {
this.nameAttribute = nameAttribute;
}
-
// ----------------------------------------------------- Instance Variables
-
/**
* <p>The name of the attribute under which we can retrieve the name
* this command should be registered with.</p>
*/
private String nameAttribute = null;
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Register the top {@link Command} if appropriate.</p>
*
@@ -79,9 +71,7 @@ class ConfigRegisterRule extends Rule {
* @param attributes The attribute list of this element
*/
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
-
+ public void begin(String namespace, String name, Attributes attributes) throws Exception {
// Is the top object a Command?
Object top = getDigester().peek(0);
if ((top == null)
@@ -119,5 +109,4 @@ class ConfigRegisterRule extends Rule {
}
}
-
}
Modified: commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java (original)
+++ commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java Thu Jul 19 11:42:53 2012
@@ -16,11 +16,9 @@
*/
package org.apache.commons.chain2.config;
-
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.RuleSetBase;
-
/**
* <p>Digester <code>RuleSet</code> for configuring <em>Chain of
* Responsibility</em> command chains, and adding them to an appropriate
@@ -75,26 +73,28 @@ import org.apache.commons.digester3.Rule
*
* @version $Id$
*/
-
public class ConfigRuleSet extends RuleSetBase {
-
// ----------------------------------------------------- Instance Variables
-
private String catalogClass = "org.apache.commons.chain2.impl.CatalogBase";
+
private String catalogElement = "catalog";
+
private String chainClass = "org.apache.commons.chain2.impl.ChainBase";
+
private String chainElement = "chain";
+
private String classAttribute = "className";
+
private String commandElement = "command";
+
private String defineElement = "define";
- private String nameAttribute = "name";
+ private String nameAttribute = "name";
// ------------------------------------------------------------- Properties
-
/**
* <p>Return the fully qualified {@link org.apache.commons.chain2.Catalog}
* implementation class.</p>
@@ -104,7 +104,6 @@ public class ConfigRuleSet extends RuleS
return (this.catalogClass);
}
-
/**
* <p>Set the fully qualified {@link org.apache.commons.chain2.Catalog}
* implementation class.</p>
@@ -116,7 +115,6 @@ public class ConfigRuleSet extends RuleS
this.catalogClass = catalogClass;
}
-
/**
* <p>Return the element name of a catalog element.</p>
* @return The element name of a catalog element.
@@ -125,7 +123,6 @@ public class ConfigRuleSet extends RuleS
return (this.catalogElement);
}
-
/**
* <p>Set the element name of a catalog element.</p>
*
@@ -135,7 +132,6 @@ public class ConfigRuleSet extends RuleS
this.catalogElement = catalogElement;
}
-
/**
* <p>Return the fully qualified {@link org.apache.commons.chain2.Chain}
* implementation class.</p>
@@ -145,7 +141,6 @@ public class ConfigRuleSet extends RuleS
return (this.chainClass);
}
-
/**
* <p>Set the fully qualified {@link org.apache.commons.chain2.Chain}
* implementation class.</p>
@@ -157,7 +152,6 @@ public class ConfigRuleSet extends RuleS
this.chainClass = chainClass;
}
-
/**
* <p>Return the element name of a chain element.</p>
* @return The element name of a catalog element.
@@ -166,7 +160,6 @@ public class ConfigRuleSet extends RuleS
return (this.chainElement);
}
-
/**
* <p>Set the element name of a chain element.</p>
*
@@ -176,7 +169,6 @@ public class ConfigRuleSet extends RuleS
this.chainElement = chainElement;
}
-
/**
* <p>Return the attribute name of a class attribute.</p>
* @return The attribute name of a class attribute.
@@ -185,7 +177,6 @@ public class ConfigRuleSet extends RuleS
return (this.classAttribute);
}
-
/**
* <p>Set the attribute name of a class attribute.</p>
*
@@ -195,7 +186,6 @@ public class ConfigRuleSet extends RuleS
this.classAttribute = classAttribute;
}
-
/**
* <p>Return the element name of a command element.</p>
* @return The element name of a command element.
@@ -204,7 +194,6 @@ public class ConfigRuleSet extends RuleS
return (this.commandElement);
}
-
/**
* <p>Set the element name of a command element.</p>
*
@@ -214,7 +203,6 @@ public class ConfigRuleSet extends RuleS
this.commandElement = commandElement;
}
-
/**
* <p>Return the element name of a define element.</p>
* @return The element name of a define element.
@@ -223,7 +211,6 @@ public class ConfigRuleSet extends RuleS
return (this.defineElement);
}
-
/**
* <p>Set the element name of a define element.</p>
*
@@ -233,7 +220,6 @@ public class ConfigRuleSet extends RuleS
this.defineElement = defineElement;
}
-
/**
* <p>Return the attribute name of a name attribute.</p>
* @return The attribute name of an attribute element.
@@ -242,7 +228,6 @@ public class ConfigRuleSet extends RuleS
return (this.nameAttribute);
}
-
/**
* <p>Set the attribute name of a name attribute.</p>
*
@@ -252,10 +237,8 @@ public class ConfigRuleSet extends RuleS
this.nameAttribute = nameAttribute;
}
-
// --------------------------------------------------------- Public Methods
-
/**
* <p>Add the set of Rule instances defined in this RuleSet to the
* specified <code>Digester</code> instance, associating them with
@@ -266,7 +249,6 @@ public class ConfigRuleSet extends RuleS
* should be added.
*/
public void addRuleInstances(Digester digester) {
-
// Add rules for a catalog element
digester.addRule("*/" + getCatalogElement(),
new ConfigCatalogRule(nameAttribute, catalogClass));
@@ -292,8 +274,6 @@ public class ConfigRuleSet extends RuleS
digester.addRule("*/" + getDefineElement(),
new ConfigDefineRule(getNameAttribute(),
getClassAttribute()));
-
}
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java Thu Jul 19 11:42:53 2012
@@ -16,13 +16,11 @@
*/
package org.apache.commons.chain2.web;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import java.util.Locale;
-
/**
* <p>Abstract base {@link Command} implementation for retrieving the
* requested Locale from our {@link Context}, and storing it under the
@@ -32,20 +30,16 @@ import java.util.Locale;
*
* @version $Id$
*/
-
public abstract class AbstractGetLocaleCommand<C extends WebContext>
implements Command<String, Object, C> {
-
// -------------------------------------------------------------- Properties
-
/**
* <p>The context attribute key used to store the <code>Locale</code>.</p>
*/
private String localeKey = "locale";
-
/**
* <p>Return the context attribute key under which we will store
* the request <code>Locale</code>.</p>
@@ -53,12 +47,9 @@ public abstract class AbstractGetLocaleC
* @return The context attribute key of the request <code>Locale</code>.
*/
public String getLocaleKey() {
-
- return (this.localeKey);
-
+ return (this.localeKey);
}
-
/**
* <p>Set the context attribute key under which we will store
* the request <code>Locale</code>.</p>
@@ -66,15 +57,11 @@ public abstract class AbstractGetLocaleC
* @param localeKey The new context attribute key
*/
public void setLocaleKey(String localeKey) {
-
- this.localeKey = localeKey;
-
+ this.localeKey = localeKey;
}
-
// --------------------------------------------------------- Command Methods
-
/**
* <p>Retrieve the <code>Locale</code> for this request, and store it
* under the specified context attribute.</p>
@@ -85,16 +72,12 @@ public abstract class AbstractGetLocaleC
* @throws org.apache.commons.chain2.ChainException If an error occurs during execution.
*/
public boolean execute(C context) {
-
- context.put(getLocaleKey(), getLocale(context));
- return (false);
-
+ context.put(getLocaleKey(), getLocale(context));
+ return (false);
}
-
// ------------------------------------------------------- Protected Methods
-
/**
* <p>Retrieve and return the <code>Locale</code> for this request.</p>
* @param context The {@link Context} we are operating on.
@@ -102,5 +85,4 @@ public abstract class AbstractGetLocaleC
*/
protected abstract Locale getLocale(C context);
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java Thu Jul 19 11:42:53 2012
@@ -16,13 +16,11 @@
*/
package org.apache.commons.chain2.web;
-
import org.apache.commons.chain2.Command;
import org.apache.commons.chain2.Context;
import java.util.Locale;
-
/**
* <p>Abstract base {@link Command} implementation for setting the
* response locale for this response to the <code>Locale</code> stored
@@ -33,20 +31,16 @@ import java.util.Locale;
*
* @version $Id$
*/
-
public abstract class AbstractSetLocaleCommand<C extends WebContext>
implements Command<String, Object, C> {
-
// -------------------------------------------------------------- Properties
-
/**
* <p>The context attribute key used to retrieve the <code>Locale</code>.</p>
*/
private String localeKey = "locale";
-
/**
* <p>Return the context attribute key under which we will retrieve
* the response <code>Locale</code>.</p>
@@ -54,12 +48,9 @@ public abstract class AbstractSetLocaleC
* @return The context attribute key of the request <code>Locale</code>.
*/
public String getLocaleKey() {
-
- return (this.localeKey);
-
+ return (this.localeKey);
}
-
/**
* <p>Set the context attribute key under which we will retrieve
* the response <code>Locale</code>.</p>
@@ -67,15 +58,11 @@ public abstract class AbstractSetLocaleC
* @param localeKey The new context attribute key
*/
public void setLocaleKey(String localeKey) {
-
- this.localeKey = localeKey;
-
+ this.localeKey = localeKey;
}
-
// --------------------------------------------------------- Command Methods
-
/**
* <p>Retrieve the <code>Locale</code> stored under the specified
* context attribute key, and establish it on this response.</p>
@@ -86,17 +73,12 @@ public abstract class AbstractSetLocaleC
* @throws org.apache.commons.chain2.ChainException If an error occurs during execution.
*/
public boolean execute(C context) {
-
- setLocale(context,
- (Locale) context.get(getLocaleKey()));
- return (false);
-
+ setLocale(context, (Locale) context.get(getLocaleKey()));
+ return (false);
}
-
// ------------------------------------------------------- Protected Methods
-
/**
* <p>Establish the specified <code>Locale</code> for this response.</p>
*
@@ -105,5 +87,4 @@ public abstract class AbstractSetLocaleC
*/
protected abstract void setLocale(C context, Locale locale);
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.web;
-
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
import org.apache.commons.chain2.config.ConfigParser;
@@ -34,7 +33,6 @@ import java.net.URL;
import java.util.HashSet;
import java.util.Set;
-
/**
* <p><code>ServletContextListener</code> that automatically
* scans chain configuration files in the current web application at
@@ -94,13 +92,10 @@ import java.util.Set;
*
* @version $Id$
*/
-
public class ChainListener implements ServletContextListener {
-
// ------------------------------------------------------ Manifest Constants
-
/**
* <p>The name of the context init parameter containing the name of the
* servlet context attribute under which our resulting {@link Catalog}
@@ -109,7 +104,6 @@ public class ChainListener implements Se
public static final String CONFIG_ATTR =
"org.apache.commons.chain2.CONFIG_ATTR";
-
/**
* <p>The name of the context init parameter containing a comma-delimited
* list of class loader resources to be scanned.</p>
@@ -117,7 +111,6 @@ public class ChainListener implements Se
public static final String CONFIG_CLASS_RESOURCE =
"org.apache.commons.chain2.CONFIG_CLASS_RESOURCE";
-
/**
* <p>The name of the context init parameter containing a comma-delimited
* list of web applicaton resources to be scanned.</p>
@@ -125,7 +118,6 @@ public class ChainListener implements Se
public static final String CONFIG_WEB_RESOURCE =
"org.apache.commons.chain2.CONFIG_WEB_RESOURCE";
-
/**
* <p>The name of the context init parameter containing the fully
* qualified class name of the <code>RuleSet</code> implementation
@@ -134,10 +126,8 @@ public class ChainListener implements Se
public static final String RULE_SET =
"org.apache.commons.chain2.RULE_SET";
-
// ------------------------------------------ ServletContextListener Methods
-
/**
* <p>Remove the configured {@link Catalog} from the servlet context
* attributes for this web application.</p>
@@ -145,17 +135,14 @@ public class ChainListener implements Se
* @param event <code>ServletContextEvent</code> to be processed
*/
public void contextDestroyed(ServletContextEvent event) {
-
ServletContext context = event.getServletContext();
String attr = context.getInitParameter(CONFIG_ATTR);
if (attr != null) {
context.removeAttribute(attr);
}
CatalogFactory.clear();
-
}
-
/**
* <p>Scan the required chain configuration resources, assemble the
* configured chains into a {@link Catalog}, and expose it as a
@@ -164,7 +151,6 @@ public class ChainListener implements Se
* @param event <code>ServletContextEvent</code> to be processed
*/
public void contextInitialized(ServletContextEvent event) {
-
Log log = LogFactory.getLog(ChainListener.class);
if (log.isInfoEnabled()) {
log.info("Initializing chain listener");
@@ -228,13 +214,10 @@ public class ChainListener implements Se
if (attr != null) {
context.setAttribute(attr, catalog);
}
-
}
-
// --------------------------------------------------------- Private Methods
-
/**
* <p>Parse resources found in JAR files in the <code>/WEB-INF/lib</code>
* subdirectory (if any).</p>
@@ -244,7 +227,6 @@ public class ChainListener implements Se
*/
private void parseJarResources(ServletContext context,
ConfigParser parser, Log log) {
-
@SuppressWarnings( "unchecked" ) // it is known that always returns String inside
Set<String> jars = context.getResourcePaths("/WEB-INF/lib");
if (jars == null) {
@@ -289,7 +271,6 @@ public class ChainListener implements Se
+ e.getMessage());
}
}
-
}
/**
@@ -299,7 +280,6 @@ public class ChainListener implements Se
* @param value Value to translate
*/
private String translate(String value) {
-
while (true) {
int index = value.indexOf(' ');
if (index < 0) {
@@ -308,8 +288,6 @@ public class ChainListener implements Se
value = value.substring(0, index) + "%20" + value.substring(index + 1);
}
return (value);
-
}
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.web;
-
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +28,6 @@ import org.apache.commons.chain2.config.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Utility methods for loading class loader and web application resources
* to configure a {@link Catalog}. These methods are shared between
@@ -37,7 +35,6 @@ import org.apache.commons.logging.LogFac
*
* @version $Id$
*/
-
final class ChainResources {
/**
@@ -46,10 +43,8 @@ final class ChainResources {
private ChainResources() {
}
-
// ---------------------------------------------------------- Static Methods
-
/**
* <p>Parse the specified class loader resources.</p>
*
@@ -58,7 +53,6 @@ final class ChainResources {
*/
static void parseClassResources(String resources,
ConfigParser parser) {
-
if (resources == null) {
return;
}
@@ -88,10 +82,8 @@ final class ChainResources {
("Exception parsing chain config resource '" + path + "': "
+ e.getMessage());
}
-
}
-
/**
* <p>Parse the specified class loader resources.</p>
*
@@ -105,7 +97,6 @@ final class ChainResources {
@Deprecated
static void parseClassResources(Catalog catalog, String resources,
ConfigParser parser) {
-
if (resources == null) {
return;
}
@@ -135,10 +126,8 @@ final class ChainResources {
("Exception parsing chain config resource '" + path + "': "
+ e.getMessage());
}
-
}
-
/**
* <p>Parse the specified web application resources.</p>
*
@@ -149,7 +138,6 @@ final class ChainResources {
static void parseWebResources(ServletContext context,
String resources,
ConfigParser parser) {
-
if (resources == null) {
return;
}
@@ -174,10 +162,8 @@ final class ChainResources {
("Exception parsing chain config resource '" + path + "': "
+ e.getMessage());
}
-
}
-
/**
* <p>Parse the specified web application resources.</p>
*
@@ -193,7 +179,6 @@ final class ChainResources {
static void parseWebResources(Catalog catalog, ServletContext context,
String resources,
ConfigParser parser) {
-
if (resources == null) {
return;
}
@@ -218,10 +203,8 @@ final class ChainResources {
("Exception parsing chain config resource '" + path + "': "
+ e.getMessage());
}
-
}
-
/**
* <p> Parse the resource string into an array of paths. Empty entries will
* be skipped. (That is, all entries in the array are non-empty paths.)</p>
@@ -251,5 +234,4 @@ final class ChainResources {
return paths.toArray(new String[paths.size()]);
}
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.web;
-
import java.io.IOException;
import javax.servlet.ServletConfig;
@@ -35,7 +34,6 @@ import org.apache.commons.digester3.Rule
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p><code>Servlet</code> that automatically scans chain configuration files
* in the current web application at startup time, and exposes the result in a
@@ -93,19 +91,15 @@ import org.apache.commons.logging.LogFac
*
* @version $Id$
*/
-
public class ChainServlet extends HttpServlet {
-
// ------------------------------------------------------ Manifest Constants
-
/**
*
*/
private static final long serialVersionUID = -6545081938506661333L;
-
/**
* <p>The name of the context init parameter containing the name of the
* servlet context attribute under which our resulting {@link Catalog}
@@ -114,7 +108,6 @@ public class ChainServlet extends HttpSe
public static final String CONFIG_ATTR =
"org.apache.commons.chain2.CONFIG_ATTR";
-
/**
* <p>The name of the context init parameter containing a comma-delimited
* list of class loader resources to be scanned.</p>
@@ -122,7 +115,6 @@ public class ChainServlet extends HttpSe
public static final String CONFIG_CLASS_RESOURCE =
"org.apache.commons.chain2.CONFIG_CLASS_RESOURCE";
-
/**
* <p>The name of the context init parameter containing a comma-delimited
* list of web application resources to be scanned.</p>
@@ -130,7 +122,6 @@ public class ChainServlet extends HttpSe
public static final String CONFIG_WEB_RESOURCE =
"org.apache.commons.chain2.CONFIG_WEB_RESOURCE";
-
/**
* <p>The name of the context init parameter containing the fully
* qualified class name of the <code>RuleSet</code> implementation
@@ -139,15 +130,12 @@ public class ChainServlet extends HttpSe
public static final String RULE_SET =
"org.apache.commons.chain2.RULE_SET";
-
// --------------------------------------------------------- Servlet Methods
-
/**
* <p>Clean up after ourselves as this application shuts down.</p>
*/
public void destroy() {
-
ServletConfig config = getServletConfig();
ServletContext context = getServletContext();
String attr = config.getInitParameter(CONFIG_ATTR);
@@ -155,10 +143,8 @@ public class ChainServlet extends HttpSe
context.removeAttribute(attr);
}
CatalogFactory.clear();
-
}
-
/**
* <p>Create (if necessary) and configure a {@link Catalog} from the
* servlet init parameters that have been specified.</p>
@@ -166,7 +152,6 @@ public class ChainServlet extends HttpSe
* @throws ServletException if the servlet could not be initialized
*/
public void init() throws ServletException {
-
Log log = LogFactory.getLog(ChainServlet.class);
ServletConfig config = getServletConfig();
ServletContext context = getServletContext();
@@ -225,10 +210,8 @@ public class ChainServlet extends HttpSe
if (attr != null) {
context.setAttribute(attr, catalog);
}
-
}
-
/**
* <p>Does nothing; this servlet's only purpose is to initialize a Chain
* and store it in the servlet context.</p>
@@ -242,10 +225,7 @@ public class ChainServlet extends HttpSe
public void service(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
-
// do nothing
-
}
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java Thu Jul 19 11:42:53 2012
@@ -16,10 +16,8 @@
*/
package org.apache.commons.chain2.web;
-
import java.util.Map;
-
/**
* <p>Map.Entry implementation that can be constructed to either be read-only
* or not.</p>
@@ -29,10 +27,8 @@ import java.util.Map;
*
* @version $Id$
*/
-
public class MapEntry<K, V> implements Map.Entry<K, V> {
-
/**
* <p>The entry key.</p>
*/
@@ -48,7 +44,6 @@ public class MapEntry<K, V> implements M
*/
private boolean modifiable = false;
-
/**
* <p>Creates a map entry that can either allow modifications or not.</p>
*
@@ -62,7 +57,6 @@ public class MapEntry<K, V> implements M
this.modifiable = modifiable;
}
-
/**
* <p>Gets the entry key.</p>
*
@@ -72,7 +66,6 @@ public class MapEntry<K, V> implements M
return key;
}
-
/**
* <p>Gets the entry value.</p>
*
@@ -82,7 +75,6 @@ public class MapEntry<K, V> implements M
return value;
}
-
/**
* <p>Sets the entry value if the entry can be modified.</p>
*
@@ -100,7 +92,6 @@ public class MapEntry<K, V> implements M
}
}
-
/**
* <p>Determines if this entry is equal to the passed object.</p>
*
@@ -118,7 +109,6 @@ public class MapEntry<K, V> implements M
return false;
}
-
/**
* <p>Returns the hashcode for this entry.</p>
*
@@ -128,4 +118,5 @@ public class MapEntry<K, V> implements M
return (this.getKey() == null ? 0 : this.getKey().hashCode()) ^
(this.getValue() == null ? 0 : this.getValue().hashCode());
}
+
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/WebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/WebContext.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/WebContext.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/WebContext.java Thu Jul 19 11:42:53 2012
@@ -16,13 +16,11 @@
*/
package org.apache.commons.chain2.web;
-
import java.util.Map;
import javax.servlet.http.Cookie;
import org.apache.commons.chain2.impl.ContextBase;
-
/**
* <p>Abstract base implementation of {@link org.apache.commons.chain2.Context} that
* provides web based applications that use it a "generic" view of HTTP related
@@ -39,7 +37,6 @@ import org.apache.commons.chain2.impl.Co
*
* @version $Id$
*/
-
public abstract class WebContext extends ContextBase {
/**
@@ -57,7 +54,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, Object> getApplicationScope();
-
/**
* <p>Return an immutable <code>Map</code> that maps header names to
* the first (or only) header value (as a String). Header names must
@@ -67,7 +63,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, String> getHeader();
-
/**
* <p>Return an immutable <code>Map</code> that maps header names to
* the set of all values specified in the request (as a String array).
@@ -77,7 +72,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, String[]> getHeaderValues();
-
/**
* <p>Return an immutable <code>Map</code> that maps context application
* initialization parameters to their values.</p>
@@ -86,7 +80,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, String> getInitParam();
-
/**
* <p>Return an immutable <code>Map</code> that maps request parameter
* names to the first (or only) value (as a String).</p>
@@ -95,7 +88,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, String> getParam();
-
/**
* <p>Return an immutable <code>Map</code> that maps request parameter
* names to the set of all values (as a String array).</p>
@@ -104,7 +96,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, String[]> getParamValues();
-
/**
* <p>Return an immutable <code>Map</code> that maps cookie names to
* the set of cookies specified in the request.
@@ -114,7 +105,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, Cookie> getCookies();
-
/**
* <p>Return a mutable <code>Map</code> that maps request scope
* attribute names to their values.</p>
@@ -123,7 +113,6 @@ public abstract class WebContext extends
*/
public abstract Map<String, Object> getRequestScope();
-
/**
* <p>Return a mutable <code>Map</code> that maps session scope
* attribute names to their values.</p>
@@ -132,5 +121,4 @@ public abstract class WebContext extends
*/
public abstract Map<String, Object> getSessionScope();
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java Thu Jul 19 11:42:53 2012
@@ -16,28 +16,23 @@
*/
package org.apache.commons.chain2.web.faces;
-
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.AbstractGetLocaleCommand;
import javax.faces.context.FacesContext;
import java.util.Locale;
-
/**
* <p>Concrete implementation of {@link AbstractGetLocaleCommand} for
* the JavaServer Faces API.</p>
*
* @version $Id$
*/
-
public class FacesGetLocaleCommand
extends AbstractGetLocaleCommand<FacesWebContext> {
-
// ------------------------------------------------------- Protected Methods
-
/**
* <p>Retrieve and return the <code>Locale</code> for this request.</p>
*
@@ -45,12 +40,8 @@ public class FacesGetLocaleCommand
* @return The Locale for the request.
*/
protected Locale getLocale(FacesWebContext context) {
-
FacesContext fcontext = (FacesContext)context.get("context");
-
return (fcontext.getViewRoot().getLocale());
-
}
-
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java Thu Jul 19 11:42:53 2012
@@ -16,14 +16,12 @@
*/
package org.apache.commons.chain2.web.faces;
-
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.web.AbstractSetLocaleCommand;
import javax.faces.context.FacesContext;
import java.util.Locale;
-
/**
* <p>Concrete implementation of {@link AbstractSetLocaleCommand} for
* the JavaServer Faces API.</p>
@@ -31,14 +29,11 @@ import java.util.Locale;
* @version $Id$
*
*/
-
public class FacesSetLocaleCommand
extends AbstractSetLocaleCommand<FacesWebContext> {
-
// ------------------------------------------------------- Protected Methods
-
/**
* <p>Establish the specified <code>Locale</code> for this response.</p>
*
@@ -46,10 +41,8 @@ public class FacesSetLocaleCommand
* @param locale The Locale for the request.
*/
protected void setLocale(FacesWebContext context, Locale locale) {
-
FacesContext fcontext = (FacesContext)context.get("context");
fcontext.getViewRoot().setLocale(locale);
-
}
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java?rev=1363305&r1=1363304&r2=1363305&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java Thu Jul 19 11:42:53 2012
@@ -16,7 +16,6 @@
*/
package org.apache.commons.chain2.web.faces;
-
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
@@ -25,7 +24,6 @@ import javax.servlet.http.Cookie;
import org.apache.commons.chain2.web.WebContext;
-
/**
* <p>Concrete implementation of {@link WebContext} suitable for use in
* JavaServer Faces apps. The abstract methods are mapped to the appropriate
@@ -34,26 +32,21 @@ import org.apache.commons.chain2.web.Web
*
* @version $Id$
*/
-
public class FacesWebContext extends WebContext {
-
// ------------------------------------------------------------ Constructors
-
/**
*
*/
private static final long serialVersionUID = -1429681424077509130L;
-
/**
* <p>Construct an uninitialized {@link FacesWebContext} instance.</p>
*/
public FacesWebContext() {
}
-
/**
* <p>Construct a {@link FacesWebContext} instance that is initialized
* with the specified JavaServer Faces API objects.</p>
@@ -61,25 +54,19 @@ public class FacesWebContext extends Web
* @param context The <code>FacesContext</code> for this request
*/
public FacesWebContext(FacesContext context) {
-
initialize(context);
-
}
-
// ------------------------------------------------------ Instance Variables
-
/**
* <p>The <code>FacesContext</code> instance for the request represented
* by this {@link WebContext}.</p>
*/
private FacesContext context = null;
-
// ---------------------------------------------------------- Public Methods
-
/**
* <p>Return the <code>FacesContext</code> instance for the request
* associated with this {@link FacesWebContext}.</p>
@@ -87,12 +74,9 @@ public class FacesWebContext extends Web
* @return The <code>FacesContext</code> for this request
*/
public FacesContext getContext() {
-
- return (this.context);
-
+ return (this.context);
}
-
/**
* <p>Initialize (or reinitialize) this {@link FacesWebContext} instance
* for the specified JavaServer Faces API objects.</p>
@@ -100,12 +84,9 @@ public class FacesWebContext extends Web
* @param context The <code>FacesContext</code> for this request
*/
public void initialize(FacesContext context) {
-
this.context = context;
-
}
-
/**
* <p>Release references to allocated resources acquired in
* <code>initialize()</code> of via subsequent processing. After this
@@ -113,80 +94,62 @@ public class FacesWebContext extends Web
* <code>initialize()</code> will return undefined results.</p>
*/
public void release() {
-
context = null;
-
}
-
-
// ------------------------------------------------------ WebContext Methods
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Application scope Map.
*/
public Map<String, Object> getApplicationScope() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, Object> scope = (Map<String, Object>)
context.getExternalContext().getApplicationMap();
-
return (scope);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Header values Map.
*/
public Map<String, String> getHeader() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, String> headers = (Map<String, String>)
context.getExternalContext().getRequestHeaderMap();
return (headers);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Header values Map.
*/
public Map<String, String[]> getHeaderValues() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, String[]> headerValues = (Map<String, String[]>)
context.getExternalContext().getRequestHeaderValuesMap();
return (headerValues);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Initialization parameter Map.
*/
public Map<String, String> getInitParam() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, String> initParams = (Map<String, String>)
context.getExternalContext().getInitParameterMap();
return (initParams);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
@@ -198,10 +161,8 @@ public class FacesWebContext extends Web
context.getExternalContext().getRequestParameterMap();
return (params);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
@@ -213,10 +174,8 @@ public class FacesWebContext extends Web
context.getExternalContext().getRequestParameterValuesMap();
return (paramValues);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
@@ -224,7 +183,6 @@ public class FacesWebContext extends Web
* @since Chain 1.1
*/
public Map<String, Cookie> getCookies() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, Object> facesCookieMap = (Map<String, Object>)
context.getExternalContext().getRequestCookieMap();
@@ -255,38 +213,30 @@ public class FacesWebContext extends Web
}
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Request scope Map.
*/
public Map<String, Object> getRequestScope() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, Object> scope = (Map<String, Object>)
context.getExternalContext().getRequestMap();
return (scope);
-
}
-
/**
* See the {@link WebContext}'s Javadoc.
*
* @return Session scope Map.
*/
public Map<String, Object> getSessionScope() {
-
@SuppressWarnings("unchecked") // Assume faces is following contract
Map<String, Object> scope = (Map<String, Object>)
context.getExternalContext().getSessionMap();
return (scope);
-
}
-
-
}