Commits

Juan Carlos Picado Herrera committed ae979cb

Enabled web-flow for sign up user account.

git-svn-id: http://svn.encuesta.me/trunk/encuestame@100039e2479b-dd58-4041-9f67-69c9b71f0610

Comments (0)

Files changed (16)

encuestame-mvc/src/main/java/org/encuestame/mvc/controller/HomeController.java

         return "home";
     }
 
+
+    @RequestMapping(value = "/signin", method = RequestMethod.GET)
+    public String signInController(ModelMap model) {
+        log.debug("HOME");
+        return "user/signin";
+    }
+
     /**
      * Search.
      * @param model

encuestame-mvc/src/main/java/org/encuestame/mvc/controller/security/SignUpAccountFormController.java

 
     private final Integer PASSWORD_LENGHT = 8;
 
-    @RequestMapping(value = "/user/signup.jspx" , method = RequestMethod.GET)
+    @RequestMapping(method = RequestMethod.GET)
     public String addHandler(Model model) {
-        log.info("/register");
+        log.info("/register JUANNNNNNNNNNNNNNNNNN");
         final SignUpBean user = new SignUpBean();
         final String captcha = getReCaptcha().createRecaptchaHtml(null, null);
         user.setCaptcha(captcha);
         log.info("username "+user.getCaptcha());
         model.addAttribute(user);
-        return "register";
+        return "user/signup";
     }
 
     /**
      * @param status
      * @return
      */
