svn commit: r509860 - in /ofbiz/trunk/applications/content: data/ContentTypeData.xml entitydef/entitygroup.xml entitydef/entitymodel.xml script/org/ofbiz/content/website/WebSiteServices.xml servicedef/services.xml servicedef/services_website.xml

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

svn commit: r509860 - in /ofbiz/trunk/applications/content: data/ContentTypeData.xml entitydef/entitygroup.xml entitydef/entitymodel.xml script/org/ofbiz/content/website/WebSiteServices.xml servicedef/services.xml servicedef/services_website.xml

jaz-3
Author: jaz
Date: Tue Feb 20 17:31:50 2007
New Revision: 509860

URL: http://svn.apache.org/viewvc?view=rev&rev=509860
Log:
implemented entities for website -> content publish (and HTML meta data) assoc; WebSite path aliases; CRUD services and seed data

Added:
    ofbiz/trunk/applications/content/servicedef/services_website.xml   (with props)
Modified:
    ofbiz/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/trunk/applications/content/entitydef/entitygroup.xml
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
    ofbiz/trunk/applications/content/servicedef/services.xml

Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?view=diff&rev=509860&r1=509859&r2=509860
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Tue Feb 20 17:31:50 2007
@@ -223,6 +223,11 @@
     <SubscriptionType description="Other" hasTable="N" parentTypeId="" subscriptionTypeId="OTHER_SUBSCR"/>
     <SubscriptionType description="Product Info" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_INFO_SUBSCR"/>
 
+    <!-- website data -->
+    <WebSiteContentType webSiteContentTypeId="PUBLISH_POINT" description="Publish Point (one)" hasTable="N" parentTypeId=""/>
+    <WebSiteContentType webSiteContentTypeId="META_DATA" description="HTML Meta Data (many)" hasTable="N" parentTypeId=""/>
+
+    <!-- survey data -->
     <SurveyApplType surveyApplTypeId="CART_ADD" description="Add-To Cart"/>
     <SurveyApplType surveyApplTypeId="CHECK_OUT" description="Check-Out"/>
     <SurveyApplType surveyApplTypeId="GENERAL_POLL" description="General Poll"/>

Modified: ofbiz/trunk/applications/content/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitygroup.xml?view=diff&rev=509860&r1=509859&r2=509860
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitygroup.xml Tue Feb 20 17:31:50 2007
@@ -30,6 +30,16 @@
     <entity-group group="org.ofbiz" entity="CommEventContentDataResource" />
 
   <!-- ========================================================= -->
+  <!-- org.ofbiz.content.compdoc -->
+  <!-- ========================================================= -->
+
+    <entity-group group="org.ofbiz" entity="AssocRevisionItemView" />
+    <entity-group group="org.ofbiz" entity="ContentAssocRevisionItemView" />
+    <entity-group group="org.ofbiz" entity="MaxRevisionItemView" />
+    <entity-group group="org.ofbiz" entity="ContentAssocOptViewFrom" />
+    <entity-group group="org.ofbiz" entity="MaxContentApprovalView" />
+
+  <!-- ========================================================= -->
   <!-- org.ofbiz.content.content -->
   <!-- ========================================================= -->
 
@@ -56,7 +66,6 @@
     <entity-group group="org.ofbiz" entity="ContentType" />
     <entity-group group="org.ofbiz" entity="ContentTypeAttr" />
     <entity-group group="org.ofbiz" entity="SubContentDataResourceView" />
-    <entity-group group="org.ofbiz" entity="WebSitePublishPoint" />
     
   <!-- ========================================================= -->
   <!-- org.ofbiz.content.data -->
@@ -117,14 +126,13 @@
     <entity-group group="org.ofbiz" entity="SurveyTrigger" />
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.content.compdoc -->
+  <!-- org.ofbiz.content.website -->
   <!-- ========================================================= -->
 
