Author: adrianc Date: Thu Dec 16 16:45:47 2010 New Revision: 1050053 URL: http://svn.apache.org/viewvc?rev=1050053&view=rev Log: Moved some security related demo data from the applications/securityext folder to the framework/security folder. This change accommodates logging in as admin in a framework-only demo installation.
Added: ofbiz/trunk/framework/security/data/PasswordSecurityData.xml (with props) ofbiz/trunk/framework/security/data/SecurityDemoData.xml (with props) Removed: ofbiz/trunk/applications/securityext/data/PasswordSecurityData.xml Modified: ofbiz/trunk/applications/securityext/data/UserDemoData.xml ofbiz/trunk/applications/securityext/ofbiz-component.xml ofbiz/trunk/framework/security/ofbiz-component.xml Modified: ofbiz/trunk/applications/securityext/data/UserDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/data/UserDemoData.xml?rev=1050053&r1=1050052&r2=1050053&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/data/UserDemoData.xml (original) +++ ofbiz/trunk/applications/securityext/data/UserDemoData.xml Thu Dec 16 16:45:47 2010 @@ -79,11 +79,4 @@ under the License. <UserLogin userLoginId="ltdadmin1" partyId="ltdadmin1"/> <UserLogin userLoginId="bizadmin" partyId="bizadmin"/> - <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="admin" fromDate="2001-01-01 12:00:00.0"/> - <UserLoginSecurityGroup groupId="FLEXADMIN" userLoginId="flexadmin" fromDate="2001-01-01 12:00:00.0"/> - <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="demoadmin" fromDate="2001-01-01 12:00:00.0"/> - <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin" fromDate="2001-01-01 12:00:00.0"/> - <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin1" fromDate="2001-01-01 12:00:00.0"/> - <UserLoginSecurityGroup groupId="BIZADMIN" userLoginId="bizadmin" fromDate="2001-01-01 12:00:00.0"/> - </entity-engine-xml> Modified: ofbiz/trunk/applications/securityext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/ofbiz-component.xml?rev=1050053&r1=1050052&r2=1050053&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/securityext/ofbiz-component.xml Thu Dec 16 16:45:47 2010 @@ -25,8 +25,6 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/UserDemoData.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"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <test-suite loader="main" location="testdef/securitytests.xml"/> </ofbiz-component> Added: ofbiz/trunk/framework/security/data/PasswordSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml?rev=1050053&view=auto ============================================================================== --- ofbiz/trunk/framework/security/data/PasswordSecurityData.xml (added) +++ ofbiz/trunk/framework/security/data/PasswordSecurityData.xml Thu Dec 16 16:45:47 2010 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<entity-engine-xml> + <!-- from the securityext component: SecurityExtData.xml --> + <UserLogin userLoginId="admin" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> + <UserLogin userLoginId="demoadmin" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> + <UserLogin userLoginId="ltdadmin" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> + <UserLogin userLoginId="ltdadmin1" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> + <UserLogin userLoginId="bizadmin" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> +</entity-engine-xml> Propchange: ofbiz/trunk/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/framework/security/data/SecurityDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/data/SecurityDemoData.xml?rev=1050053&view=auto ============================================================================== --- ofbiz/trunk/framework/security/data/SecurityDemoData.xml (added) +++ ofbiz/trunk/framework/security/data/SecurityDemoData.xml Thu Dec 16 16:45:47 2010 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<entity-engine-xml> + <!-- OFBiz security demo data --> + + <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="admin" fromDate="2001-01-01 12:00:00.0"/> + <UserLoginSecurityGroup groupId="FLEXADMIN" userLoginId="flexadmin" fromDate="2001-01-01 12:00:00.0"/> + <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="demoadmin" fromDate="2001-01-01 12:00:00.0"/> + <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin" fromDate="2001-01-01 12:00:00.0"/> + <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin1" fromDate="2001-01-01 12:00:00.0"/> + <UserLoginSecurityGroup groupId="BIZADMIN" userLoginId="bizadmin" fromDate="2001-01-01 12:00:00.0"/> + +</entity-engine-xml> Propchange: ofbiz/trunk/framework/security/data/SecurityDemoData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/security/data/SecurityDemoData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/security/data/SecurityDemoData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/framework/security/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/ofbiz-component.xml?rev=1050053&r1=1050052&r2=1050053&view=diff ============================================================================== --- ofbiz/trunk/framework/security/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/security/ofbiz-component.xml Thu Dec 16 16:45:47 2010 @@ -27,4 +27,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/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"/> </ofbiz-component>