-    @RequestMapping(method = RequestMethod.POST)
+    //@RequestMapping(method = RequestMethod.POST)
     public String processSubmit(
         HttpServletRequest req,
         @RequestParam("recaptcha_challenge_field") String challenge,

encuestame-mvc/src/main/resources/encuestame-controller-context.xml

     class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
       <property name="interceptors">
           <list>
-               <!--<ref bean="openSessionInViewInterceptor"/>-->
+               <!--<ref bean="openSessionInViewInterceptor"/>
                <ref bean="mobileInterceptor"/>
-               <ref bean="enMeInterceptor"/>
+               <ref bean="enMeInterceptor"/>-->
           </list>
       </property>
      <property name="order" value="0"/>
   </bean>
 
-
  <bean id="mobileInterceptor" class="org.springframework.mobile.device.mvc.DeviceResolverHandlerInterceptor" />
  <bean id="enMeInterceptor" class=" org.encuestame.mvc.interceptor.DefaultEnMeInterceptor" />
 
     Enables annotated @Controllers; responsible for invoking an annotated
     POJO @Controller when one is mapped.
   -->
-  <bean
-    class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
-        <property name="order" value="0"/>
-  </bean>
+  <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/>
 
 </beans>

encuestame-mvc/src/main/resources/encuestame-json-context.xml

 
 
     <bean id="contentNegotiatingViewResolver" class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
-        <property name="order" value="1"/>
+        <property name="order" value="2"/>
         <property name="mediaTypes">
             <map>
                 <entry key="json" value="application/json" />

encuestame-war/pom.xml

                 <groupId>org.springframework.webflow</groupId>
                 <artifactId>spring-binding</artifactId>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.webflow</groupId>
+                <artifactId>org.springframework.webflow</artifactId>
+            </dependency>
+            <dependency>
+              <groupId>org.springframework.webflow</groupId>
+               <artifactId>spring-js</artifactId>
+            </dependency>
             <!-- Spring Integration  -->
             <dependency>
                 <groupId>org.springframework.integration</groupId>
                 <artifactId>spring-ldap-core</artifactId>
         </dependency>
         <dependency>
-              <groupId>org.springframework.webflow</groupId>
-                <artifactId>spring-js</artifactId>
-        </dependency>
-        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-expression</artifactId>
         </dependency>

encuestame-war/src/main/resources/encuestame-mvc-context.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<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"
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:device="http://www.springframework.org/schema/mobile/device"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+                        http://www.springframework.org/schema/mvc
+                        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
                         http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
+                        http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/mobile/device
+                        http://www.springframework.org/schema/mobile/device/spring-mobile-device-1.0.xsd">
 
+ <!-- Define url mappings to web flow controller.  -->
   <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
     <property name="mappings">
       <value>
-        /main.jspx=urlFilenameViewController
-        /admon/groups.jspx=urlFilenameViewController
-        /admon/users.jspx=urlFilenameViewController
-        /admon/location.jspx=urlFilenameViewController
-        /admon/project.jspx=urlFilenameViewController
-
-        /tweetpoll.jspx=urlFilenameViewController
-        /poll.jspx=urlFilenameViewController
-        /survey.jspx=urlFilenameViewController
-
-        /user/profile.jspx=urlFilenameViewController
-        /user/social.jspx=urlFilenameViewController
-        /user/resister.jspx=urlFilenameViewController
-        /user/signin.jspx=urlFilenameViewController
-        /user/forgot.jspx=urlFilenameViewController
-        /user/lists.jspx=urlFilenameViewController
-
-        /votes/tweetPoll.jspx=urlFilenameViewController
-        /votes/poll.jspx=urlFilenameViewController
-        /votes/survey.jspx=urlFilenameViewController
-
+        /signup=flowController
        </value>
     </property>
     <property name="defaultHandler" ref="urlFilenameViewController"/>
+    <property name="order" value="1"/>
   </bean>
 
+    <!-- Configures File Upload -->
+    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+        <property name="maxUploadSize" value="500000" />
+    </bean>
+
    <bean name="openSessionInViewInterceptor"
             class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
         <property name="sessionFactory">
     </bean>
     -->
 
-    <!--
-    Maps logical view names to Facelet templates in /WEB-INF (e.g.
-    'search' to '/WEB-INF/login.xhtml'
-  <bean id="faceletsViewResolver"
-    class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-    <property name="order" value="4"/>
-    <property name="viewClass" value="org.springframework.faces.mvc.JsfView" />
-    <property name="prefix" value="/WEB-INF/controller/" />
-    <property name="suffix" value=".xhtml" />
-   </bean>
-    -->
   <!--
   This Resolve it's not compatible with org.springframework.web.servlet.view.UrlBasedViewResolver -->
   <bean id="jspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-      <property name="order" value="2"/>
+      <property name="order" value="3"/>
       <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
       <property name="prefix" value="/WEB-INF/jsp/"/>
       <property name="suffix" value=".jsp"/>
 
   <!--
     Dispatches requests mapped to flows to FlowHandler implementations
-
    <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
     <property name="flowExecutor" ref="flowExecutor" />
   </bean>
+  -->
 
   <bean id="flowController" class="org.springframework.webflow.mvc.servlet.FlowController">
     <property name="flowExecutor" ref="flowExecutor"/>
   </bean>
-  -->
+
+    <!-- Maps request paths to flows in the flowRegistry;
+        e.g. a path of /hotels/booking looks for a flow with id "hotels/booking"
+    <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
+        <property name="flowRegistry" ref="flowRegistry"/>
+        <property name="order" value="1"/>
+    </bean>
+     -->
+
 
     <!-- Create Cookie Default Locale
 

encuestame-war/src/main/resources/encuestame-web-flow-context.xml

 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xmlns:faces="http://www.springframework.org/schema/faces"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
-           http://www.springframework.org/schema/faces
-           http://www.springframework.org/schema/faces/spring-faces-2.0.xsd">
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+
+
+   <!-- The registry of executable flow definitions -->
+    <webflow:flow-registry id="flowRegistry" base-path="/WEB-INF/flows">
+       <webflow:flow-location-pattern value="/**/*-flow.xml" />
+    </webflow:flow-registry>
 
    <!-- Executes flows: the central entry point into the Spring Web Flow system -->
     <webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
         </webflow:flow-execution-listeners>
     </webflow:flow-executor>
 
+        <!-- Plugs in a custom creator for Web Flow views
+    <webflow:flow-builder-services id="flowBuilderServices"
+           view-factory-creator="mvcViewFactoryCreator" development="true" />
+           -->
+
+    <!-- Configures Web Flow to use Tiles to create views for rendering; Tiles allows for applying consistent layouts to your views
+    <bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
+        <property name="viewResolvers" ref="jspViewResolver"/>
+        <property name="useSpringBeanBinding" value="true" />
+    </bean> -->
+
     <!-- Installs a listener that manages Hibernate persistence contexts for flows that require them -->
     <bean id="hibernateFlowExecutionListener" class="org.springframework.webflow.persistence.HibernateFlowExecutionListener">
             <constructor-arg index="0"><ref bean="sessionFactory"/></constructor-arg>
     Should be ready on  Spring Webflow 2.0.9 -->
     <bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
 
-
 </beans>

encuestame-war/src/main/webapp/WEB-INF/flows/signup/signup-flow.xml

       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
-    <var name="singUpBean" class="org.encuestame.utils.security.SignUpBean" />
+    <var name="signUpBean" class="org.encuestame.utils.security.SignUpBean" />
 
     <view-state id="signup">
         <transition on="singup" to="succesfull" >

encuestame-war/src/main/webapp/WEB-INF/flows/signup/signup.jsp

+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/initPage.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/publicBody.jsp" %>
+    <div id="mainUserWrapper">
+        FLOW
+    </div>
+<%@ include file="/WEB-INF/jsp/includes/footer.jsp" %>

encuestame-war/src/main/webapp/WEB-INF/flows/signup/signup.xhtml

-<ui:composition
-    template="../../layouts/anonymousTemplate.xhtml"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:a4j="http://richfaces.org/a4j"
-    xmlns:rich="http://richfaces.org/rich"
-    xmlns:sf="http://www.springframework.org/tags/faces">
-    <ui:define name="title"> encuestame - register</ui:define>
-    <ui:define name="body">
-        <h:form>
-            <h:panelGrid columns="2">
-                <h:outputLabel value="Full Name" />
-                <sf:clientTextValidator required="true">
-                    <h:inputText value="#{singUpBean.fullName}" />
-                </sf:clientTextValidator>
-                <h:outputLabel value="Username" />
-                <h:inputText value="#{singUpBean.username}" />
-                <h:outputLabel value="Password" />
-                <h:inputSecret value="#{singUpBean.password}" />
-                <h:outputLabel value="Email" />
-                <h:inputText value="#{singUpBean.email}" />
-            </h:panelGrid>
-            <h:commandButton value="SingUp" action="singup" />
-            <h:commandButton id="cancel" value="Cancel" action="cancel"/>
-        </h:form>
-    </ui:define>
-</ui:composition>

encuestame-war/src/main/webapp/WEB-INF/flows/signup/succesfull.xhtml

-<ui:composition
-    template="../../controller/layouts/anonymousTemplate.xhtml"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:a4j="http://richfaces.org/a4j"
-    xmlns:rich="http://richfaces.org/rich">
-    <ui:define name="title"> encuestame - register</ui:define>
-    <ui:define name="body">
-    <h:form >
-        <a4j:commandButton value="Confirm" action="confirm"></a4j:commandButton>
-        </h:form>
-    </ui:define>
-</ui:composition>

encuestame-war/src/main/webapp/WEB-INF/jsp/includes/headerPublic.jsp

 <body class="tundra">
  <div id="publicLineHeader">
         <div class="headerOptions">
-                <form method="get" action="<%=request.getContextPath()%>/search.jspx">
+                <form method="get" action="<%=request.getContextPath()%>/dashboard/search">
                         <span class="link">
-                           <a href="<%=request.getContextPath()%>/signin.jspx">Sign In</a>
+                           <a href="<%=request.getContextPath()%>/user/signin">Sign In</a>
                         </span>
                          <span class="link">
 

encuestame-war/src/main/webapp/WEB-INF/jsp/includes/menu.jsp

         <li class="item"><a href="<%=request.getContextPath()%>/admon/project.jspx">Projects</a></li>
         <li class="item"><a href="<%=request.getContextPath()%>/tweetpoll.jspx">TweetPolls</a></li>
         <li class="item"><a href="<%=request.getContextPath()%>/poll.jspx">Polls</a></li>
-        <li class="item"><a href="<%=request.getContextPath()%>//survey.jspx">Surveys</a></li>
+        <li class="item"><a href="<%=request.getContextPath()%>/survey.jspx">Surveys</a></li>
     </ul>
     <div style="float: right;">
         <div dojoType="encuestame.org.core.commons.notifications.Notification" delay="40000"></div>

encuestame-war/src/main/webapp/WEB-INF/jsp/signin.jsp

-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ include file="/WEB-INF/jsp/includes/initPage.jsp" %>
-<script src='http://connect.facebook.net/en_US/all.js'></script>
-<%@ include file="/WEB-INF/jsp/includes/publicBody.jsp" %>
-    <div id="loginWrapper">
-       <div class="formWrapper">
-           <form class="form" name="loginForm" id="loginForm" action="<%=request.getContextPath()%>/j_spring_security_check"  method="post">
-                  <div class="field">
-                  <div class="label">Username</div>
-                  <div class="output">
-                     <input type="text" name="j_username" id="j_username"/></div>
-                  </div>
-                  <div class="field">
-                  <div class="label">Password</div>
-                  <div class="output">
-                    <span><input type="password" name="j_password" id="j_password" /></span>
-                    <span><a href="<%=request.getContextPath()%>/user/forgot">Forgot?</a></span>
-                  </div>
-                  </div>
-                  <div class="field">
-                     <div class="label"></div>
-                      <div class="output">
-                          <input id="remember"  type="checkbox" name="_rememberMeServices" />
-                          <span>Keep me logged in</span>
-                      </div>
-                   </div>
-                    <div class="signIn">
-                        <input class="btn grey" type="submit" value="Sign In" />
-                        <span style="margin-left: 5px;">
-                            <a  href="<%=request.getContextPath()%>/user/signup"><span>You need account?</span></a>
-                        </span>
-                    </div>
-            </form>
-      </div>
-    </div>
-    <div class="socialConnect">
-        <div class="title">Do you already have an account on one of these sites?</div>
-        <div class="twitter">
-            <form action="<%=request.getContextPath()%>/signin/twitter.jspx" method="POST">
-                <button type="submit">
-                    <img src="<c:url value="/resource/images/social/twitter/signin.png" />"
-                </button>
-            </form>
-        </div>
-        <div class="facebook">
-                <script>
-                    function signInWithFacebook() {
-                        FB.getLoginStatus(function(response) {
-                            if (response.session) {
-                                dojo.byId('fb_signin').submit();
-                            }
-                          });
-                    }
-                </script>
-                <div id="fb-root"></div>
-                <form id="fb_signin" action="<c:url value="/signin/facebook" />" method="post">
-                    <fb:login-button perms="email,publish_stream,offline_access" onlogin="signInWithFacebook();" v="2"
-                        length="long">Sign in with Facebook</fb:login-button>
-                </form>
-                 <script>
-                if(FB) {
-                    FB.requireSessionThenGoTo = function(url) {
-                        FB.getLoginStatus(function(response) {
-                            if (response.session) {
-                                window.location = url;
-                            } else {
-                                FB.login(function(response) {
-                                    if (response.session) {
-                                        window.location = url;
-                                    }
-                                });
-                            }
-                        });
-                    };
-
-                    FB.logoutThenGoTo = function(url) {
-                        FB.logout(function(response) {
-                            window.location = url;
-                        });
-                    };
-                }
-                </script>
-                <script type='text/javascript'>
-                    FB.init({appId: '102345790957', status: true, cookie: true, xfbml: true});
-                    FB.Event.subscribe('auth.sessionChange', function(response) { if (response.session) {} else {} });
-                </script>
-        </div>
-    </div>
-<%@ include file="/WEB-INF/jsp/includes/endBody.jsp" %>
-<%@ include file="/WEB-INF/jsp/includes/validate.jsp" %>
-<%@ include file="/WEB-INF/jsp/includes/footer.jsp" %>

encuestame-war/src/main/webapp/WEB-INF/jsp/user/signin.jsp

+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/initPage.jsp" %>
+<script src='http://connect.facebook.net/en_US/all.js'></script>
+<%@ include file="/WEB-INF/jsp/includes/publicBody.jsp" %>
+    <div id="loginWrapper">
+       <div class="formWrapper">
+           <form class="form" name="loginForm" id="loginForm" action="<%=request.getContextPath()%>/j_spring_security_check"  method="post">
+                  <div class="field">
+                  <div class="label">Username</div>
+                  <div class="output">
+                     <input type="text" name="j_username" id="j_username"/></div>
+                  </div>
+                  <div class="field">
+                  <div class="label">Password</div>
+                  <div class="output">
+                    <span><input type="password" name="j_password" id="j_password" /></span>
+                    <span><a href="<%=request.getContextPath()%>/user/forgot">Forgot?</a></span>
+                  </div>
+                  </div>
+                  <div class="field">
+                     <div class="label"></div>
+                      <div class="output">
+                          <input id="remember"  type="checkbox" name="_rememberMeServices" />
+                          <span>Keep me logged in</span>
+                      </div>
+                   </div>
+                    <div class="signIn">
+                        <input class="btn grey" type="submit" value="Sign In" />
+                        <span style="margin-left: 5px;">
+                            <a  href="<%=request.getContextPath()%>/user/signup"><span>You need account?</span></a>
+                        </span>
+                    </div>
+            </form>
+      </div>
+    </div>
+    <div class="socialConnect">
+        <div class="title">Do you already have an account on one of these sites?</div>
+        <div class="twitter">
+            <form action="<%=request.getContextPath()%>/signin/twitter.jspx" method="POST">
+                <button type="submit">
+                    <img src="<c:url value="/resource/images/social/twitter/signin.png" />"
+                </button>
+            </form>
+        </div>
+        <div class="facebook">
+                <script>
+                    function signInWithFacebook() {
+                        FB.getLoginStatus(function(response) {
+                            if (response.session) {
+                                dojo.byId('fb_signin').submit();
+                            }
+                          });
+                    }
+                </script>
+                <div id="fb-root"></div>
+                <form id="fb_signin" action="<c:url value="/signin/facebook" />" method="post">
+                    <fb:login-button perms="email,publish_stream,offline_access" onlogin="signInWithFacebook();" v="2"
+                        length="long">Sign in with Facebook</fb:login-button>
+                </form>
+                 <script>
+                if(FB) {
+                    FB.requireSessionThenGoTo = function(url) {
+                        FB.getLoginStatus(function(response) {
+                            if (response.session) {
+                                window.location = url;
+                            } else {
+                                FB.login(function(response) {
+                                    if (response.session) {
+                                        window.location = url;
+                                    }
+                                });
+                            }
+                        });
+                    };
+
+                    FB.logoutThenGoTo = function(url) {
+                        FB.logout(function(response) {
+                            window.location = url;
+                        });
+                    };
+                }
+                </script>
+                <script type='text/javascript'>
+                    FB.init({appId: '102345790957', status: true, cookie: true, xfbml: true});
+                    FB.Event.subscribe('auth.sessionChange', function(response) { if (response.session) {} else {} });
+                </script>
+        </div>
+    </div>
+<%@ include file="/WEB-INF/jsp/includes/endBody.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/validate.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/footer.jsp" %>
                 <artifactId>spring-binding</artifactId>
                 <version>${spring.webflow.version}</version>
             </dependency>
+            <dependency>
+              <groupId>org.springframework.webflow</groupId>
+                <artifactId>spring-js</artifactId>
+                <version>${spring.webflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.webflow</groupId>
+                <artifactId>org.springframework.webflow</artifactId>
+                <version>${spring.webflow.version}</version>
+            </dependency>
+
+            <!--
+            Dependencies for WebFlow with Java Server Faces
+            <dependency>
+                <groupId>org.springframework.webflow</groupId>
+                <artifactId>spring-faces</artifactId>
+                <version>${spring.webflow.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>spring-webflow</artifactId>
+                        <groupId>org.springframework.webflow</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.webflow</groupId>
+                <artifactId>org.springframework.faces</artifactId>
+                <version>${spring.webflow.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>com.springsource.org.aopalliance</artifactId>
+                        <groupId>org.aopalliance</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>org.apache.commons</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>org.springframework.web.servlet</artifactId>
+                        <groupId>org.springframework</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            -->
             <!-- Spring Integration  -->
             <dependency>
                 <groupId>org.springframework.integration</groupId>
             <version>1.3.1.RELEASE</version>
         </dependency>
         <dependency>
-              <groupId>org.springframework.webflow</groupId>
-                <artifactId>spring-js</artifactId>
-                <version>${spring.webflow.version}</version>
-        </dependency>
-        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-expression</artifactId>
            <version>${spring.version}</version>
                 <artifactId>ejb3-persistence</artifactId>
                 <version>1.0.2.GA</version>
             </dependency>
-            -<dependency>
-                <groupId>org.springframework.webflow</groupId>
-                <artifactId>spring-faces</artifactId>
-                <version>${spring.webflow.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>spring-webflow</artifactId>
-                        <groupId>org.springframework.webflow</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.webflow</groupId>
-                <artifactId>org.springframework.faces</artifactId>
-                <version>${spring.webflow.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>com.springsource.org.aopalliance</artifactId>
-                        <groupId>org.aopalliance</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-                        <groupId>org.apache.commons</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>org.springframework.web.servlet</artifactId>
-                        <groupId>org.springframework</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             -->
 
             <dependency>