svn commit: r1346255 - in /ofbiz/trunk: applications/accounting/ applications/commonext/ applications/content/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ applications/product/ appl...

[hansbak-2]

Author: hansbak
Date: Tue Jun  5 06:37:06 2012
New Revision: 1346255

URL: http://svn.apache.org/viewvc?rev=1346255&view=rev
Log:

introduced a new data-reader : 'security'

Security is now by default not loaded because not part of seed anymore this will make all component hidden and not accessible .
It is still loaded as part of the reader 'demo'

to load the security files:
./ant load-readers -Ddata-readers=security

Now it is possible to load only a selection of the security files in your hot-deploy component as follows:

<entity-resource type=data reader-name=seed loader=main location=../../framework/security/data/SecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../framework/webtools/data/WebtoolsSecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../applications/party/data/PartySecurityData.xml/>

This will enable only standard groups, the party and the webtools application.

Added:
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalPageDemoData.xml
      - copied unchanged from r1346194, ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Removed:
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Modified:
    ofbiz/trunk/applications/accounting/ofbiz-component.xml
    ofbiz/trunk/applications/commonext/ofbiz-component.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
    ofbiz/trunk/framework/bi/ofbiz-component.xml
    ofbiz/trunk/framework/common/ofbiz-component.xml
    ofbiz/trunk/framework/entity/config/entityengine.xml
    ofbiz/trunk/framework/entity/ofbiz-component.xml
    ofbiz/trunk/framework/entityext/ofbiz-component.xml
    ofbiz/trunk/framework/resources/templates/ofbiz-component.xml
    ofbiz/trunk/framework/security/ofbiz-component.xml
    ofbiz/trunk/framework/service/ofbiz-component.xml
    ofbiz/trunk/framework/webtools/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/workflow/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=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -39,7 +39,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/AccountingSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/PaymentGatewayConfData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/>

Modified: ofbiz/trunk/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -26,11 +26,11 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/CommonExtSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/OfbizSetupSecurityData.xml"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -36,7 +36,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/>
     <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="security" 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/ContentHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/>

Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@ under the License.
     <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"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/HumanResSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -34,7 +34,7 @@ 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/ManufacturingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ManufacturingSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
     <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->

Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -27,7 +27,7 @@ under the License.
     <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/MarketingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/MarketingSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>

Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -34,7 +34,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/OrderSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@ under the License.
     <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/PartyTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/PartySecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/>

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -37,7 +37,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ProductSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/>

Modified: ofbiz/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -31,7 +31,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/WorkEffortSecurityData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>

Modified: ofbiz/trunk/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/bi/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -25,7 +25,7 @@ under the License.
     <classpath type="dir" location="config"/>
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/BiSecurityData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
 

Modified: ofbiz/trunk/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/common/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -27,7 +27,7 @@ under the License.
     <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_olap.xml"/>
     <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/CommonSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/>

Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Tue Jun  5 06:37:06 2012
@@ -100,6 +100,7 @@ access. For a detailed description see t
     <!-- defining:
         tenant       = OFBiz and External Tenant Data
         seed         = OFBiz and External Seed Data - to be maintained along with source and updated whenever a system deployment is updated
+        security     = OFBiz security group and security permissions. are required to show a component.
         seed-initial = OFBiz and External Seed Data - to be maintained along with source like other seed data, but only loaded initially and not updated when a system is updated except manually reviewing each line
         demo         = OFBiz Only Demo Data
         ext          = External General Data (custom)
@@ -108,6 +109,7 @@ access. For a detailed description see t
     -->
     <entity-data-reader name="tenant"/>
     <entity-data-reader name="seed"/>
+    <entity-data-reader name="security"/>
     <entity-data-reader name="seed-initial"/>
     <entity-data-reader name="demo"/>
     <entity-data-reader name="ext"/>
@@ -155,6 +157,7 @@ access. For a detailed description see t
             alias-view-columns="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -184,6 +187,7 @@ access. For a detailed description see t
             use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -234,6 +238,7 @@ access. For a detailed description see t
         <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index -->
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -260,6 +265,7 @@ access. For a detailed description see t
         use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -283,6 +289,7 @@ access. For a detailed description see t
             add-missing-on-start="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -308,6 +315,7 @@ access. For a detailed description see t
             use-pk-constraint-names="false">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -337,6 +345,7 @@ access. For a detailed description see t
             collate="latin1_general_cs">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -368,6 +377,7 @@ access. For a detailed description see t
             collate="latin1_general_cs">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -399,6 +409,7 @@ access. For a detailed description see t
             collate="latin1_general_cs">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -430,6 +441,7 @@ access. For a detailed description see t
             collate="latin1_general_cs">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <inline-jdbc
                 jdbc-driver="com.mysql.jdbc.Driver"
                 jdbc-uri="jdbc:mysql://127.0.0.1/ofbiz_odbc?autoReconnect=true"
