From 32efc198a940ce43d53a6f8db24440f5d1032738 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Mon, 30 Jun 2008 13:47:02 +0000 Subject: [PATCH] moved flow engine into webapp bundle --- .../.classpath | 10 +++ .../.project | 30 +++++++++ .../.springBeans | 15 +++++ .../build.xml | 10 +++ .../ivy.xml | 40 ++++++++++++ .../hotel/HotelFlowHandlerAdapter.java | 24 -------- .../.classpath | 10 +++ .../.project | 30 +++++++++ .../.springBeans | 13 ++++ .../build.xml | 10 +++ .../ivy.xml | 24 ++++++++ .../.classpath | 11 ++++ .../.project | 30 +++++++++ .../.springBeans | 13 ++++ .../build.xml | 8 +++ .../ivy.xml | 25 ++++++++ .../webapp/META-INF/spring/hotel-context.xml | 61 +++++++++++++++++++ .../.project | 23 +++++++ .../.springBeans | 13 ++++ .../build.xml | 14 +++++ .../par.xml | 7 +++ .../spring-travel-platform/readme.txt | 3 + 22 files changed, 400 insertions(+), 24 deletions(-) create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml delete mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml create mode 100644 spring-webflow-samples/spring-travel-platform/readme.txt diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath new file mode 100644 index 00000000..c32daf65 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project new file mode 100644 index 00000000..3081d219 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project @@ -0,0 +1,30 @@ + + + org.springframework.samples.springtravel.hotel + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + com.springsource.platform.ide.facet.core.bundlenature + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans new file mode 100644 index 00000000..f54b2155 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans @@ -0,0 +1,15 @@ + + + 1 + + + + + + + src/main/resources/META-INF/spring/module-context.xml + src/main/resources/META-INF/spring/osgi-context.xml + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml new file mode 100644 index 00000000..1fdc0b8f --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml new file mode 100644 index 00000000..cf5f877b --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java deleted file mode 100644 index fb03f1e8..00000000 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.springframework.samples.springtravel.hotel; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.webflow.context.servlet.ServletExternalContext; -import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter; -import org.springframework.webflow.mvc.servlet.MvcExternalContext; - -public class HotelFlowHandlerAdapter extends FlowHandlerAdapter { - - @Override - protected boolean isContextRequired() { - // the context will not be a WebApplicationContext in an OSGi environment - return false; - } - - @Override - protected ServletExternalContext createServletExternalContext(HttpServletRequest request, HttpServletResponse response) { - ServletExternalContext context = new MvcExternalContext(request.getSession().getServletContext(), request, response, getFlowUrlHandler()); - context.setAjaxRequest(getAjaxHandler().isAjaxRequest(request, response)); - return context; - } -} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath new file mode 100644 index 00000000..c32daf65 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project new file mode 100644 index 00000000..8c898a9a --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project @@ -0,0 +1,30 @@ + + + org.springframework.samples.springtravel.resource + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + com.springsource.platform.ide.facet.core.bundlenature + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans new file mode 100644 index 00000000..4a47426b --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans @@ -0,0 +1,13 @@ + + + 1 + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml new file mode 100644 index 00000000..1c06e6c4 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml new file mode 100644 index 00000000..f8390d83 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath new file mode 100644 index 00000000..a6c9b671 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project new file mode 100644 index 00000000..6f2f3876 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project @@ -0,0 +1,30 @@ + + + org.springframework.samples.springtravel.webapp + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + com.springsource.platform.ide.facet.core.bundlenature + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans new file mode 100644 index 00000000..4a47426b --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans @@ -0,0 +1,13 @@ + + + 1 + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml new file mode 100644 index 00000000..ebbfcf51 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml new file mode 100644 index 00000000..660eec3e --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml new file mode 100644 index 00000000..c362e3b6 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml @@ -0,0 +1,61 @@ + + + + + + + + /hotel/search=flowController + /hotel/booking=flowController + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project new file mode 100644 index 00000000..0676ec6d --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project @@ -0,0 +1,23 @@ + + + org.springframework.samples.springtravel + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + org.springframework.ide.eclipse.core.springnature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans new file mode 100644 index 00000000..4a47426b --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans @@ -0,0 +1,13 @@ + + + 1 + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml new file mode 100644 index 00000000..5be69208 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml new file mode 100644 index 00000000..df224c27 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/readme.txt b/spring-webflow-samples/spring-travel-platform/readme.txt new file mode 100644 index 00000000..c8b19eef --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/readme.txt @@ -0,0 +1,3 @@ +This directory contains a flavor of the Spring Travel Application that has been designed a set of OSGi bundles. In addition, the bundles have been packaged together as a .PAR for convenient deployment to the SpringSource Application Platform. + +Please note: THIS SAMPLE IS CURRENTLY A WORK IN PROGRESS. It is not fully functional as of this time, but is expected to be fully functional in the next Web Flow release and by the time version 1.0 of the SpringSource Application Platform is generally available.