-    <entity-group group="org.ofbiz" entity="AssocRevisionItemView" />
-    <entity-group group="org.ofbiz" entity="ContentAssocRevisionItemView" />
-    <entity-group group="org.ofbiz" entity="MaxRevisionItemView" />
-    <entity-group group="org.ofbiz" entity="ContentAssocOptViewFrom" />
-    <entity-group group="org.ofbiz" entity="MaxContentApprovalView" />
+    <entity-group group="org.ofbiz" entity="WebSiteContent" />
+    <entity-group group="org.ofbiz" entity="WebSiteContentType" />
+    <entity-group group="org.ofbiz" entity="WebSitePathAlias" />
+    <entity-group group="org.ofbiz" entity="WebSitePublishPoint" />
 
 </entitygroup>
 

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?view=diff&rev=509860&r1=509859&r2=509860
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Tue Feb 20 17:31:50 2007
@@ -32,16 +32,20 @@
   <!-- ========================================================= -->
   <!-- ======================== Data Model ===================== -->
   <!-- The modules in this file are as follows:                  -->
+  <!--  - org.ofbiz.content.commevent -->
+  <!--  - org.ofbiz.content.compdoc -->
   <!--  - org.ofbiz.content.content -->
   <!--  - org.ofbiz.content.data -->
   <!--  - org.ofbiz.content.document -->
   <!--  - org.ofbiz.content.preference -->
   <!--  - org.ofbiz.content.survey -->
+  <!--  - org.ofbiz.content.website -->
   <!-- ========================================================= -->
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.content.commevent -->
   <!-- ========================================================= -->
+
    <entity entity-name="CommEventContentAssoc"
             package-name="org.ofbiz.content.commevent"
             title="CommunicationEvent Content Association Entity">
@@ -72,6 +76,107 @@
       <prim-key field="commContentAssocTypeId"/>
     </entity>
 