@@ -458,6 +470,7 @@ access. For a detailed description see t
             -->
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -496,6 +509,7 @@ access. For a detailed description see t
         use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -530,6 +544,7 @@ access. For a detailed description see t
             use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -564,6 +579,7 @@ access. For a detailed description see t
             use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -596,6 +612,7 @@ access. For a detailed description see t
             use-order-by-nulls="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -637,6 +654,7 @@ access. For a detailed description see t
             join-style="ansi">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -661,6 +679,7 @@ access. For a detailed description see t
             join-style="ansi-no-parenthesis">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -689,6 +708,7 @@ access. For a detailed description see t
             join-style="ansi">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -732,6 +752,7 @@ access. For a detailed description see t
             use-fk-initially-deferred="false">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -756,6 +777,7 @@ access. For a detailed description see t
             join-style="ansi">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
@@ -784,6 +806,7 @@ access. For a detailed description see t
             always-use-constraint-keyword="true">
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
+        <read-data reader-name="security"/>
         <read-data reader-name="seed-initial"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>

Modified: ofbiz/trunk/framework/entity/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entity/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -34,7 +34,7 @@ under the License.
     <!-- these are for unit testing -->
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_test.xml"/>
 
-    <entity-resource type="data" reader-name="tenant" loader="main" location="data/TenantDemoData.xml"/>
+    <!--entity-resource type="data" reader-name="tenant" loader="main" location="data/TenantDemoData.xml"/-->
     
     <test-suite loader="main" location="testdef/entitytests.xml"/>
 </ofbiz-component>

Modified: ofbiz/trunk/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -29,7 +29,7 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtTypeData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/EntityExtSecurityData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="group" loader="main" location="servicedef/groups.xml"/>

Modified: ofbiz/trunk/framework/resources/templates/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/resources/templates/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -17,7 +17,7 @@
     <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/@[hidden email]"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/@[hidden email]"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/@[hidden email]"/><!-- leave the type at seed because this will be used in hot-deploy where the required  security files need to be loaded. -->
     <entity-resource type="data" reader-name="demo" loader="main" location="data/@[hidden email]"/>
 
     <!-- service resources: model(s), eca(s) and group definitions -->

Modified: ofbiz/trunk/framework/security/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/security/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -26,7 +26,7 @@ under the License.
     <classpath type="dir" location="dtd"/>
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/SecurityData.xml"/>
     <!-- NOTE: comment this line out to ensure no resetting of passwords -->
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PasswordSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/SecurityDemoData.xml"/>

Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -31,7 +31,7 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ScheduledServiceData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ScheduledServices.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ServiceSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/trunk/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/webtools/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -24,7 +24,7 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/WebtoolsSecurityData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <webapp name="webtools"
         title="WebTools"

Modified: ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -32,7 +32,7 @@
 
     <!-- entity resources: model(s), eca(s), group, and data 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/AssetMaintSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/AssetMaintSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
 

Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -26,7 +26,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/EbaySecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>

Modified: ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/EbayStoreSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStorePortletData.xml"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -25,7 +25,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/EcommerceSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/>
@@ -68,5 +68,11 @@ under the License.
         location="webapp/ecomclone"
         mount-point="/ecomclone"
         app-bar-display="false"/>
+    <webapp name="demoecommerce"
+        title="Demo eCommerce"
+        server="default-server"
+        location="webapp/ecommerce"
+        mount-point="/"
+        app-bar-display="false"/>
 </ofbiz-component>
 

Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -36,7 +36,7 @@ under the License.
     <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"/> -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ExampleSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>

Modified: ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -27,7 +27,7 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleBaseSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleBaseData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services_request.xml"/>

Modified: ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -24,7 +24,7 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/HhFacilitySecurityData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/>
 

Modified: ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -24,8 +24,8 @@
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/MyPortalSecurityData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalPageDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/OagisSecurityData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <!-- Uncomment To activate automatic messaging to the partner

Modified: ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -29,7 +29,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PosSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/PosSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PosTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRetail.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PosSyncSettings.xml"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -29,7 +29,7 @@ under the License.
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ProjectMgrSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/>

Modified: ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -35,7 +35,7 @@ under the License.
     <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/scrumTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/scrumSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/>
 

Modified: ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml?rev=1346255&r1=1346254&r2=1346255&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml Tue Jun  5 06:37:06 2012
@@ -28,7 +28,7 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/WorkFlowSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/>