[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/conf: internal.xml profile-servlet.xml ...

[noreply at shibboleth.net]

Author: tzeller
Date: Sat Aug 24 21:05:44 2013
New Revision: 4716

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4716&view=rev
Log:
Move Velocity up a context to internal.xml and configure webflow in profile-servlet.xml. Remove the now unnecessary velocity-config.xml and webflow-config.xml.

Modified:
    trunk/idp-distribution/src/main/resources/conf/internal.xml
    trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml
    trunk/idp-distribution/src/main/resources/conf/velocity-config.xml
    trunk/idp-distribution/src/main/resources/conf/webflow-config.xml

Modified: trunk/idp-distribution/src/main/resources/conf/internal.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/conf/internal.xml?rev=4716&r1=4715&r2=4716&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/conf/internal.xml (original)
+++ trunk/idp-distribution/src/main/resources/conf/internal.xml Sat Aug 24 21:05:44 2013
@@ -9,4 +9,16 @@
 
     <!-- TODO incomplete -->
 
+    <!-- Velocity configuration -->
+    <bean id="velocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+        <property name="configLocation" value="file:/opt/idp/conf/velocity.properties" />
+    </bean>
+
+    <!-- Velocity view resolver -->
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
+        <property name="cache" value="true" />
+        <property name="prefix" value="" />
+        <property name="suffix" value=".vm" />
+    </bean>
+
 </beans>

Modified: trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml?rev=4716&r1=4715&r2=4716&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml (original)
+++ trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml Sat Aug 24 21:05:44 2013
@@ -2,12 +2,42 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
-            http://www.springframework.org/schema/beans      http://www.springframework.org/schema/beans/spring-beans.xsd
-            http://www.springframework.org/schema/context    http://www.springframework.org/schema/context/spring-context.xsd
+            http://www.springframework.org/schema/beans          http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/context        http://www.springframework.org/schema/context/spring-context.xsd
+            http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd
        ">
+       
+    <!-- The registry of executable flow definitions -->
+    <webflow:flow-registry id="flowRegistry" flow-builder-services="flowBuilderServices"
+        base-path="file:/opt/idp/flows">
 
-    <import resource="webflow-config.xml" />
-    <import resource="velocity-config.xml" />
+        <webflow:flow-location id="Status" path="/status/status-flow.xml" />
+
+    </webflow:flow-registry>
+
+    <!-- Maps request paths to flows in the flowRegistry -->
+    <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
+        <property name="order" value="0" />
+        <property name="flowRegistry" ref="flowRegistry" />
+    </bean>
+
+    <!-- Dispatches requests mapped to flows to FlowHandler implementations -->
+    <bean id="flowHandlerAdapter" class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
+        <property name="flowExecutor" ref="flowExecutor" />
+    </bean>
+
+    <!-- The central service for executing flows -->
+    <webflow:flow-executor id="flowExecutor" />
+
+    <!-- Plugs in a custom creator for Web Flow views -->
+    <webflow:flow-builder-services id="flowBuilderServices" development="true"
+        view-factory-creator="mvcViewFactoryCreator" />
+
+    <!-- Plug in the VelocityViewResolver -->
+    <bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
+        <property name="viewResolvers" ref="viewResolver" />
+    </bean>
 
 </beans>