You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2009/01/05 20:15:53 UTC
svn commit: r731647 - in /tapestry/tapestry5/trunk: ./ src/site/
tapestry-webflow/ tapestry-webflow/src/ tapestry-webflow/src/main/
tapestry-webflow/src/main/java/ tapestry-webflow/src/site/
tapestry-webflow/src/site/apt/ tapestry-webflow/src/test/ tap...
Author: hlship
Date: Mon Jan 5 11:15:52 2009
New Revision: 731647
URL: http://svn.apache.org/viewvc?rev=731647&view=rev
Log:
TAP5-59: Tracking issue for Tapestry/Spring Web Flow integration
Added:
tapestry/tapestry5/trunk/tapestry-webflow/
tapestry/tapestry5/trunk/tapestry-webflow/pom.xml
tapestry/tapestry5/trunk/tapestry-webflow/src/
tapestry/tapestry5/trunk/tapestry-webflow/src/main/
tapestry/tapestry5/trunk/tapestry-webflow/src/main/java/
tapestry/tapestry5/trunk/tapestry-webflow/src/site/
tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/
tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-webflow/src/site/site.xml
tapestry/tapestry5/trunk/tapestry-webflow/src/test/
tapestry/tapestry5/trunk/tapestry-webflow/src/test/java/
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/src/site/site.xml
tapestry/tapestry5/trunk/tapestry-project.ipr
Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=731647&r1=731646&r2=731647&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Mon Jan 5 11:15:52 2009
@@ -140,6 +140,7 @@
<!-- Tutorials -->
<module>tapestry-tutorial1</module>
+ <module>tapestry-webflow</module>
</modules>
Modified: tapestry/tapestry5/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/site.xml?rev=731647&r1=731646&r2=731647&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/src/site/site.xml Mon Jan 5 11:15:52 2009
@@ -65,6 +65,7 @@
<item name="tapestry-spring" href="tapestry-spring/"/>
<item name="tapestry-test" href="tapestry-test/"/>
<item name="tapestry-upload" href="tapestry-upload/"/>
+ <item name="tapestry-webflow" href="tapestry-webflow/"/>
</menu>
<menu name="Tapestry Tutorials">
Modified: tapestry/tapestry5/trunk/tapestry-project.ipr
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project.ipr?rev=731647&r1=731646&r2=731647&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project.ipr (original)
+++ tapestry/tapestry5/trunk/tapestry-project.ipr Mon Jan 5 11:15:52 2009
@@ -240,6 +240,7 @@
<option value="$PROJECT_DIR$/tapestry-test/pom.xml" />
<option value="$PROJECT_DIR$/tapestry-upload/pom.xml" />
<option value="$PROJECT_DIR$/tapestry-tutorial1/pom.xml" />
+ <option value="$PROJECT_DIR$/tapestry-webflow/pom.xml" />
</list>
</option>
</component>
@@ -412,6 +413,7 @@
<module fileurl="file://$PROJECT_DIR$/tapestry-spring/tapestry-spring.iml" filepath="$PROJECT_DIR$/tapestry-spring/tapestry-spring.iml" />
<module fileurl="file://$PROJECT_DIR$/tapestry-test/tapestry-test.iml" filepath="$PROJECT_DIR$/tapestry-test/tapestry-test.iml" />
<module fileurl="file://$PROJECT_DIR$/tapestry-upload/tapestry-upload.iml" filepath="$PROJECT_DIR$/tapestry-upload/tapestry-upload.iml" />
+ <module fileurl="file://$PROJECT_DIR$/tapestry-webflow/tapestry-webflow.iml" filepath="$PROJECT_DIR$/tapestry-webflow/tapestry-webflow.iml" />
<module fileurl="file://$PROJECT_DIR$/tapestry-tutorial1/tutorial1.iml" filepath="$PROJECT_DIR$/tapestry-tutorial1/tutorial1.iml" />
</modules>
</component>
@@ -1956,6 +1958,61 @@
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/2.5.6/spring-context-2.5.6-sources.jar!/" />
</SOURCES>
</library>
+ <library name="Maven: org.springframework.webflow:org.springframework.binding:2.0.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.binding/2.0.5.RELEASE/org.springframework.binding-2.0.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.binding/2.0.5.RELEASE/org.springframework.binding-2.0.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.binding/2.0.5.RELEASE/org.springframework.binding-2.0.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+ <library name="Maven: org.springframework.webflow:org.springframework.js:2.0.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.js/2.0.5.RELEASE/org.springframework.js-2.0.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.js/2.0.5.RELEASE/org.springframework.js-2.0.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.js/2.0.5.RELEASE/org.springframework.js-2.0.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+ <library name="Maven: org.springframework.webflow:org.springframework.webflow:2.0.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.webflow/2.0.5.RELEASE/org.springframework.webflow-2.0.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.webflow/2.0.5.RELEASE/org.springframework.webflow-2.0.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/webflow/org.springframework.webflow/2.0.5.RELEASE/org.springframework.webflow-2.0.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+ <library name="Maven: org.springframework:spring-webmvc:2.5.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+ <library name="Maven: org.springframework:spring-context-support:2.5.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6/spring-context-support-2.5.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6/spring-context-support-2.5.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6/spring-context-support-2.5.6-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
<UsedPathMacros>
<macro name="MAVEN_REPOSITORY" />
Added: tapestry/tapestry5/trunk/tapestry-webflow/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-webflow/pom.xml?rev=731647&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-webflow/pom.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-webflow/pom.xml Mon Jan 5 11:15:52 2009
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-webflow</artifactId>
+ <name>Tapestry/Spring Web Flow Integration Library</name>
+ <packaging>jar</packaging>
+ <description>
+ Provides integration of Tapestry with the Spring IoC container.
+ </description>
+ <parent>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <version>5.1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.webflow</groupId>
+ <artifactId>org.springframework.binding</artifactId>
+ <version>${web-flow-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.webflow</groupId>
+ <artifactId>org.springframework.js</artifactId>
+ <version>${web-flow-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.webflow</groupId>
+ <artifactId>org.springframework.webflow</artifactId>
+ <version>${web-flow-version}</version>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <!-- This gets the plugin to clean up the cobertura.ser file left
+ in the root directory. -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Tapestry-Module-Classes>
+ org.apache.tapestry5.internal.webflow.WebFlowModule
+ </Tapestry-Module-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <web-flow-version>2.0.5.RELEASE</web-flow-version>
+ </properties>
+</project>
Added: tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/index.apt?rev=731647&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/index.apt (added)
+++ tapestry/tapestry5/trunk/tapestry-webflow/src/site/apt/index.apt Mon Jan 5 11:15:52 2009
@@ -0,0 +1,10 @@
+ ----
+ Web Flow
+ ----
+
+Tapestry/Spring Web Flow Integration Library
+
+ This module is the integration library for
+ {{{http://www.springsource.org/webflow}Spring Web Flow}}. Spring Web Flow is a controller and state management layer
+ that allows easy navigation through complex user interactions. Spring Web Flow adds <conversational state> to
+ Tapestry applications.
\ No newline at end of file
Added: tapestry/tapestry5/trunk/tapestry-webflow/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-webflow/src/site/site.xml?rev=731647&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-webflow/src/site/site.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-webflow/src/site/site.xml Mon Jan 5 11:15:52 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2009 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="Tapestry Spring Integration">
+ <bannerLeft>
+ <name>Tapestry 5</name>
+ <href>http://tapestry.apache.org/tapestry5/</href>
+ <src>images/tapestry_banner.gif</src>
+ </bannerLeft>
+ <bannerRight>
+ <name>Apache</name>
+ <href>http://www.apache.org</href>
+ <src>images/asf_logo_wide.gif</src>
+ </bannerRight>
+ <skin>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
+ </skin>
+
+ <publishDate format="dd MMM yyyy"/>
+ <version/>
+
+ <body>
+
+ <menu ref="parent"/>
+
+ <menu name="Quick Links">
+ <item name="Download" href="http://tapestry.apache.org/download.html"/>
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
+</project>