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 2009/05/19 16:40:48 UTC
svn commit: r776334 - in /ofbiz/branches/release09.04: ./
specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Author: adrianc
Date: Tue May 19 14:40:48 2009
New Revision: 776334
URL: http://svn.apache.org/viewvc?rev=776334&view=rev
Log:
Applied fix from trunk for revision: 775667.
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 19 14:40:48 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,776227
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227
Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=776334&r1=776333&r2=776334&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Tue May 19 14:40:48 2009
@@ -158,5 +158,20 @@
<WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
+ <!-- Recurring calendar event demo - set up a staff meeting on the first Monday of each month -->
+ <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
+ <TemporalExpression tempExprId="10AM" tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
+ <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="1ST_MONDAY_IN_MONTH"/>
+ <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
+ <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
+ <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
+ <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED" availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
+ <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
+ <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
+ <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
+
+ <!-- Publish the staff meeting calendar event -->
+ <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
+ <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
</entity-engine-xml>
Re: svn commit: r776334 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Posted by Adrian Crum <ad...@hlmksw.com>.
Like I said, the batch file doesn't work for me.
-Adrian
Jacques Le Roux wrote:
> I also use TortoiseSVN (and I like it). When backporting, simply launch
> the bath file in a dos command line and put the revision number to
> backport when asked.
> Most of the time you don't have to worry about anything else. Sometimes,
> depending of your local changes, you may have to resolve a small
> conflict manually. I never got a real problem with that.
>
> The plus is to have the comment also backported in log...
>
> Jacques
>
> From: "Adrian Crum" <ad...@hlmksw.com>
>> I use TortoiseSVN - so that batch file doesn't work for me.
>>
>> -Adrian
>>
>> Jacques Le Roux wrote:
>>> Adrian,
>>>
>>> As much as possible use one of the mergefromtrunk scripts : they put
>>> more information.
>>>
>>> Thanks
>>>
>>> Jacques
>>>
>>> From: <ad...@apache.org>
>>>> Author: adrianc
>>>> Date: Tue May 19 14:40:48 2009
>>>> New Revision: 776334
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=776334&view=rev
>>>> Log:
>>>> Applied fix from trunk for revision: 775667.
>>>>
>>>> Modified:
>>>> ofbiz/branches/release09.04/ (props changed)
>>>>
>>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>>>
>>>>
>>>> Propchange: ofbiz/branches/release09.04/
>>>> ------------------------------------------------------------------------------
>>>>
>>>> --- svn:mergeinfo (original)
>>>> +++ svn:mergeinfo Tue May 19 14:40:48 2009
>>>> @@ -1 +1 @@
>>>> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,776227
>>>>
>>>> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227
>>>>
>>>>
>>>> Modified:
>>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>>>
>>>> URL:
>>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=776334&r1=776333&r2=776334&view=diff
>>>>
>>>> ==============================================================================
>>>>
>>>> ---
>>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>>> (original)
>>>> +++
>>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>>> Tue May 19 14:40:48 2009
>>>> @@ -158,5 +158,20 @@
>>>> <WorkEffort workEffortId="9202" workEffortTypeId="TASK"
>>>> currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14
>>>> 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC"
>>>> workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0"
>>>> estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
>>>> <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000"
>>>> estimatedDuration="16.0"/>
>>>>
>>>> + <!-- Recurring calendar event demo - set up a staff meeting on
>>>> the first Monday of each month -->
>>>> + <TemporalExpression tempExprId="STAFF_MTG"
>>>> tempExprTypeId="INTERSECTION"/>
>>>> + <TemporalExpression tempExprId="10AM"
>>>> tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
>>>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG"
>>>> toTempExprId="1ST_MONDAY_IN_MONTH"/>
>>>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG"
>>>> toTempExprId="10AM"/>
>>>> + <FixedAsset fixedAssetId="DEMO_PROJECTOR"
>>>> fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
>>>> + <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING"
>>>> currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01
>>>> 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting"
>>>> description="Staff Meeting" tempExprId="STAFF_MTG"
>>>> estimatedStartDate="2008-01-01 00:00:00.0"
>>>> estimatedMilliSeconds="3600000"/>
>>>> + <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG"
>>>> fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED"
>>>> availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
>>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>>>> partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED"
>>>> roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY"
>>>> fromDate="2008-01-01 00:00:00.0"/>
>>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>>>> partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED"
>>>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY"
>>>> fromDate="2008-01-01 00:00:00.0"/>
>>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>>>> partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED"
>>>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY"
>>>> fromDate="2008-01-01 00:00:00.0"/>
>>>> +
>>>> + <!-- Publish the staff meeting calendar event -->
>>>> + <WorkEffort workEffortId="CALENDAR_PUB_DEMO"
>>>> workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED"
>>>> scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1"
>>>> workEffortName="iCalendar Publish Demonstration"/>
>>>> + <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO"
>>>> workEffortIdTo="STAFF_MTG"
>>>> workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01
>>>> 00:00:00.0"/>
>>>>
>>>> </entity-engine-xml>
>>>>
>>>>
>>>
>>>
>>>
>>
>
>
>
Re: svn commit: r776334 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
I also use TortoiseSVN (and I like it). When backporting, simply launch the bath file in a dos command line and put the revision
number to backport when asked.
Most of the time you don't have to worry about anything else. Sometimes, depending of your local changes, you may have to resolve a
small conflict manually. I never got a real problem with that.
The plus is to have the comment also backported in log...
Jacques
From: "Adrian Crum" <ad...@hlmksw.com>
>I use TortoiseSVN - so that batch file doesn't work for me.
>
> -Adrian
>
> Jacques Le Roux wrote:
>> Adrian,
>>
>> As much as possible use one of the mergefromtrunk scripts : they put more information.
>>
>> Thanks
>>
>> Jacques
>>
>> From: <ad...@apache.org>
>>> Author: adrianc
>>> Date: Tue May 19 14:40:48 2009
>>> New Revision: 776334
>>>
>>> URL: http://svn.apache.org/viewvc?rev=776334&view=rev
>>> Log:
>>> Applied fix from trunk for revision: 775667.
>>>
>>> Modified:
>>> ofbiz/branches/release09.04/ (props changed)
>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>>
>>> Propchange: ofbiz/branches/release09.04/
>>> ------------------------------------------------------------------------------
>>>
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue May 19 14:40:48 2009
>>> @@ -1 +1 @@
>>> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,776227
>>> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227
>>>
>>> Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=776334&r1=776333&r2=776334&view=diff
>>> ==============================================================================
>>> ---
>>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
>>> +++ ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Tue May 19 14:40:48 2009
>>> @@ -158,5 +158,20 @@
>>> <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14
>>> 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03
>>> 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
>>> <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
>>>
>>> + <!-- Recurring calendar event demo - set up a staff meeting on the first Monday of each month -->
>>> + <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
>>> + <TemporalExpression tempExprId="10AM" tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
>>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="1ST_MONDAY_IN_MONTH"/>
>>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
>>> + <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
>>> + <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE"
>>> lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting"
>>> tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
>>> + <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED"
>>> availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED"
>>> roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED"
>>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
>>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED"
>>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
>>> +
>>> + <!-- Publish the staff meeting calendar event -->
>>> + <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED"
>>> scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
>>> + <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG"
>>> workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
>>>
>>> </entity-engine-xml>
>>>
>>>
>>
>>
>>
>
Re: svn commit: r776334 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Posted by Adrian Crum <ad...@hlmksw.com>.
I use TortoiseSVN - so that batch file doesn't work for me.
-Adrian
Jacques Le Roux wrote:
> Adrian,
>
> As much as possible use one of the mergefromtrunk scripts : they put
> more information.
>
> Thanks
>
> Jacques
>
> From: <ad...@apache.org>
>> Author: adrianc
>> Date: Tue May 19 14:40:48 2009
>> New Revision: 776334
>>
>> URL: http://svn.apache.org/viewvc?rev=776334&view=rev
>> Log:
>> Applied fix from trunk for revision: 775667.
>>
>> Modified:
>> ofbiz/branches/release09.04/ (props changed)
>>
>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>
>>
>> Propchange: ofbiz/branches/release09.04/
>> ------------------------------------------------------------------------------
>>
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue May 19 14:40:48 2009
>> @@ -1 +1 @@
>> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,776227
>>
>> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227
>>
>>
>> Modified:
>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>>
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=776334&r1=776333&r2=776334&view=diff
>>
>> ==============================================================================
>>
>> ---
>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>> (original)
>> +++
>> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>> Tue May 19 14:40:48 2009
>> @@ -158,5 +158,20 @@
>> <WorkEffort workEffortId="9202" workEffortTypeId="TASK"
>> currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14
>> 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC"
>> workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0"
>> estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
>> <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000"
>> estimatedDuration="16.0"/>
>>
>> + <!-- Recurring calendar event demo - set up a staff meeting on
>> the first Monday of each month -->
>> + <TemporalExpression tempExprId="STAFF_MTG"
>> tempExprTypeId="INTERSECTION"/>
>> + <TemporalExpression tempExprId="10AM"
>> tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG"
>> toTempExprId="1ST_MONDAY_IN_MONTH"/>
>> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG"
>> toTempExprId="10AM"/>
>> + <FixedAsset fixedAssetId="DEMO_PROJECTOR"
>> fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
>> + <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING"
>> currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01
>> 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting"
>> description="Staff Meeting" tempExprId="STAFF_MTG"
>> estimatedStartDate="2008-01-01 00:00:00.0"
>> estimatedMilliSeconds="3600000"/>
>> + <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG"
>> fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED"
>> availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>> partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED"
>> roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY"
>> fromDate="2008-01-01 00:00:00.0"/>
>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>> partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED"
>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY"
>> fromDate="2008-01-01 00:00:00.0"/>
>> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG"
>> partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED"
>> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY"
>> fromDate="2008-01-01 00:00:00.0"/>
>> +
>> + <!-- Publish the staff meeting calendar event -->
>> + <WorkEffort workEffortId="CALENDAR_PUB_DEMO"
>> workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED"
>> scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1"
>> workEffortName="iCalendar Publish Demonstration"/>
>> + <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO"
>> workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY"
>> fromDate="2008-01-01 00:00:00.0"/>
>>
>> </entity-engine-xml>
>>
>>
>
>
>
Re: svn commit: r776334 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
Adrian,
As much as possible use one of the mergefromtrunk scripts : they put more information.
Thanks
Jacques
From: <ad...@apache.org>
> Author: adrianc
> Date: Tue May 19 14:40:48 2009
> New Revision: 776334
>
> URL: http://svn.apache.org/viewvc?rev=776334&view=rev
> Log:
> Applied fix from trunk for revision: 775667.
>
> Modified:
> ofbiz/branches/release09.04/ (props changed)
> ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
>
> Propchange: ofbiz/branches/release09.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue May 19 14:40:48 2009
> @@ -1 +1 @@
> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,776227
> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227
>
> Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=776334&r1=776333&r2=776334&view=diff
> ==============================================================================
> --- ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
> +++ ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Tue May 19 14:40:48 2009
> @@ -158,5 +158,20 @@
> <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14
> 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0"
> estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
> <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
>
> + <!-- Recurring calendar event demo - set up a staff meeting on the first Monday of each month -->
> + <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
> + <TemporalExpression tempExprId="10AM" tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="1ST_MONDAY_IN_MONTH"/>
> + <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
> + <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
> + <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01
> 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting" tempExprId="STAFF_MTG"
> estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
> + <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED"
> availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED"
> roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED"
> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
> + <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED"
> roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
> +
> + <!-- Publish the staff meeting calendar event -->
> + <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED"
> scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
> + <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY"
> fromDate="2008-01-01 00:00:00.0"/>
>
> </entity-engine-xml>
>
>