svn commit: r1720413 - in /ofbiz/trunk/applications: ./ accounting/ accounting/entitydef/ content/ content/entitydef/ datamodel/ datamodel/entitydef/ humanres/ humanres/entitydef/ manufacturing/ manufacturing/entitydef/ marketing/ marketing/entitydef/ ...

[jacopoc]

Author: jacopoc
Date: Wed Dec 16 18:37:22 2015
New Revision: 1720413

URL: http://svn.apache.org/viewvc?rev=1720413&view=rev
Log:
OFBIZ-6760: Moved all entity definitions from the applications components into a new component named "datamodel".
This is a first step to refactor application components into independent parts that can be deployed when needed.


Added:
    ofbiz/trunk/applications/datamodel/
    ofbiz/trunk/applications/datamodel/entitydef/
    ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml
      - copied unchanged from r1720310, ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
    ofbiz/trunk/applications/datamodel/ofbiz-component.xml
Removed:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/manufacturing/entitydef/
    ofbiz/trunk/applications/marketing/entitydef/
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
Modified:
    ofbiz/trunk/applications/accounting/ofbiz-component.xml
    ofbiz/trunk/applications/component-load.xml
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/applications/humanres/ofbiz-component.xml
    ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
    ofbiz/trunk/applications/marketing/ofbiz-component.xml
    ofbiz/trunk/applications/order/ofbiz-component.xml
    ofbiz/trunk/applications/party/ofbiz-component.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml
    ofbiz/trunk/applications/workeffort/ofbiz-component.xml

Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -26,7 +26,6 @@ under the License.
     <classpath type="dir" location="config"/>
     <classpath type="jar" location="lib/*"/>
 
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_reports.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>

Modified: ofbiz/trunk/applications/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/component-load.xml (original)
+++ ofbiz/trunk/applications/component-load.xml Wed Dec 16 18:37:22 2015
@@ -20,6 +20,7 @@ under the License.
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+    <load-component component-location="datamodel"/>
     <load-component component-location="party"/>
     <load-component component-location="securityext"/>
     <load-component component-location="content"/>

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -27,7 +27,6 @@ under the License.
     <classpath type="jar" location="lib/*"/>
     <classpath type="jar" location="lib/uno/*"/>
     <classpath type="jar" location="build/lib/*"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentOperationData.xml"/>

Added: ofbiz/trunk/applications/datamodel/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/ofbiz-component.xml?rev=1720413&view=auto
==============================================================================
--- ofbiz/trunk/applications/datamodel/ofbiz-component.xml (added)
+++ ofbiz/trunk/applications/datamodel/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<ofbiz-component name="datamodel"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+    <resource-loader name="main" type="component"/>
+
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/accounting-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/content-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/humanres-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/manufacturing-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/marketing-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/order-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/party-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/product-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/shipment-entitymodel.xml"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/workeffort-entitymodel.xml"/>
+
+</ofbiz-component>

Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -24,7 +24,6 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>

Modified: ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -32,7 +32,6 @@ under the License.
 
 
     <!-- entity resources: model(s), eca(s) and group definitions -->
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/>

Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -24,7 +24,6 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
     <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/MarketingTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/>

Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -25,7 +25,6 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="email"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -25,8 +25,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
 
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>    
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.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/PartySecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PartySecurityGroupDemoData.xml"/>

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -26,10 +26,8 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="jar" location="lib/*"/>
 
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_shipment.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>

Modified: ofbiz/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/ofbiz-component.xml?rev=1720413&r1=1720412&r2=1720413&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Wed Dec 16 18:37:22 2015
@@ -24,7 +24,6 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>