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

[hansbak-2]

Author: hansbak
Date: Mon Jun 18 04:36:20 2012
New Revision: 1351206

URL: http://svn.apache.org/viewvc?rev=1351206&view=rev
Log:
reverted recent security file changes revisions: 1350847,1350843,1350840,1348534,1347908,1347213,1346264, need more investigation

Added:
    ofbiz/trunk/framework/security/data/SecurityData.xml
      - copied unchanged from r1350839, ofbiz/trunk/framework/security/data/SecurityData.xml
    ofbiz/trunk/framework/service/data/ServiceSecurityData.xml
      - copied unchanged from r1350842, ofbiz/trunk/framework/service/data/ServiceSecurityData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
      - copied unchanged from r1346254, ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Removed:
    ofbiz/trunk/applications/product/data/FacilitySecurityData.xml
    ofbiz/trunk/framework/security/data/SecuritySeedData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalPageDemoData.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/data/ProductSecurityData.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml
    ofbiz/trunk/applications/workeffort/ofbiz-component.xml
    ofbiz/trunk/build.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/data/ServiceSeedData.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/webpos/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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/AccountingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/CommonExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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="security" loader="main" location="data/OfbizSetupSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/ContentSecurityData.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/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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/HumanResSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/ManufacturingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/MarketingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/OrderSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/PartySecurityData.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"/>
     <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/data/ProductSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductSecurityData.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductSecurityData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductSecurityData.xml Mon Jun 18 04:36:20 2012
@@ -77,6 +77,22 @@ under the License.
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="SHIPRATE_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="SHIPRATE_ADMIN"/>
 
+    <!-- Facility Manager security -->
+    <SecurityPermission description="View operations in the Facility Manager." permissionId="FACILITY_VIEW"/>
+    <SecurityPermission description="Create operations in the Facility Manager." permissionId="FACILITY_CREATE"/>
+    <SecurityPermission description="Update operations in the Facility Manager." permissionId="FACILITY_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Facility Manager." permissionId="FACILITY_DELETE"/>
+    <SecurityPermission description="ALL operations in the Facility Manager." permissionId="FACILITY_ADMIN"/>
+    <SecurityPermission description="Limited view operations in the Facility Manager." permissionId="FACILITY_ROLE_VIEW"/>
+    <SecurityPermission description="Limited update operations in the Facility Manager." permissionId="FACILITY_ROLE_UPDATE"/>
+    <SecurityGroupPermission groupId="FULLADMIN" permissionId="FACILITY_ADMIN"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_CREATE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_DELETE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_UPDATE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_VIEW"/>
+    <SecurityGroupPermission groupId="VIEWADMIN" permissionId="FACILITY_VIEW"/>
+    <SecurityGroupPermission groupId="BIZADMIN" permissionId="FACILITY_ADMIN"/>
+    
     <!-- Image Management security -->
     <SecurityGroup description="Image Management Admin." groupId="IMAGEADMIN"/>
     <SecurityPermission description="All operations in the Image Management." permissionId="IMAGE_MANAGEMENT_ADMIN"/>

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Mon Jun 18 04:36:20 2012
@@ -37,8 +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="security" loader="main" location="data/ProductSecurityData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/FacilitySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/WorkEffortSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon Jun 18 04:36:20 2012
@@ -474,7 +474,6 @@ under the License.
             <arg value="install"/>
             <arg value="readers=seed"/>
         </java>
-        <echo message="Please note that security data is not loaded with this action, so all components are not accessible, either load security data for a specific component or for all components with: ./ant load-readers -Ddata-readers=security"/>
     </target>
     <target name="load-extseed" depends="build"
             description="Load seed, seed-initial and ext data; meant for manual/generic testing, development, or going into production with a derived system based on stock OFBiz where the ext data basically replaces the demo data">
@@ -485,7 +484,6 @@ under the License.
             <arg value="install"/>
             <arg value="readers=seed,seed-initial,ext"/>
         </java>
-        <echo message="Please note that security data is not loaded with this action, so all components are not accessible, either load security data for a specific component or for all components with: ./ant load-readers -Ddata-readers=security"/>
     </target>
     <target name="load-exttest" depends="build"
             description="Load seed, seed-initial, ext and ext-test data; meant for automated testing with a derived system based on stock OFBiz">

Modified: ofbiz/trunk/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/bi/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/BiSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/common/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/CommonSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Mon Jun 18 04:36:20 2012
@@ -98,7 +98,6 @@ access. For a detailed description see t
 
     <!-- need to at least define a name for each component to use -->
     <!-- defining:
-        security     = OFBiz security group and security permissions. are required to show a component.
         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
         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