+    <!-- ========================================================= -->
+  <!-- org.ofbiz.content.compdoc -->
+  <!-- ========================================================= -->
+
+    <view-entity entity-name="AssocRevisionItemView"
+                package-name="org.ofbiz.content.compdoc"
+                title="Latest Revision Children">
+      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
+      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
+      <alias entity-alias="CA" name="contentId" group-by="true"/>
+      <alias entity-alias="CA" name="contentIdTo" group-by="true"/>
+      <alias entity-alias="CA" name="contentAssocTypeId" group-by="true"/>
+      <alias entity-alias="CA" name="thruDate" group-by="true"/>
+      <alias entity-alias="CA" name="fromDate" group-by="true"/>
+      <alias entity-alias="CA" name="sequenceNum" group-by="true"/>
+      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
+      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
+      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
+      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
+      <view-link entity-alias="CA" rel-entity-alias="CRI">
+        <key-map field-name="contentId" rel-field-name="itemContentId"/>
+      </view-link>
+    </view-entity>
+    <view-entity entity-name="ContentAssocRevisionItemView"
+                package-name="org.ofbiz.content.compdoc"
+                title="Latest Revision Children">
+      <member-entity entity-alias="C" entity-name="Content"/>
+      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
+      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
+      <alias entity-alias="C" name="instanceOfContentId" group-by="true"/>
+      <alias entity-alias="C" name="dataResourceId" group-by="true"/>
+      <alias entity-alias="CA" name="contentId" group-by="true"/>
+      <alias entity-alias="CA" name="contentIdTo" group-by="true"/>
+      <alias entity-alias="CA" name="contentAssocTypeId" group-by="true"/>
+      <alias entity-alias="CA" name="thruDate" group-by="true"/>
+      <alias entity-alias="CA" name="fromDate" group-by="true"/>
+      <alias entity-alias="CA" name="sequenceNum" group-by="true"/>
+      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
+      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
+      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
+      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
+      <view-link entity-alias="C" rel-entity-alias="CA">
+        <key-map field-name="contentId" rel-field-name="contentId"/>
+      </view-link>
+      <view-link entity-alias="CA" rel-entity-alias="CRI">
+        <key-map field-name="contentId" rel-field-name="itemContentId"/>
+      </view-link>
+    </view-entity>
+    <view-entity entity-name="MaxRevisionItemView"
+                package-name="org.ofbiz.content.compdoc"
+                title="Latest Revision Children">
+      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
+      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
+      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
+      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
+      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
+    </view-entity>
+    <view-entity entity-name="MaxContentApprovalView"
+                package-name="org.ofbiz.content.compdoc"
+                title="Latest ContentApproval">
+      <member-entity entity-alias="C" entity-name="Content"/>
+      <member-entity entity-alias="CA" entity-name="ContentApproval"/>
+      <alias entity-alias="C" name="contentTypeId"  group-by="true"/>
+      <alias entity-alias="CA" name="contentId"  group-by="true"/>
+      <alias entity-alias="CA" name="partyId"  group-by="true"/>
+      <alias entity-alias="CA" name="roleTypeId" group-by="true"/>
+      <alias entity-alias="CA" name="sequenceNum" group-by="false"/>
+      <alias entity-alias="CA" name="contentRevisionSeqId" group-by="false"/>
+      <alias entity-alias="CA" name="maxContentRevisionSeqId" field="contentRevisionSeqId" function="max"/>
+      <view-link entity-alias="C" rel-entity-alias="CA">
+        <key-map field-name="contentId" rel-field-name="contentId"/>
+      </view-link>
+    </view-entity>
+    <view-entity entity-name="ContentAssocOptViewFrom"
+                package-name="org.ofbiz.content.content"
+                title="Main Assoc To">
+      <member-entity entity-alias="CO" entity-name="Content"/>
+      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
+      <alias-all entity-alias="CO"/>
+      <alias-all entity-alias="CA" prefix="ca"/>
+      <alias entity-alias="CA" name="contentIdStart" field="contentIdTo"/>
+      <view-link entity-alias="CA" rel-entity-alias="CO" rel-optional="true">
+        <key-map field-name="contentIdTo" rel-field-name="contentId" />
+      </view-link>
+    </view-entity>
+    <!--
+    <view-entity entity-name="ContentRevisionItemAndContentApprovalView"
+                package-name="org.ofbiz.content.content"
+                title="ContentRevisionItem and ContentApproval">
+      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
+      <member-entity entity-alias="CA" entity-name="ContentApproval"/>
+      <alias-all entity-alias="CRI" />
+      <alias entity-alias="CA" name="caContentId" field="contentId" group-by="true" />
+      <alias entity-alias="CA" name="caContentRevisionSeqId" name="contentRevisionSeqId" group-by="true"/>
+      <alias entity-alias="CA" name="approvalCount" field="contentId" function="count"/>
+      <view-link entity-alias="CRI" rel-entity-alias="CA" rel-optional="true">
+        <key-map field-name="contentId"/>
+        <key-map field-name="contentRevisionSeqId"/>
+      </view-link>
+    </view-entity>
+    -->
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.content.content -->
@@ -676,30 +781,6 @@
         <key-map field-name="contentId" rel-field-name="contentIdTo"/>
       </relation>
     </view-entity>
-    <entity entity-name="WebSitePublishPoint"
-        package-name="org.ofbiz.content.content"
-        title="Web Site Publish Point">
-        <field name="contentId" type="id-ne"></field>
-        <field name="templateTitle" type="long-varchar"></field>
-        <field name="styleSheetFile" type="long-varchar"></field>
-        <field name="logo" type="long-varchar"></field>
-        <field name="medallionLogo" type="long-varchar"></field>
-        <field name="lineLogo" type="long-varchar"></field>
-        <field name="leftBarId" type="id"></field>
-        <field name="rightBarId" type="id"></field>
-        <field name="contentDept" type="id"></field>
-        <field name="aboutContentId" type="id"></field>
-        <prim-key field="contentId"/>
-        <relation type="one" fk-name="WBSTPP_CONTENT" rel-entity-name="Content">
-            <key-map field-name="contentId" />
-        </relation>
-    </entity>
-    <extend-entity entity-name="WebPage">
-        <field name="contentId" type="id-ne"></field>
-        <relation type="one" fk-name="WEB_PAGE_CONTENT" rel-entity-name="Content">
-            <key-map field-name="contentId"/>
-        </relation>
-    </extend-entity>
     
   <!-- ========================================================= -->
   <!-- org.ofbiz.content.data -->
@@ -1421,104 +1502,77 @@
     </entity>
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.content.compdoc -->
+  <!-- org.ofbiz.content.website -->
   <!-- ========================================================= -->
