From 4e33c0fcd768ad7a44f690b21b61cd11bb6e7085 Mon Sep 17 00:00:00 2001 From: Erwin Vervaet Date: Fri, 13 Apr 2007 08:20:29 +0000 Subject: [PATCH] Switched version number to 1.0.3. Also added JavaDoc @since tags for 1.0.2 and 1.0.1. --- spring-webflow-sandbox/changelog.txt | 4 ++-- spring-webflow/changelog.txt | 3 ++- spring-webflow/docs/reference/src/index.xml | 2 +- spring-webflow/readme.txt | 2 +- .../webflow/config/FlowExecutorFactoryBean.java | 5 +++++ .../conversation/impl/SessionBindingConversationManager.java | 2 ++ .../webflow/definition/registry/FlowDefinitionResource.java | 1 + .../webflow/engine/builder/AbstractFlowBuilder.java | 1 + .../builder/AbstractFlowBuilderFlowRegistryFactoryBean.java | 2 ++ .../webflow/engine/builder/DefaultFlowServiceLocator.java | 1 + .../engine/builder/xml/XmlFlowRegistryFactoryBean.java | 2 ++ .../webflow/engine/support/BeanFactoryFlowVariable.java | 1 + .../support/TransitionExecutingStateExceptionHandler.java | 3 ++- .../webflow/execution/FlowExecutionListener.java | 2 +- .../support/FlowIdMappingArgumentHandlerWrapper.java | 2 ++ .../webflow/executor/support/ResponseInstructionHandler.java | 2 ++ .../execution/AbstractExternalizedFlowExecutionTests.java | 1 + .../webflow/test/execution/AbstractFlowExecutionTests.java | 3 +++ .../test/execution/AbstractXmlFlowExecutionTests.java | 1 + 19 files changed, 33 insertions(+), 7 deletions(-) diff --git a/spring-webflow-sandbox/changelog.txt b/spring-webflow-sandbox/changelog.txt index 15d56d13..32fb1535 100644 --- a/spring-webflow-sandbox/changelog.txt +++ b/spring-webflow-sandbox/changelog.txt @@ -1,6 +1,6 @@ SPRING WEB FLOW SANDBOX (SWF) CHANGELOG -=============================== +======================================= http://www.springframework.org -Changes in version 1.0.2 () +Changes in version X.Y.Z () ------------------------------------- \ No newline at end of file diff --git a/spring-webflow/changelog.txt b/spring-webflow/changelog.txt index ff48f0cd..639cace7 100644 --- a/spring-webflow/changelog.txt +++ b/spring-webflow/changelog.txt @@ -2,11 +2,12 @@ SPRING WEB FLOW (SWF) CHANGELOG =============================== http://www.springframework.org -Changes in version 1.1 () +Changes in version 1.0.3 (24.04.2007) ------------------------------------- Package org.springframework.webflow.executor * PortletFlowController now correctly handles flow redirection parameters (SWF-236). +* FlowExecution refresh no longer causes a new flow execution key to be generated (SWF-291). Changes in version 1.0.2 (10.04.2007) ------------------------------------- diff --git a/spring-webflow/docs/reference/src/index.xml b/spring-webflow/docs/reference/src/index.xml index ce3e48cc..7382638e 100644 --- a/spring-webflow/docs/reference/src/index.xml +++ b/spring-webflow/docs/reference/src/index.xml @@ -15,7 +15,7 @@ Spring Web Flow Reference Documentation - Version 1.0.2 + Version 1.0.3 April 2007 diff --git a/spring-webflow/readme.txt b/spring-webflow/readme.txt index a6799f8c..5e5c8927 100644 --- a/spring-webflow/readme.txt +++ b/spring-webflow/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB FLOW 1.0.2 (April 2007) +SPRING WEB FLOW 1.0.3 (April 2007) ---------------------------------- http://www.springframework.org/webflow http://forum.springframework.org diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java index a641d4fe..b7c34b6f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java @@ -179,6 +179,7 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * conversation when using the {@link RepositoryType#CONTINUATION continuation} * flow execution repository. * @see ContinuationFlowExecutionRepository#setMaxContinuations(int) + * @since 1.0.1 */ public void setMaxContinuations(int maxContinuations) { this.maxContinuations = new Integer(maxContinuations); @@ -190,6 +191,7 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * {@link RepositoryType#CONTINUATION continuation} flow execution repository. * @return the configured value or null if the user did not explicitly * specify a value and wants to use the default + * @since 1.0.1 */ protected Integer getMaxContinuations() { return maxContinuations; @@ -215,6 +217,7 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * property of the default {@link SessionBindingConversationManager}. Do not use * this when using {@link #setConversationManager(ConversationManager)}. * @see SessionBindingConversationManager#setMaxConversations(int) + * @since 1.0.1 */ public void setMaxConversations(int maxConversations) { this.maxConversations = new Integer(maxConversations); @@ -227,6 +230,7 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * {@link #setConversationManager(ConversationManager)}. * @return the configured value or null if the user did not explicitly * specify a value and wants to use the default + * @since 1.0.1 */ protected Integer getMaxConversations() { return maxConversations; @@ -411,6 +415,7 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { /** * Returns the flow executor constructed by the factory bean. + * @since 1.0.2 */ public FlowExecutor getFlowExecutor() { return flowExecutor; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/SessionBindingConversationManager.java b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/SessionBindingConversationManager.java index f70d7786..d8b5bc9a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/SessionBindingConversationManager.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/SessionBindingConversationManager.java @@ -65,6 +65,7 @@ public class SessionBindingConversationManager implements ConversationManager { /** * Returns the used generator for conversation ids. Defaults to * {@link RandomGuidUidGenerator}. + * @since 1.0.1 */ public UidGenerator getConversationIdGenerator() { return conversationIdGenerator; @@ -80,6 +81,7 @@ public class SessionBindingConversationManager implements ConversationManager { /** * Returns the maximum number of allowed concurrent conversations. The * default is 5. + * @since 1.0.1 */ public int getMaxConversations() { return maxConversations; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java index e0cca98a..9047a721 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java @@ -145,6 +145,7 @@ public class FlowDefinitionResource implements Serializable { * By convention this will be the filename of the resource, excluding extension. * @see FlowDefinitionResource#FlowDefinitionResource(Resource) * @see FlowDefinitionResource#FlowDefinitionResource(Resource, AttributeMap) + * @since 1.0.1 */ public static String conventionalFlowId(Resource location) { String fileName = location.getFilename(); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java index 0789438a..971dbea5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java @@ -573,6 +573,7 @@ public abstract class AbstractFlowBuilder extends BaseFlowBuilder { * Parses the expression string into a settable {@link Expression} object. * @param expressionString the expression string, e.g. flowScope.order.number * @return the evaluatable expression + * @since 1.0.2 */ protected SettableExpression settableExpression(String expressionString) { return getFlowServiceLocator().getExpressionParser().parseSettableExpression(expressionString); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderFlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderFlowRegistryFactoryBean.java index a89ee600..3a8e1edc 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderFlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderFlowRegistryFactoryBean.java @@ -44,6 +44,8 @@ import org.springframework.webflow.engine.builder.FlowAssembler; * * @see AbstractFlowBuilder * + * @since 1.0.2 + * * @author Erwin Vervaet */ public abstract class AbstractFlowBuilderFlowRegistryFactoryBean extends diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java index bdd4699c..09338a0b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java @@ -64,6 +64,7 @@ public class DefaultFlowServiceLocator extends BaseFlowServiceLocator { * bean factory. * @param subflowRegistryBeanId the bean id of the subflow FlowDefinitionRegistry * @param beanFactory the Spring bean factory + * @since 1.0.2 */ public DefaultFlowServiceLocator(String subflowRegistryBeanId, BeanFactory beanFactory) { Assert.notNull(subflowRegistryBeanId, "The subflow registry bean id is required"); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistryFactoryBean.java index 6769367f..2ab1ce2f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistryFactoryBean.java @@ -92,6 +92,7 @@ public class XmlFlowRegistryFactoryBean extends AbstractFlowBuildingFlowRegistry /** * Set the configured externalized XML flow registrar. + * @since 1.0.1 */ public void setXmlFlowRegistrar(XmlFlowRegistrar flowRegistrar) { Assert.notNull(flowRegistrar, "The flowRegistrar is required"); @@ -172,6 +173,7 @@ public class XmlFlowRegistryFactoryBean extends AbstractFlowBuildingFlowRegistry * Can be used in conjunction with both {@link #setFlowLocations(Resource[])} * and {@link #setFlowDefinitions(Properties)}. * @param flowAttributes the flow attributes, keyed by flow id + * @since 1.0.1 */ public void setFlowAttributes(Map flowAttributes) { this.flowAttributes = flowAttributes; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BeanFactoryFlowVariable.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BeanFactoryFlowVariable.java index c57e3146..e5233a78 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BeanFactoryFlowVariable.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BeanFactoryFlowVariable.java @@ -49,6 +49,7 @@ public class BeanFactoryFlowVariable extends FlowVariable { * @param beanFactory the bean factory where initial variable values will be * obtained * @param scope the variable scope + * @since 1.0.2 */ public BeanFactoryFlowVariable(String name, BeanFactory beanFactory, ScopeType scope) { this(name, name, beanFactory, scope); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingStateExceptionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingStateExceptionHandler.java index 27733e10..79f576b9 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingStateExceptionHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingStateExceptionHandler.java @@ -129,7 +129,8 @@ public class TransitionExecutingStateExceptionHandler implements FlowExecutionEx * processing before the exceptions are exposed. * @param context the request control context * @param exception the exception being handled - * @param rootCause root cause of the exception being handled (could be null) + * @param rootCause root cause of the exception being handled (could be null) + * @since 1.0.2 */ protected void exposeException(RequestContext context, FlowExecutionException exception, Throwable rootCause) { // note that all Throwables are Serializable so putting them in flash diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java index 8951ad3f..8da4969e 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java @@ -84,9 +84,9 @@ public interface FlowExecutionListener { * Called after a new flow session has been created but before it starts. * Useful for setting arbitrary attributes in the session before the flow * starts. - * @since 1.0.2 * @param context the source of the event * @param session the session that was created + * @since 1.0.2 */ public void sessionCreated(RequestContext context, FlowSession session); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java index 5b4f2f3c..21eb9ea2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java @@ -37,6 +37,8 @@ import org.springframework.webflow.execution.support.FlowDefinitionRedirect; * @see RequestParameterFlowExecutorArgumentHandler * @see RequestPathFlowExecutorArgumentHandler * + * @since 1.0.2 + * * @author Andrej Zachar * @author Erwin Vervaet */ diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java index c24346ee..48d6ee9b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java @@ -31,6 +31,8 @@ import org.springframework.webflow.executor.ResponseInstruction; * * @see ViewSelection * + * @since 1.0.2 + * * @author Erwin Vervaet */ public abstract class ResponseInstructionHandler { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java index f3258a3b..7824135d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java @@ -62,6 +62,7 @@ public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlo /** * Constructs an externalized flow execution test with given name. * @param name the name of the test + * @since 1.0.2 */ public AbstractExternalizedFlowExecutionTests(String name) { super(name); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java index 07ddf8a2..3c20a57f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java @@ -105,6 +105,7 @@ public abstract class AbstractFlowExecutionTests extends TestCase { /** * Constructs a flow execution test with given name. * @param name the name of the test + * @since 1.0.2 */ public AbstractFlowExecutionTests(String name) { super(name); @@ -401,6 +402,7 @@ public abstract class AbstractFlowExecutionTests extends TestCase { * the active flow session and cleared on the next user event. * @param attributeName the name of the attribute * @return the attribute value + * @since 1.0.2 */ protected Object getFlashAttribute(String attributeName) { return getFlowExecution().getActiveSession().getFlashMap().get(attributeName); @@ -413,6 +415,7 @@ public abstract class AbstractFlowExecutionTests extends TestCase { * @param attributeName the name of the attribute * @return the attribute value * @throws IllegalStateException if the attribute was not present + * @since 1.0.2 */ protected Object getRequiredFlashAttribute(String attributeName) throws IllegalStateException { return getFlowExecution().getActiveSession().getFlashMap().getRequired(attributeName); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java index 8ea2e79c..5654ec50 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java @@ -65,6 +65,7 @@ public abstract class AbstractXmlFlowExecutionTests extends AbstractExternalized /** * Constructs an XML flow execution test with given name. * @param name the name of the test + * @since 1.0.2 */ public AbstractXmlFlowExecutionTests(String name) { super(name);