svn commit: r737311 - in /ofbiz/trunk/specialpurpose/cmssite: data/CmsSiteDemoData.xml template/ofbiz/ofbizHead.ftl webapp/ofbizsite/WEB-INF/controller.xml webapp/ofbizsite/WEB-INF/web.xml webapp/ofbizsite/index.jsp

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r737311 - in /ofbiz/trunk/specialpurpose/cmssite: data/CmsSiteDemoData.xml template/ofbiz/ofbizHead.ftl webapp/ofbizsite/WEB-INF/controller.xml webapp/ofbizsite/WEB-INF/web.xml webapp/ofbizsite/index.jsp

hansbak-2
Author: hansbak
Date: Sat Jan 24 07:08:25 2009
New Revision: 737311

URL: http://svn.apache.org/viewvc?rev=737311&view=rev
Log:
running the ofbiz site under the ofbiz websitecms system (make sure you load the demo data)

Modified:
    ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
    ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl
    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/data/CmsSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=737311&r1=737310&r2=737311&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Sat Jan 24 07:08:25 2009
@@ -135,12 +135,12 @@
 
 <!-- =========================official OFBiz website ============================================ -->    
     <WebSite webSiteId="OfbizSite" siteName="OFBiz Web Site"/>
-    <Content contentId="OFBIZ_PPOINT" contentTypeId="OFBIZ_SITE_PUB_PT" contentName="OFBiz Site Publish Point" description=""/>
+    <Content contentId="OFBIZ_PPOINT" contentTypeId="WEB_SITE_PUB_PT" contentName="OFBiz Site Publish Point" description=""/>
     <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_PPOINT" webSiteContentTypeId="PUBLISH_POINT" fromDate="2001-01-01 00:00:00"/>
-    <DataResource dataResourceId="OFBIZ_DEC" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="FTL"
-        objectInfo="component://cmssite/widget/template/cms/MainDecorator.ftl"/>
-    <Content contentId="OFBIZ_DEC" contentTypeId="DECORATOR" contentName="CMS Site Main Decorator" dataResourceId="OFBIZ_DEC"/>
-    <ContentPurpose contentId="OFBIZ_DEC" contentPurposeTypeId="SECTION"/>
-    
-    
+    <DataResource dataResourceId="OFBIZ_HOME" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED"
+        objectInfo="component://cmssite/widget/OfbizsiteScreens.xml#main"/>
+    <Content contentId="OFBIZ_HOME" contentTypeId="DOCUMENT" contentName="OFBiz Site Home Page" dataResourceId="OFBIZ_HOME"/>
+    <ContentAssoc contentId="OFBIZ_PPOINT" contentIdTo="OFBIZ_HOME" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="demoHome"/>
+    <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
+
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl?rev=737311&r1=737310&r2=737311&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl Sat Jan 24 07:08:25 2009
@@ -35,10 +35,10 @@
 
 <head>
     <title>OFBiz, The Apache Open For Business Project - Open Source E-Business / E-Commerce, ERP, CRM, POS</title>
-    <link rel="stylesheet" href="images/ofbws.css" type="text/css"/>
+    <link rel="stylesheet" href="/ofbiz/images/ofbws.css" type="text/css"/>
     <meta name="keywords" content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="shortcut icon" href="images/ofbiz.ico"/>    
+    <link rel="shortcut icon" href="/ofbiz/images/ofbiz.ico"/>    
 </head>
 
 <body>
@@ -47,12 +47,12 @@
 <div class="headerboxoutside">
     <div class="headerboxtop">
         <div class="left">
-            <a href="http://ofbiz.apache.org/"><img src="images/ofbiz_logo.jpg" border="0" alt="The Open For Business Project"/></a>
+            <a href="http://ofbiz.apache.org/"><img src="/ofbiz/images/ofbiz_logo.jpg" border="0" alt="The Open For Business Project"/></a>
         </div>
         <div class="right">
-            <a href="http://ofbiz.apache.org/"><img class="main-logo" src="images/ofbiz_powered.gif" alt="Powered By Apache OFBiz"/></a>
+            <a href="http://ofbiz.apache.org/"><img class="main-logo" src="/ofbiz/images/ofbiz_powered.gif" alt="Powered By Apache OFBiz"/></a>
 
-            <a href="http://www.apache.org/"><img class="main-logo" src="images/apache-feather.png" alt="Apache Software Foundation"/></a>
+            <a href="http://www.apache.org/"><img class="main-logo" src="/ofbiz/images/apache-feather.png" alt="Apache Software Foundation"/></a>
         </div>
         <div class="endcolumns"><span>&nbsp;</span></div>
     </div>

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=737311&r1=737310&r2=737311&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml Sat Jan 24 07:08:25 2009
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     
-    <description>OFBiz: CMS Site Controller Configuration File</description>
+    <description>OFBiz: OFBiz Site Controller Configuration File</description>
 
     <!-- Events run from here for the first hit in a visit -->
     <firstvisit>
@@ -38,13 +38,20 @@
     </preprocessor>
 
     <!-- default request; call into CMS -->
-    <default-request request-uri="main"/>
+    <default-request request-uri="cms"/>
 
-    <!-- Request Mappings -->
-    <request-map uri="main">
+    <!-- using cms looking for the website and the default page to display see: content -> websites -> OfbizSite -> content -->
+    <request-map uri="cms">
         <security https="false" auth="false"/>
-        <response name="success" type="view" value="main"/>
+        <event type="java" path="org.ofbiz.content.cms.CmsEvents" invoke="cms"/>
+        <response name="success" type="none"/>
+        <response name="error" type="view" value="error"/>
     </request-map>
 
-    <view-map name="main" type="screen" page="component://cmssite/widget/OfbizsiteScreens.xml#main"/>
+    <!-- Request Mappings  for a standard ofbiz starting using control/main , does work but disabled now-->
+    <!--request-map uri="main">
+        <security https="false" auth="false"/>
+        <response name="success" type="view" value="main"/>
+    </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=737311&r1=737310&r2=737311&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml Sat Jan 24 07:08:25 2009
@@ -26,12 +26,12 @@
 
     <context-param>
         <param-name>webSiteId</param-name>
-        <param-value>CmsSite</param-value>
+        <param-value>OfbizSite</param-value>
         <description>A unique ID used to look up the WebSite entity to get information about catalogs, etc.</description>
     </context-param>
     <context-param>
         <param-name>localDispatcherName</param-name>
-        <param-value>CmsSite</param-value>
+        <param-value>OfbizSite</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>
     <context-param>
@@ -60,7 +60,7 @@
         </init-param>
         <init-param>
             <param-name>allowedPaths</param-name>
-            <param-value>/cms:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+            <param-value>/control:/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>/cms</param-value>
+            <param-value>/control</param-value>
         </init-param>        
     </filter>
     <filter-mapping>
@@ -93,7 +93,7 @@
     
     <servlet-mapping>
         <servlet-name>ControlServlet</servlet-name>
-        <url-pattern>/cms/*</url-pattern>
+        <url-pattern>/control/*</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=737311&r1=737310&r2=737311&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/index.jsp Sat Jan 24 07:08:25 2009
@@ -17,4 +17,4 @@
 under the License.
 --%>
 
-<%pageContext.forward("/cms");%>
+<%pageContext.forward("/control/cms");%>