Author: hansbak
Date: Fri Feb 27 09:24:13 2009
New Revision: 748456
URL: http://svn.apache.org/viewvc?rev=748456&view=rev
Log:
with the last change in the request handler and this change cmssite and ofbiz
site working again
Modified:
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/index.jsp
ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp
Modified:
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
Fri Feb 27 09:24:13 2009
@@ -38,13 +38,9 @@
</preprocessor>
<!-- default request; call into CMS -->
- <!--default-request request-uri="cms"/-->
+ <default-request request-uri="cms"/>
<!-- Request Mappings -->
- <request-map uri="main">
- <security https="false" auth="false"/>
- <response name="success" type="request" value="cms"/>
- </request-map>
<request-map uri="cms">
<security https="false" auth="false"/>
<event type="java" path="org.ofbiz.content.cms.CmsEvents"
invoke="cms"/>
@@ -53,7 +49,4 @@
</request-map>
<!-- End of Request Mappings -->
- <!-- View Mappings -->
- <view-map name="main" type="default"/>
- <!-- End of View Mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml Fri Feb
27 09:24:13 2009
@@ -68,7 +68,7 @@
</init-param>
<init-param>
<param-name>redirectPath</param-name>
- <param-value>/cms</param-value>
+ <param-value>/cms/cms</param-value>
</init-param>
</filter>
<filter-mapping>
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/index.jsp
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/index.jsp?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/index.jsp (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/index.jsp Fri Feb 27
09:24:13 2009
@@ -17,4 +17,4 @@
under the License.
--%>
-<%pageContext.forward("/cms");%>
+<%pageContext.forward("cms/cms");%>
Modified:
ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml
Fri Feb 27 09:24:13 2009
@@ -47,11 +47,10 @@
<response name="success" type="none"/>
<response name="error" type="view" value="error"/>
</request-map>
-
- <!-- Request Mappings for a standard ofbiz starting using control/main ,
does work but disabled now-->
- <!--request-map uri="main">
+
+ <request-map uri="main">
<security https="false" auth="false"/>
- <response name="success" type="view" value="main"/>
+ <response name="success" type="request-redirect" value="cms"/>
</request-map>
- <view-map name="main" type="screen"
page="component://cmssite/widget/OfbizsiteScreens.xml#main"/-->
+
</site-conf>
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml
(original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml Fri Feb
27 09:24:13 2009
@@ -60,7 +60,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
-
<param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+
<param-value>/cms:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
@@ -68,7 +68,7 @@
</init-param>
<init-param>
<param-name>redirectPath</param-name>
- <param-value>/control</param-value>
+ <param-value>/cms/cms</param-value>
</init-param>
</filter>
<filter-mapping>
@@ -93,7 +93,7 @@
<servlet-mapping>
<servlet-name>ControlServlet</servlet-name>
- <url-pattern>/control/*</url-pattern>
+ <url-pattern>/cms/*</url-pattern>
</servlet-mapping>
<session-config>
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp?rev=748456&r1=748455&r2=748456&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp Fri Feb 27
09:24:13 2009
@@ -17,4 +17,4 @@
under the License.
--%>
-<%pageContext.forward("/control/cms");%>
+<%pageContext.forward("cms/cms");%>
