You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2010/12/16 17:45:48 UTC
svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/
applications/securityext/data/ framework/security/ framework/security/data/
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>
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/ applications/securityext/data/ framework/security/ framework/security/data/
Posted by Jacques Le Roux <ja...@les7arts.com>.
From: "Adrian Crum" <ad...@hlmksw.com>
> On 12/16/2010 10:33 AM, Jacques Le Roux wrote:
>> From: "Adrian Crum" <ad...@hlmksw.com>
>>> On 12/16/2010 10:00 AM, Adam Heath wrote:
>>>> On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
>>>>> 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
>>>>
>>>> Minor nit-pick. It would have been better to do an svn mv of
>>>> PasswordSecurityData.xml. Git doesn't care about files changing their
>>>> name/location, but svn tries to track such rename metadata.
>>>
>>> I wanted to do that, but my SVN client didn't understand it. I'll try
>>> to get it to work later, then do a revert and move.
>>
>> Adrian, if ever you use Toirtoise, try right-click and drag and drop.
>> The popup menu will have a 'SVN move versioned files here' option.
>
> That's what I use. Thanks for the tip!
BTW, IIRW you can do the same thing inside Eclipse with Subclipse. It's even easier, and not platform dependent.
Jacques
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/
applications/securityext/data/ framework/security/ framework/security/data/
Posted by Adrian Crum <ad...@hlmksw.com>.
On 12/16/2010 10:33 AM, Jacques Le Roux wrote:
> From: "Adrian Crum" <ad...@hlmksw.com>
>> On 12/16/2010 10:00 AM, Adam Heath wrote:
>>> On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
>>>> 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
>>>
>>> Minor nit-pick. It would have been better to do an svn mv of
>>> PasswordSecurityData.xml. Git doesn't care about files changing their
>>> name/location, but svn tries to track such rename metadata.
>>
>> I wanted to do that, but my SVN client didn't understand it. I'll try
>> to get it to work later, then do a revert and move.
>
> Adrian, if ever you use Toirtoise, try right-click and drag and drop.
> The popup menu will have a 'SVN move versioned files here' option.
That's what I use. Thanks for the tip!
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/ applications/securityext/data/ framework/security/ framework/security/data/
Posted by Jacques Le Roux <ja...@les7arts.com>.
From: "Adrian Crum" <ad...@hlmksw.com>
> On 12/16/2010 10:00 AM, Adam Heath wrote:
>> On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
>>> 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
>>
>> Minor nit-pick. It would have been better to do an svn mv of
>> PasswordSecurityData.xml. Git doesn't care about files changing their
>> name/location, but svn tries to track such rename metadata.
>
> I wanted to do that, but my SVN client didn't understand it. I'll try to get it to work later, then do a revert and move.
Adrian, if ever you use Toirtoise, try right-click and drag and drop. The popup menu will have a 'SVN move versioned files here'
option.
Jacques
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/
applications/securityext/data/ framework/security/ framework/security/data/
Posted by Adam Heath <do...@brainfood.com>.
On 12/16/2010 12:10 PM, Adrian Crum wrote:
> On 12/16/2010 10:00 AM, Adam Heath wrote:
>> On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
>>> 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
>>
>> Minor nit-pick. It would have been better to do an svn mv of
>> PasswordSecurityData.xml. Git doesn't care about files changing their
>> name/location, but svn tries to track such rename metadata.
>
> I wanted to do that, but my SVN client didn't understand it. I'll try to
> get it to work later, then do a revert and move.
Please don't do a revert, just to fix this. It's not a major thing,
and a revert just adds more noise into the history.
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/
applications/securityext/data/ framework/security/ framework/security/data/
Posted by Adrian Crum <ad...@hlmksw.com>.
On 12/16/2010 10:00 AM, Adam Heath wrote:
> On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
>> 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
>
> Minor nit-pick. It would have been better to do an svn mv of
> PasswordSecurityData.xml. Git doesn't care about files changing their
> name/location, but svn tries to track such rename metadata.
I wanted to do that, but my SVN client didn't understand it. I'll try to
get it to work later, then do a revert and move.
Re: svn commit: r1050053 - in /ofbiz/trunk: applications/securityext/
applications/securityext/data/ framework/security/ framework/security/data/
Posted by Adam Heath <do...@brainfood.com>.
On 12/16/2010 10:45 AM, adrianc@apache.org wrote:
> 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
Minor nit-pick. It would have been better to do an svn mv of
PasswordSecurityData.xml. Git doesn't care about files changing their
name/location, but svn tries to track such rename metadata.