Commits

Juan Carlos Picado Herrera committed 2a11492

New servlet mapping.
Removed url rewrite.

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

Comments (0)

Files changed (2)

encuestame-war/src/main/webapp/WEB-INF/urlrewrite.xml

 <!--        <to>/announceController.do?id=$1</to>-->
 <!--    </rule>-->
 
-    <rule>
-        <from>^/user/signin</from>
-        <to>/signin.jspx</to>
-    </rule>
-    <rule>
-      <from>^/signin.jspx</from>
-      <to type="redirect">user/signin</to>
-    </rule>
+<!--    <rule>-->
+<!--        <from>^/user/signin</from>-->
+<!--        <to>user/signin</to>-->
+<!--    </rule>-->
+<!--    <rule>-->
+<!--      <from>^/signin.jspx</from>-->
+<!--      <to type="redirect">user/signin</to>-->
+<!--    </rule>-->
     <rule>
       <from>^/index.jspx</from>
       <to type="redirect">home</to>
       <from>^/error.jspx</from>
       <to type="redirect">user/denied</to>
     </rule>
-    <rule>
-        <from>^/user/denied</from>
-        <to>/error.jspx</to>
-    </rule>
-    <rule>
-        <from>^/user/signup</from>
-        <to>/user/signup.jspx</to>
-    </rule>
-    <rule>
-        <from>^/user/forgot</from>
-        <to>/user/forgot.jspx</to>
-    </rule>
+<!--    <rule>-->
+<!--        <from>^/user/denied</from>-->
+<!--        <to>/error.jspx</to>-->
+<!--    </rule>-->
+<!--    <rule>-->
+<!--        <from>^/user/signup</from>-->
+<!--        <to>/user/signup.jspx</to>-->
+<!--    </rule>-->
+<!--    <rule>-->
+<!--        <from>^/user/forgot</from>-->
+<!--        <to>/user/forgot.jspx</to>-->
+<!--    </rule>-->
 
     <!-- Detail View Votes -->
     <rule>

encuestame-war/src/main/webapp/WEB-INF/web.xml

             classpath:encuestame-quartz-context.xml
             classpath:encuestame-rss-context.xml,
             classpath:encuestame-mvc-context.xml,
+            classpath:encuestame-web-flow-context.xml,
             classpath:encuestame-controller-context.xml,
             classpath:encuestame-json-context.xml
             <!--  classpath:encuestame-integration.xml-->
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>encuestame-spring-dispacher</servlet-name>
+        <url-pattern>/user/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>encuestame-spring-dispacher</servlet-name>
         <url-pattern>*.pdf</url-pattern>
     </servlet-mapping>
     <servlet-mapping>