-    
-    <view-entity entity-name="AssocRevisionItemView"
-                package-name="org.ofbiz.content.compdoc"
-                title="Latest Revision Children">
-      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
-      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
-      <alias entity-alias="CA" name="contentId" group-by="true"/>
-      <alias entity-alias="CA" name="contentIdTo" group-by="true"/>
-      <alias entity-alias="CA" name="contentAssocTypeId" group-by="true"/>
-      <alias entity-alias="CA" name="thruDate" group-by="true"/>
-      <alias entity-alias="CA" name="fromDate" group-by="true"/>
-      <alias entity-alias="CA" name="sequenceNum" group-by="true"/>
-      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
-      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
-      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
-      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
-      <view-link entity-alias="CA" rel-entity-alias="CRI">
-        <key-map field-name="contentId" rel-field-name="itemContentId"/>
-      </view-link>
-    </view-entity>
-    <view-entity entity-name="ContentAssocRevisionItemView"
-                package-name="org.ofbiz.content.compdoc"
-                title="Latest Revision Children">
-      <member-entity entity-alias="C" entity-name="Content"/>
-      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
-      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
-      <alias entity-alias="C" name="instanceOfContentId" group-by="true"/>
-      <alias entity-alias="C" name="dataResourceId" group-by="true"/>
-      <alias entity-alias="CA" name="contentId" group-by="true"/>
-      <alias entity-alias="CA" name="contentIdTo" group-by="true"/>
-      <alias entity-alias="CA" name="contentAssocTypeId" group-by="true"/>
-      <alias entity-alias="CA" name="thruDate" group-by="true"/>
-      <alias entity-alias="CA" name="fromDate" group-by="true"/>
-      <alias entity-alias="CA" name="sequenceNum" group-by="true"/>
-      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
-      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
-      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
-      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
-      <view-link entity-alias="C" rel-entity-alias="CA">
-        <key-map field-name="contentId" rel-field-name="contentId"/>
-      </view-link>
-      <view-link entity-alias="CA" rel-entity-alias="CRI">
-        <key-map field-name="contentId" rel-field-name="itemContentId"/>
-      </view-link>
-    </view-entity>
-    <view-entity entity-name="MaxRevisionItemView"
-                package-name="org.ofbiz.content.compdoc"
-                title="Latest Revision Children">
-      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
-      <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
-      <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
-      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
-      <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
-    </view-entity>
-    <view-entity entity-name="MaxContentApprovalView"
-                package-name="org.ofbiz.content.compdoc"
-                title="Latest ContentApproval">
-      <member-entity entity-alias="C" entity-name="Content"/>
-      <member-entity entity-alias="CA" entity-name="ContentApproval"/>
-      <alias entity-alias="C" name="contentTypeId"  group-by="true"/>
-      <alias entity-alias="CA" name="contentId"  group-by="true"/>
-      <alias entity-alias="CA" name="partyId"  group-by="true"/>
-      <alias entity-alias="CA" name="roleTypeId" group-by="true"/>
-      <alias entity-alias="CA" name="sequenceNum" group-by="false"/>
-      <alias entity-alias="CA" name="contentRevisionSeqId" group-by="false"/>
-      <alias entity-alias="CA" name="maxContentRevisionSeqId" field="contentRevisionSeqId" function="max"/>
-      <view-link entity-alias="C" rel-entity-alias="CA">
-        <key-map field-name="contentId" rel-field-name="contentId"/>
-      </view-link>
-    </view-entity>
-    <view-entity entity-name="ContentAssocOptViewFrom"
-                package-name="org.ofbiz.content.content"
-                title="Main Assoc To">
-      <member-entity entity-alias="CO" entity-name="Content"/>
-      <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
-      <alias-all entity-alias="CO"/>
-      <alias-all entity-alias="CA" prefix="ca"/>
-      <alias entity-alias="CA" name="contentIdStart" field="contentIdTo"/>
-      <view-link entity-alias="CA" rel-entity-alias="CO" rel-optional="true">
-        <key-map field-name="contentIdTo" rel-field-name="contentId" />
-      </view-link>
-    </view-entity>
-<!--    
-    <view-entity entity-name="ContentRevisionItemAndContentApprovalView"
-                package-name="org.ofbiz.content.content"
-                title="ContentRevisionItem and ContentApproval">
-      <member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
-      <member-entity entity-alias="CA" entity-name="ContentApproval"/>
-      <alias-all entity-alias="CRI" />
-      <alias entity-alias="CA" name="caContentId" field="contentId" group-by="true" />
-      <alias entity-alias="CA" name="caContentRevisionSeqId" name="contentRevisionSeqId" group-by="true"/>
-      <alias entity-alias="CA" name="approvalCount" field="contentId" function="count"/>
-      <view-link entity-alias="CRI" rel-entity-alias="CA" rel-optional="true">
-        <key-map field-name="contentId"/>
-        <key-map field-name="contentRevisionSeqId"/>
-      </view-link>
-    </view-entity>
--->
+
+    <extend-entity entity-name="WebPage">
+        <field name="contentId" type="id-ne"></field>
+        <relation type="one" fk-name="WEB_PAGE_CONTENT" rel-entity-name="Content">
+            <key-map field-name="contentId"/>
+        </relation>
+    </extend-entity>
+    <entity entity-name="WebSiteContent"
+        package-name="org.ofbiz.content.website"
+        title="Web Site Content Associations">
+        <field name="webSiteId" type="id-ne"></field>
+        <field name="contentId" type="id-ne"></field>
+        <field name="webSiteContentTypeId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <prim-key field="webSiteId"/>
+        <prim-key field="contentId"/>
+        <prim-key field="webSiteContentTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="WSCTNT_WEBSITE" rel-entity-name="WebSite">
+            <key-map field-name="webSiteId"/>
+        </relation>
+        <relation type="one" fk-name="WSCTNT_CONTENT" rel-entity-name="Content">
+            <key-map field-name="contentId"/>
+        </relation>
+        <relation type="one" fk-name="WSCTNT_WSCTTYPE" rel-entity-name="WebSiteContentType">
+            <key-map field-name="webSiteContentTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="WebSiteContentType"
+        package-name="org.ofbiz.content.website"
+        title="Web Site Content Type">
+        <field name="webSiteContentTypeId" type="id-ne"></field>
+        <field name="description" type="description"></field>
+        <field name="parentTypeId" type="id-ne"></field>
+        <field name="hasTable" type="indicator"></field>
+        <prim-key field="webSiteContentTypeId"/>
+        <relation type="one" fk-name="WSCT_TYPE_PARENT" title="Parent" rel-entity-name="WebSiteContentType">
+            <key-map field-name="parentTypeId" rel-field-name="webSiteContentTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="WebSitePathAlias"
+        package-name="org.ofbiz.content.website"
+        title="Web Site Path Alias">
+        <field name="webSiteId" type="id-ne"></field>
+        <field name="pathAlias" type="id-vlong"></field>
+        <field name="aliasTo" type="long-varchar"></field>
+        <prim-key field="webSiteId"/>
+        <prim-key field="pathAlias"/>
+        <relation type="one" fk-name="WSPATH_WEBSITE" rel-entity-name="WebSite">
+            <key-map field-name="webSiteId"/>
+        </relation>
+    </entity>
+    <entity entity-name="WebSitePublishPoint"
+        package-name="org.ofbiz.content.website"
+        title="Web Site Publish Point">
+        <field name="contentId" type="id-ne"></field>
+        <field name="templateTitle" type="long-varchar"></field>
+        <field name="styleSheetFile" type="long-varchar"></field>
+        <field name="logo" type="long-varchar"></field>
+        <field name="medallionLogo" type="long-varchar"></field>
+        <field name="lineLogo" type="long-varchar"></field>
+        <field name="leftBarId" type="id"></field>
+        <field name="rightBarId" type="id"></field>
+        <field name="contentDept" type="id"></field>
+        <field name="aboutContentId" type="id"></field>
+        <prim-key field="contentId"/>
+        <relation type="one" fk-name="WBSTPP_CONTENT" rel-entity-name="Content">
+            <key-map field-name="contentId" />
+        </relation>
+    </entity>
 </entitymodel>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?view=diff&rev=509860&r1=509859&r2=509860
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Feb 20 17:31:50 2007
@@ -44,6 +44,83 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
+    <!-- WebSite Content -->
+    <simple-method method-name="createWebSiteContent" short-description="Create WebSite Content">
+        <make-value value-name="newEntity" entity-name="WebSiteContent"/>
+        <set-pk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <if-empty field-name="newEntity.fromDate">
+            <now-date-to-env env-name="nowTimestamp"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
+        </if-empty>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="updateWebSiteContent" short-description="Update WebSite Content">
+        <make-value value-name="lookupPKMap" entity-name="WebSiteContent"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSiteContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="removeWebSiteContent" short-description="Remove WebSite Content">
+        <make-value value-name="lookupPKMap" entity-name="WebSiteContent"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
+
+    <!-- WebSite Content Type Services -->
+    <simple-method method-name="createWebSiteContentType" short-description="Create WebSite Content Type">
+        <make-value value-name="newEntity" entity-name="WebSiteContentType"/>
+        <set-pk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <if-empty field-name="newEntity.webSiteContentTypeId">
+            <sequenced-id-to-env sequence-name="WebSiteContentTypeId" env-name="webSiteContentTypeId"/>
+            <set field="newEntity.webSiteContentTypeId" from-field="webSiteContentTypeId"/>
+        </if-empty>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="updateWebSiteContentType" short-description="Update WebSite Content Type">
+        <make-value value-name="lookupPKMap" entity-name="WebSiteContentType"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="removeWebSiteContentType" short-description="Remove WebSite Content Type">
+        <make-value value-name="lookupPKMap" entity-name="WebSiteContentType"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <remove-value value-name="lookedUpValue"/>        
+    </simple-method>
+
+    <!-- WebSite Path Alias -->
+    <simple-method method-name="createWebSitePathAlias" short-description="Create WebSite Path Alias">
+        <make-value value-name="newEntity" entity-name="WebSitePathAlias"/>
+        <set-pk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="updateWebSitePathAlias" short-description="Update WebSite Path Alias">
+        <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="removeWebSitePathAlias" short-description="Remove WebSite Path Alias">
+        <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="lookedUpValue"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias">
+        <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+        <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="alias" use-cache="true"/>
+        <field-to-result field-name="alias.pathTo" result-name="pathTo"/>
+    </simple-method>
+
     <!-- WebSite Role Services -->
     <simple-method method-name="createWebSiteRole" short-description="Create WebSite Role">
         <make-value value-name="newEntity" entity-name="WebSiteRole"/>

Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?view=diff&rev=509860&r1=509859&r2=509860
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Tue Feb 20 17:31:50 2007
@@ -31,64 +31,6 @@
         <attribute name="_uploadedFile_contentType" type="String" mode="IN" optional="false"/>
     </service>
 
-    <!-- WebSite Services -->
-    <service name="createWebSite" default-entity-name="WebSite" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSite">
-        <description>Create a WebSite</description>
-        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <override name="siteName" optional="false"/>
-    </service>
-    <service name="updateWebSite" default-entity-name="WebSite" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSite">
-        <description>Update a WebSite</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateWebSite" default-entity-name="WebSite" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSite">
-        <description>Remove a WebSite</description>
-        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
-    <!-- WebSiteRole services -->
-    <service name="webSiteRoleInterface" engine="interface">
-        <description>WebSite Role Interface</description>
-        <auto-attributes entity-name="WebSiteRole" include="all" mode="IN" optional="false"/>
-        <override name="thruDate" optional="true"/>
-        <override name="sequenceNum" optional="true"/>
-    </service>
-
-    <service name="addWebSiteRole" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteRole">
-        <description>Add WebSite Role; NOTE: This service is being deprecated in favor of createWebSiteRole</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <implements service="webSiteRoleInterface"/>
-        <override name="fromDate" optional="true"/>
-    </service>
-    <service name="createWebSiteRole" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteRole">
-        <description>Add WebSite Role</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <implements service="webSiteRoleInterface"/>
-        <override name="fromDate" optional="true"/>
-    </service>
-    <service name="updateWebSiteRole" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSiteRole">
-        <description>Add WebSite Role</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <implements service="webSiteRoleInterface"/>
-    </service>
-    <service name="removeWebSiteRole" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSiteRole">
-        <description>Remove WebSite Role</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes entity-name="WebSiteRole" include="pk" mode="IN" optional="false"/>
-    </service>
-
     <!-- Content services? -->
     <service name="getPublicForumMessage" engine="simple" default-entity-name="Content" auth="false"
             location="org/ofbiz/content/content/ContentServices.xml" invoke="getPublicForumMessage">