@@ -107,7 +106,6 @@ access. For a detailed description see t
         ext-test     = External Test Data (custom)
         ext-demo     = External Demo Data (custom)
     -->
-    <entity-data-reader name="security"/>
     <entity-data-reader name="tenant"/>
     <entity-data-reader name="seed"/>
     <entity-data-reader name="seed-initial"/>
@@ -155,7 +153,6 @@ access. For a detailed description see t
             use-fk-initially-deferred="false"
             join-style="ansi-no-parenthesis"
             alias-view-columns="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -185,7 +182,6 @@ access. For a detailed description see t
             use-indices-unique="false"
             alias-view-columns="false"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -236,7 +232,6 @@ access. For a detailed description see t
             alias-view-columns="false"
             use-order-by-nulls="true">
         <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index -->
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -263,7 +258,6 @@ access. For a detailed description see t
         use-indices-unique="false"
         alias-view-columns="false"
         use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -287,7 +281,6 @@ access. For a detailed description see t
             field-type-name="daffodil"
             check-on-start="true"
             add-missing-on-start="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -313,7 +306,6 @@ access. For a detailed description see t
             check-on-start="true"
             add-missing-on-start="true"
             use-pk-constraint-names="false">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -343,7 +335,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -375,7 +366,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -407,7 +397,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -439,7 +428,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <inline-jdbc
@@ -468,7 +456,6 @@ access. For a detailed description see t
             <!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later:
                 result-fetch-size="50"
             -->
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -507,7 +494,6 @@ access. For a detailed description see t
         result-fetch-size="50"
         use-binary-type-for-blob="true"
         use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -542,7 +528,6 @@ access. For a detailed description see t
             result-fetch-size="50"
             use-binary-type-for-blob="true"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -577,7 +562,6 @@ access. For a detailed description see t
             result-fetch-size="50"
             use-binary-type-for-blob="true"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -610,7 +594,6 @@ access. For a detailed description see t
             alias-view-columns="false"
             join-style="ansi"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -652,7 +635,6 @@ access. For a detailed description see t
             add-missing-on-start="true"
             use-fk-initially-deferred="false"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -677,7 +659,6 @@ access. For a detailed description see t
             fk-style="name_fk"
             use-fk-initially-deferred="false"
             join-style="ansi-no-parenthesis">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -706,7 +687,6 @@ access. For a detailed description see t
             add-missing-on-start="true"
             alias-view-columns="false"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -750,7 +730,6 @@ access. For a detailed description see t
             join-style="ansi"
             alias-view-columns="false"
             use-fk-initially-deferred="false">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -775,7 +754,6 @@ access. For a detailed description see t
             check-on-start="true"
             add-missing-on-start="true"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -804,7 +782,6 @@ access. For a detailed description see t
             join-style="ansi-no-parenthesis"
             alias-view-columns="false"
             always-use-constraint-keyword="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>

Modified: ofbiz/trunk/framework/entity/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entity/ofbiz-component.xml Mon Jun 18 04:36:20 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="demo" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/EntityExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/resources/templates/ofbiz-component.xml Mon Jun 18 04:36:20 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]"/><!-- 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="seed" loader="main" location="data/@[hidden email]"/>
     <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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/security/ofbiz-component.xml Mon Jun 18 04:36:20 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/SecuritySeedData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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/data/ServiceSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/data/ServiceSeedData.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/data/ServiceSeedData.xml (original)
+++ ofbiz/trunk/framework/service/data/ServiceSeedData.xml Mon Jun 18 04:36:20 2012
@@ -19,11 +19,6 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <!-- Remote Service security -->
-    <SecurityPermission description="Permission to invoke any service remotely." permissionId="SERVICE_INVOKE_ANY"/>
-    <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_INVOKE_ANY"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_INVOKE_ANY"/>
-    
     <!-- Temporal Expression seed data -->
 
     <!-- Pre-define all 60 minutes -->

Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Mon Jun 18 04:36:20 2012
@@ -31,6 +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="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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/webtools/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/WebtoolsSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/AssetMaintSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/EbaySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/EbayStoreSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/EcommerceSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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"/>

Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/ExampleSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/GoogleBaseSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/HhFacilitySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml Mon Jun 18 04:36:20 2012
@@ -24,8 +24,8 @@
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
-    <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="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="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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/OagisSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/PosSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/ProjectMgrSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/scrumSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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/webpos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml Mon Jun 18 04:36:20 2012
@@ -26,7 +26,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
 
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPosData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/WebPosSecurityData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/WebPosSecurityData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_cart.xml"/>

Modified: ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml?rev=1351206&r1=1351205&r2=1351206&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml Mon Jun 18 04:36:20 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="security" loader="main" location="data/WorkFlowSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" 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"/>