svn commit: r814546 - in /ofbiz/trunk/applications: content/data/PartyHelpData.xml content/ofbiz-component.xml party/data/PartyHelpData.xml party/ofbiz-component.xml

[hansbak-2]

Author: hansbak
Date: Mon Sep 14 09:52:24 2009
New Revision: 814546

URL: http://svn.apache.org/viewvc?rev=814546&view=rev
Log:
moved temporary the party helpfile to the content component until  solution is found because the party component is loaded first and need the content component (as reported on the mailing list)

Added:
    ofbiz/trunk/applications/content/data/PartyHelpData.xml   (with props)
Modified:
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/applications/party/data/PartyHelpData.xml
    ofbiz/trunk/applications/party/ofbiz-component.xml

Added: ofbiz/trunk/applications/content/data/PartyHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/PartyHelpData.xml?rev=814546&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/data/PartyHelpData.xml (added)
+++ ofbiz/trunk/applications/content/data/PartyHelpData.xml Mon Sep 14 09:52:24 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<entity-engine-xml>
+    <!--  party is first component loaded so need these files -->
+    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
+    <Content contentId="HELP_ROOT"/><!-- should be in the first component loaded -->
+    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
+    <DataResource dataResourceId="HELP_TEMPL"/><!--  further defined in the content component -->
+
+
+    <!-- help files -->
+    <DataResource dataResourceId="HELP_PARTY" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/party/data/helpdata/HELP_PARTY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+        dataResourceName="Party Overview" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_PARTY" contentTypeId="DOCUMENT" contentName="Party Overview" templateDataResourceId="HELP_TEMPL"
+        dataResourceId="HELP_PARTY" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PARTY" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    
+    <DataResource dataResourceId="PARTY_findparty" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/party/data/helpdata/HELP_PARTY_findparty.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List parties Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="PARTY_findparty" contentTypeId="DOCUMENT" contentName="List parties Help" templateDataResourceId="HELP_TEMPL" dataResourceId="PARTY_findparty" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_PARTY" contentIdTo="PARTY_findparty" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PARTY_findparty"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/content/data/PartyHelpData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/data/PartyHelpData.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/content/data/PartyHelpData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=814546&r1=814545&r2=814546&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Mon Sep 14 09:52:24 2009
@@ -38,6 +38,7 @@
     <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/> <!-- party is loaded first and this file needs contentTypeData -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>

Modified: ofbiz/trunk/applications/party/data/PartyHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyHelpData.xml?rev=814546&r1=814545&r2=814546&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyHelpData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyHelpData.xml Mon Sep 14 09:52:24 2009
@@ -18,24 +18,5 @@
 under the License.
 -->
 <entity-engine-xml>
-    <!--  party is first component loaded so need these files -->
-    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
-    <Content contentId="HELP_ROOT"/><!-- should be in the first component loaded -->
-    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
-    <DataResource dataResourceId="HELP_TEMPL"/><!--  further defined in the content component -->
-
-
-    <!-- help files -->
-    <DataResource dataResourceId="HELP_PARTY" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="applications/party/data/helpdata/HELP_PARTY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
-        dataResourceName="Party Overview" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_PARTY" contentTypeId="DOCUMENT" contentName="Party Overview" templateDataResourceId="HELP_TEMPL"
-        dataResourceId="HELP_PARTY" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PARTY" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
-    
-    <DataResource dataResourceId="PARTY_findparty" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="applications/party/data/helpdata/HELP_PARTY_findparty.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List parties Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="PARTY_findparty" contentTypeId="DOCUMENT" contentName="List parties Help" templateDataResourceId="HELP_TEMPL" dataResourceId="PARTY_findparty" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_PARTY" contentIdTo="PARTY_findparty" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PARTY_findparty"/>
-
+    <!-- please check the PartyHelpData in the content component data directory -->
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=814546&r1=814545&r2=814546&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Mon Sep 14 09:52:24 2009
@@ -26,7 +26,6 @@
     <classpath type="dir" location="config"/>
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>