Added: ofbiz/trunk/applications/content/servicedef/services_website.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_website.xml?view=auto&rev=509860
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_website.xml (added)
+++ ofbiz/trunk/applications/content/servicedef/services_website.xml Tue Feb 20 17:31:50 2007
@@ -0,0 +1,152 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
+    <description>Content Component WebSite Services</description>
+    <vendor>OFBiz</vendor>
+
+    <!-- WebSite Services -->
+    <service name="createWebSite" default-entity-name="WebSite" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSite">
+        <description>Create a WebSite</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="siteName" optional="false"/>
+    </service>
+    <service name="updateWebSite" default-entity-name="WebSite" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSite">
+        <description>Update a WebSite</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateWebSite" default-entity-name="WebSite" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSite">
+        <description>Remove a WebSite</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- WebSite Content Services -->
+    <service name="createWebSiteContent" default-entity-name="WebSiteContent" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteContent">
+        <description>Create a WebSite Content</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateWebSiteContent" default-entity-name="WebSiteContent" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSiteContent">
+        <description>Update a WebSite Content</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeWebSiteContent" default-entity-name="WebSiteContent" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSiteContent">
+        <description>Remove a WebSite Content</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- WebSite ContentType Services -->
+    <service name="createWebSiteContentType" default-entity-name="WebSiteContentType" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteContentType">
+        <description>Create a WebSite ContentType</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateWebSiteContentType" default-entity-name="WebSiteContentType" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSiteContentType">
+        <description>Update a WebSite ContentType</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeWebSiteContentType" default-entity-name="WebSiteContentType" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSiteContentType">
+        <description>Remove a WebSite ContentType</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- WebSite Path Alias Services -->
+    <service name="createWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSitePathAlias">
+        <description>Create a WebSite Path Alias</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="all" mode="IN" optional="false"/>
+    </service>
+    <service name="udpateWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSitePathAlias">
+        <description>Update a WebSite Path Alias</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="all" mode="IN" optional="false"/>
+    </service>
+    <service name="removeWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSitePathAlias">
+        <description>Remove a WebSite Path Alias</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="getWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="getWebSitePathAlias">
+        <description>Get a WebSite Path Alias</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes mode="OUT" include="nonpk" optional="false"/>
+    </service>
+
+    <!-- WebSiteRole services -->
+    <service name="webSiteRoleInterface" engine="interface">
+        <description>WebSite Role Interface</description>
+        <auto-attributes entity-name="WebSiteRole" include="all" mode="IN" optional="false"/>
+        <override name="thruDate" optional="true"/>
+        <override name="sequenceNum" optional="true"/>
+    </service>
+
+    <service name="addWebSiteRole" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteRole">
+        <description>Add WebSite Role; NOTE: This service is being deprecated in favor of createWebSiteRole</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <implements service="webSiteRoleInterface"/>
+        <override name="fromDate" optional="true"/>
+    </service>
+    <service name="createWebSiteRole" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSiteRole">
+        <description>Add WebSite Role</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <implements service="webSiteRoleInterface"/>
+        <override name="fromDate" optional="true"/>
+    </service>
+    <service name="updateWebSiteRole" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSiteRole">
+        <description>Add WebSite Role</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <implements service="webSiteRoleInterface"/>
+    </service>
+    <service name="removeWebSiteRole" engine="simple" auth="true"
+            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSiteRole">
+        <description>Remove WebSite Role</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes entity-name="WebSiteRole" include="pk" mode="IN" optional="false"/>
+    </service>
+</services>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/content/servicedef/services_website.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/servicedef/services_website.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/content/servicedef/services_website.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml