[
https://issues.apache.org/jira/browse/CHAIN-53?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13089427#comment-13089427
]
Simone Tripodi commented on CHAIN-53:
-------------------------------------
Elijah,
as discussed in the [ML|http://markmail.org/message/lnusnwl6gd6eb3p2], I
created a
[branch|https://svn.apache.org/repos/asf/commons/proper/chain/branches/version-2.0-work]
where I'm trying to apply the patch, unfortunately I didn't have success; what
I executed is
{code}
patch -p0 < v2_patch_2011-08-18.diff
{code}
and got the following error list
{code}
patching file
src/test/java/org/apache/commons/chain/impl/NonDelegatingCommand.java
Hunk #1 succeeded at 29 with fuzz 1.
patching file
src/test/java/org/apache/commons/chain/generic/DispatchLookupCommandTestCase.java
patching file
src/test/java/org/apache/commons/chain/generic/LookupCommandTestCase.java
patching file
src/test/java/org/apache/commons/chain/generic/DispatchCommandTestCase.java
patching file
src/test/java/org/apache/commons/chain/web/servlet/MockServletContext.java
patching file
src/test/java/org/apache/commons/chain/web/servlet/ServletWebContextTestCase.java
patching file
src/test/java/org/apache/commons/chain/web/portlet/MockPortletSession.java
patching file
src/test/java/org/apache/commons/chain/web/portlet/MockPortletContext.java
patching file
src/test/java/org/apache/commons/chain/web/portlet/MockPortletRequest.java
patching file src/main/java/org/apache/commons/chain/impl/ContextBase.java
Hunk #2 succeeded at 52 with fuzz 1.
patching file src/main/java/org/apache/commons/chain/impl/CatalogBase.java
patching file
src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java
patching file src/main/java/org/apache/commons/chain/impl/ChainBase.java
Hunk #1 FAILED at 28.
1 out of 8 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/impl/ChainBase.java.rej
patching file src/main/java/org/apache/commons/chain/CatalogFactory.java
patching file src/main/java/org/apache/commons/chain/Chain.java
Hunk #1 FAILED at 47.
1 out of 3 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/Chain.java.rej
patching file src/main/java/org/apache/commons/chain/Context.java
Hunk #1 succeeded at 60 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java
patching file
src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java
patching file
src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java
patching file src/main/java/org/apache/commons/chain/Filter.java
Hunk #1 FAILED at 37.
1 out of 2 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/Filter.java.rej
patching file src/main/java/org/apache/commons/chain/Catalog.java
patching file
src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java
Hunk #1 FAILED at 47.
1 out of 7 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java.rej
patching file src/main/java/org/apache/commons/chain/generic/LookupCommand.java
Hunk #1 FAILED at 40.
1 out of 6 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/generic/LookupCommand.java.rej
patching file src/main/java/org/apache/commons/chain/generic/CopyCommand.java
Hunk #1 FAILED at 25.
1 out of 2 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/generic/CopyCommand.java.rej
patching file src/main/java/org/apache/commons/chain/generic/RemoveCommand.java
Hunk #1 FAILED at 24.
1 out of 2 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/generic/RemoveCommand.java.rej
patching file
src/main/java/org/apache/commons/chain/generic/DispatchCommand.java
patching file src/main/java/org/apache/commons/chain/web/MapEntry.java
Hunk #1 FAILED at 24.
1 out of 7 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/web/MapEntry.java.rej
patching file
src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java
patching file
src/main/java/org/apache/commons/chain/web/faces/FacesSetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java
Hunk #1 FAILED at 27.
1 out of 3 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java.rej
patching file src/main/java/org/apache/commons/chain/web/WebContext.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletSetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java
Hunk #2 succeeded at 37 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java
patching file
src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java
patching file src/main/java/org/apache/commons/chain/web/ChainServlet.java
patching file src/main/java/org/apache/commons/chain/web/ChainListener.java
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletSetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java
Hunk #2 succeeded at 37 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommand.java
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java
Hunk #2 succeeded at 36 with fuzz 1.
patching file
src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java
patching file src/main/java/org/apache/commons/chain/web/ChainResources.java
patching file
src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java
Hunk #1 FAILED at 28.
1 out of 3 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java.rej
patching file src/main/java/org/apache/commons/chain/Command.java
Hunk #1 FAILED at 73.
1 out of 2 hunks FAILED -- saving rejects to file
src/main/java/org/apache/commons/chain/Command.java.rej
patching file pom.xml
patching file checkstyle.xml
{code}
Did I make something wrong or missed something?
Many thanks in advance!!!
> Global Update of Chain - Generics, JDK 1.5, Update Dependency Versions
> ----------------------------------------------------------------------
>
> Key: CHAIN-53
> URL: https://issues.apache.org/jira/browse/CHAIN-53
> Project: Commons Chain
> Issue Type: Improvement
> Reporter: Elijah Zupancic
> Labels: newbie, patch
> Attachments: v2_patch_2011-08-18.diff
>
>
> As posted in the mailing list, I've done this work outside of an offical
> branch.
> In this patch:
> * Global upgrade to the JDK 1.5
> * Added @Override annotations
> * Upgraded to the Servlet 2.5 API
> * Upgraded to the Faces 2.1 API
> * Upgraded to the Portlet 2.0 API
> * Upgraded the Maven Parent POM version
> * Added generics support to Command so that Command's API looks like:
> public interface Command<T extends Context> {
> ...
> boolean execute(T context) throws Exception;
> }
> The only incompatibility with the existing API is in:
> org.apache.commons.chain.web.servlet.ServletHeaderValuesMap on line 97.
> Previously the API was returning Set<Entry<String, Enumeration<String>> when
> by all indications it actually should have been returning Set<Entry<String,
> String[]>>. I believe that I fixed a previously undiscovered bug here.
--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira
