2012/7/26 sebb <[email protected]>: > On 24 July 2012 20:56, <[email protected]> wrote: >> Author: elijah >> Date: Tue Jul 24 19:56:21 2012 >> New Revision: 1365262 >> >> URL: http://svn.apache.org/viewvc?rev=1365262&view=rev >> Log: >> CHAIN-75 Updated serialVersionUID field in chain classes to a format based >> on the current date > > As far as I call tell, this breaks serialisation across versions. >
package names have changed, so it is broken anyway. >> >> Modified: >> >> commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/ExampleServlet.java >> >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java >> >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java >> >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextBase.java >> >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextMap.java >> >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java >> >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContext.java >> commons/proper/chain/trunk/src/changes/changes.xml >> >> 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/WebContext.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/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/ServletWebContext.java >> >> 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=1365262&r1=1365261&r2=1365262&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 >> Tue Jul 24 19:56:21 2012 >> @@ -39,7 +39,7 @@ public class ExampleServlet extends Http >> /** >> * >> */ >> - private static final long serialVersionUID = 1L; >> + private static final long serialVersionUID = 20120724L; >> >> private String servletName; >> >> >> Modified: >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainException.java >> Tue Jul 24 19:56:21 2012 >> @@ -30,7 +30,7 @@ public class ChainException extends Runt >> /** >> * >> */ >> - private static final long serialVersionUID = 1L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * Context used when exception occurred. >> >> Modified: >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java >> Tue Jul 24 19:56:21 2012 >> @@ -16,11 +16,11 @@ >> */ >> package org.apache.commons.chain2.generic; >> >> -import java.util.Map; >> - >> import org.apache.commons.chain2.ChainException; >> import org.apache.commons.chain2.Command; >> >> +import java.util.Map; >> + >> /** >> * Runtime Exception that wraps an underlying exception thrown during the >> * execution of a {@link org.apache.commons.chain2.Command} or {@link >> org.apache.commons.chain2.Chain}. >> @@ -32,7 +32,7 @@ public class DispatchException extends C >> /** >> * >> */ >> - private static final long serialVersionUID = 1L; >> + private static final long serialVersionUID = 20120724L; >> >> public DispatchException(String message) { >> super(message); >> >> Modified: >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextBase.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextBase.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextBase.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextBase.java >> Tue Jul 24 19:56:21 2012 >> @@ -54,7 +54,7 @@ public class ContextBase extends Context >> /** >> * >> */ >> - private static final long serialVersionUID = -3137668177106072122L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * Default, no argument constructor. >> @@ -113,7 +113,7 @@ public class ContextBase extends Context >> >> static { >> singleton = new Serializable() { >> - private static final long serialVersionUID = >> -6023767081282668587L; >> + private static final long serialVersionUID = 20120724L; >> >> public boolean equals(Object object) { >> return (false); >> >> Modified: >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextMap.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextMap.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextMap.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ContextMap.java >> Tue Jul 24 19:56:21 2012 >> @@ -16,11 +16,11 @@ >> */ >> package org.apache.commons.chain2.impl; >> >> +import org.apache.commons.chain2.Context; >> + >> import java.util.Map; >> import java.util.concurrent.ConcurrentHashMap; >> >> -import org.apache.commons.chain2.Context; >> - >> /** >> * Convenience base class for {@link Context} implementations. >> * >> @@ -35,7 +35,7 @@ public class ContextMap<K, V> extends Co >> /** >> * >> */ >> - private static final long serialVersionUID = 6980950395387220980L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * Creates a new, empty Context with a default initial capacity, load >> factor, and concurrencyLevel. >> >> Modified: >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java >> Tue Jul 24 19:56:21 2012 >> @@ -16,16 +16,12 @@ >> */ >> package org.apache.commons.chain2.generic; >> >> -import static org.junit.Assert.assertEquals; >> -import static org.junit.Assert.assertFalse; >> -import static org.junit.Assert.assertNotNull; >> -import static org.junit.Assert.assertNull; >> -import static org.junit.Assert.assertTrue; >> - >> import org.apache.commons.chain2.Context; >> import org.apache.commons.chain2.impl.ContextBase; >> import org.junit.Test; >> >> +import static org.junit.Assert.*; >> + >> /* JUnitTest case for class: >> org.apache.commons.chain2.generic.DispatchCommand */ >> public class DispatchCommandTestCase { >> >> @@ -119,7 +115,7 @@ public class DispatchCommandTestCase { >> class TestAlternateContext extends java.util.HashMap<String, Object> >> implements Context<String, Object> { >> >> - private static final long serialVersionUID = -8169700369254126548L; >> + private static final long serialVersionUID = 20120724L; >> >> Context<String, Object> wrappedContext = null; >> TestAlternateContext(Context<String, Object> context) { >> >> Modified: >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContext.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContext.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContext.java >> (original) >> +++ >> commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContext.java >> Tue Jul 24 19:56:21 2012 >> @@ -16,9 +16,6 @@ >> */ >> package org.apache.commons.chain2.impl; >> >> -import org.apache.commons.chain2.impl.ContextBase; >> - >> - >> /** >> * Subclass of <code>ContextBase</code> to exercize the automatic >> * delegation to properties of the <code>Context</code> class. >> @@ -30,7 +27,7 @@ public class TestContext extends Context >> /** >> * >> */ >> - private static final long serialVersionUID = -582126541014253603L; >> + private static final long serialVersionUID = 20120724L; >> >> // Read-only property >> private String readOnly = "readOnly"; >> >> Modified: commons/proper/chain/trunk/src/changes/changes.xml >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/changes/changes.xml?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- commons/proper/chain/trunk/src/changes/changes.xml (original) >> +++ commons/proper/chain/trunk/src/changes/changes.xml Tue Jul 24 19:56:21 >> 2012 >> @@ -41,6 +41,9 @@ The <action> type attribute can be add,u >> >> <body> >> <release version="2.0" description="Major release"> >> + <action dev="elijah" type="update" issue="CHAIN-75"> >> + Update serialVersionUID in all classes to a date based format. >> + </action> >> <action dev="simonetripodi" type="update" issue="CHAIN-74"> >> Improve Chain/Catalog use of Generics. >> </action> >> >> 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=1365262&r1=1365261&r2=1365262&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 >> Tue Jul 24 19:56:21 2012 >> @@ -16,15 +16,6 @@ >> */ >> package org.apache.commons.chain2.web; >> >> -import java.io.IOException; >> - >> -import javax.servlet.ServletConfig; >> -import javax.servlet.ServletContext; >> -import javax.servlet.ServletException; >> -import javax.servlet.http.HttpServlet; >> -import javax.servlet.http.HttpServletRequest; >> -import javax.servlet.http.HttpServletResponse; >> - >> import org.apache.commons.chain2.Catalog; >> import org.apache.commons.chain2.CatalogFactory; >> import org.apache.commons.chain2.config.ConfigParser; >> @@ -34,6 +25,14 @@ import org.apache.commons.digester3.Rule >> import org.apache.commons.logging.Log; >> import org.apache.commons.logging.LogFactory; >> >> +import javax.servlet.ServletConfig; >> +import javax.servlet.ServletContext; >> +import javax.servlet.ServletException; >> +import javax.servlet.http.HttpServlet; >> +import javax.servlet.http.HttpServletRequest; >> +import javax.servlet.http.HttpServletResponse; >> +import java.io.IOException; >> + >> /** >> * <p><code>Servlet</code> that automatically scans chain configuration >> files >> * in the current web application at startup time, and exposes the result >> in a >> @@ -98,7 +97,7 @@ public class ChainServlet extends HttpSe >> /** >> * >> */ >> - private static final long serialVersionUID = -6545081938506661333L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * <p>The name of the context init parameter containing the name of the >> >> 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=1365262&r1=1365261&r2=1365262&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 >> Tue Jul 24 19:56:21 2012 >> @@ -16,11 +16,11 @@ >> */ >> package org.apache.commons.chain2.web; >> >> -import java.util.Map; >> -import javax.servlet.http.Cookie; >> - >> import org.apache.commons.chain2.impl.ContextBase; >> >> +import javax.servlet.http.Cookie; >> +import java.util.Map; >> + >> /** >> * <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 >> @@ -42,7 +42,7 @@ public abstract class WebContext extends >> /** >> * >> */ >> - private static final long serialVersionUID = 6804961872140299027L; >> + private static final long serialVersionUID = 20120724L; >> >> // ---------------------------------------------------------- Public >> Methods >> >> >> 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=1365262&r1=1365261&r2=1365262&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 >> Tue Jul 24 19:56:21 2012 >> @@ -16,13 +16,13 @@ >> */ >> package org.apache.commons.chain2.web.faces; >> >> +import org.apache.commons.chain2.web.WebContext; >> + >> +import javax.faces.context.FacesContext; >> +import javax.servlet.http.Cookie; >> import java.util.Collections; >> import java.util.Iterator; >> import java.util.Map; >> -import javax.faces.context.FacesContext; >> -import javax.servlet.http.Cookie; >> - >> -import org.apache.commons.chain2.web.WebContext; >> >> /** >> * <p>Concrete implementation of {@link WebContext} suitable for use in >> @@ -39,7 +39,7 @@ public class FacesWebContext extends Web >> /** >> * >> */ >> - private static final long serialVersionUID = -1429681424077509130L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * <p>Construct an uninitialized {@link FacesWebContext} instance.</p> >> >> Modified: >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java >> (original) >> +++ >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java >> Tue Jul 24 19:56:21 2012 >> @@ -38,7 +38,7 @@ public class PortletWebContext extends W >> /** >> * >> */ >> - private static final long serialVersionUID = -6928446126906631819L; >> + private static final long serialVersionUID = 20120724L; >> >> // ------------------------------------------------------------ >> Constructors >> >> >> Modified: >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java >> (original) >> +++ >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java >> Tue Jul 24 19:56:21 2012 >> @@ -62,7 +62,7 @@ public class ChainProcessor extends Chai >> /** >> * >> */ >> - private static final long serialVersionUID = -6817532768031279260L; >> + private static final long serialVersionUID = 20120724L; >> >> /** >> * <p>The name of the servlet init parameter containing the name of the >> >> Modified: >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java >> URL: >> http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java?rev=1365262&r1=1365261&r2=1365262&view=diff >> ============================================================================== >> --- >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java >> (original) >> +++ >> commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java >> Tue Jul 24 19:56:21 2012 >> @@ -34,7 +34,7 @@ import java.util.Map; >> */ >> public class ServletWebContext extends WebContext { >> >> - private static final long serialVersionUID = 5852676730841544890L; >> + private static final long serialVersionUID = 20120724L; >> >> // ------------------------------------------------------------ >> Constructors >> >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
