From f6f3c2b90f6bb342358973010a409cef22ee5e86 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Mon, 16 Apr 2007 14:58:49 +0000
Subject: [PATCH] Created the spring-webflow-1.0-maintenance branch and updated
 trunk to 1.1 development

---
 build-spring-webflow/project.properties |   2 +-
 spring-binding/pom.xml                  | 153 ++++++------
 spring-binding/project.properties       |   2 +-
 spring-webflow/pom.xml                  | 304 ++++++++++++------------
 spring-webflow/project.properties       |   2 +-
 5 files changed, 232 insertions(+), 231 deletions(-)

diff --git a/build-spring-webflow/project.properties b/build-spring-webflow/project.properties
index 28d9c1e6..9d6aad03 100644
--- a/build-spring-webflow/project.properties
+++ b/build-spring-webflow/project.properties
@@ -1,7 +1,7 @@
 # Configurable property values that may be locally overriden by a build.properties file
 
 # The version number of the release that will be built
-release.version=1.0.3-SNAPSHOT
+release.version=1.1-SNAPSHOT
 
 # The location of the common build system
 common.build.dir=${basedir}/../common-build
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index f5d7e6a9..54c4cec6 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -1,77 +1,78 @@
 <?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework</groupId>
-  <artifactId>spring-binding</artifactId>
-  <name>Spring Binding</name>
-  <version>1.0.3-SNAPSHOT</version>
-  <description>Spring Data Binding Framework</description>
-  <url>http://www.springframework.org</url>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</connection>
-    <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</developerConnection>
-    <tag>1.0.3</tag>
-    <url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-projects</url>
-  </scm>
-  <organization>
-    <name>Spring Framework</name>
-    <url>http://www.springframework.org/</url>
-  </organization>
-  <dependencies>
-    <!-- External Dependencies -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>ognl</groupId>
-      <artifactId>ognl</artifactId>
-      <version>2.6.9</version>
-    </dependency>
-    <!-- Spring Dependencies -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <!-- Runtime Dependencies -->    
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>        
-   <!-- Test Dependencies -->
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>        
-  </dependencies>
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-binding</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Binding</name>
+	<version>1.1-SNAPSHOT</version>
+	<description>Spring Data Binding Framework</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
+		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
+		<tag>spring-webflow-1.1</tag>
+		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>ognl</groupId>
+			<artifactId>ognl</artifactId>
+			<version>2.6.9</version>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+<!-- Runtime Dependencies -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+<!-- Test Dependencies -->
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>2.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-binding/project.properties b/spring-binding/project.properties
index 0d4a2d93..60d3db3a 100644
--- a/spring-binding/project.properties
+++ b/spring-binding/project.properties
@@ -3,7 +3,7 @@
 # The location of the common build system
 common.build.dir=${basedir}/../common-build
 
-project.base.version=1.0.3-SNAPSHOT
+project.base.version=1.1-SNAPSHOT
 #project.version=${project.base.version}
 #ivy.status=release
 
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 50f4edae..ab5d110f 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -1,154 +1,154 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework</groupId>
-  <artifactId>spring-webflow</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Web Flow</name>
-  <version>1.0.3-SNAPSHOT</version>
-  <description>Spring Web Flow</description>
-  <url>http://www.springframework.org</url>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</connection>
-    <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</developerConnection>
-    <tag>1.0.3</tag>
-    <url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-projects</url>
-  </scm>
-  <organization>
-    <name>Spring Framework</name>
-    <url>http://www.springframework.org/</url>
-  </organization>
-  <dependencies>
-    <!-- External Dependencies -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <optional>true</optional>      
-    </dependency>
-    <dependency>
-    	<groupId>ognl</groupId>
-    	<artifactId>ognl</artifactId>
-    	<version>2.6.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>1.1.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-impl</artifactId>
-      <version>1.1.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>struts</groupId>
-      <artifactId>struts</artifactId>
-      <version>1.2.9</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- Spring Dependencies -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-binding</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-portlet</artifactId>
-      <version>2.0.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-struts</artifactId>
-      <version>2.0.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>2.0.4</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- Runtime Dependencies -->    
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>    
-    <!-- Test Dependencies -->    
-    <dependency>
-      <groupId>com.cenqua.clover</groupId>
-      <artifactId>clover</artifactId>
-      <version>1.3.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>2.0.4</version>
-      <scope>test</scope>
-    </dependency>    
-  </dependencies>
-</project>
\ No newline at end of file
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-webflow</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Web Flow</name>
+	<version>1.1-SNAPSHOT</version>
+	<description>Spring Web Flow</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
+		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
+		<tag>spring-webflow-1.1</tag>
+		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>concurrent</groupId>
+			<artifactId>concurrent</artifactId>
+			<version>1.3.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>ognl</groupId>
+			<artifactId>ognl</artifactId>
+			<version>2.6.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<version>1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-impl</artifactId>
+			<version>1.1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>struts</groupId>
+			<artifactId>struts</artifactId>
+			<version>1.2.9</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-binding</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-portlet</artifactId>
+			<version>2.0.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-struts</artifactId>
+			<version>2.0.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>2.0.4</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Runtime Dependencies -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+<!-- Test Dependencies -->
+		<dependency>
+			<groupId>com.cenqua.clover</groupId>
+			<artifactId>clover</artifactId>
+			<version>1.3.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>2.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-mock</artifactId>
+			<version>2.0.4</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-webflow/project.properties b/spring-webflow/project.properties
index 691309ca..5b67bde1 100644
--- a/spring-webflow/project.properties
+++ b/spring-webflow/project.properties
@@ -3,7 +3,7 @@
 # The location of the common build system
 common.build.dir=${basedir}/../common-build
 
-project.base.version=1.0.3-SNAPSHOT
+project.base.version=1.1-SNAPSHOT
 #project.version=${project.base.version}
 #ivy.status=release