svn commit: r1820975 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ birt/data/example/ birt/ofbiz-component.xml

Author: jleroux
Date: Fri Jan 12 12:24:01 2018
New Revision: 1820975

URL: http://svn.apache.org/viewvc?rev=1820975&view=rev
Log:
"Applied fix from plugins for revision: 1820973 "
------------------------------------------------------------------------
r1820973 | jleroux | 2018-01-12 13:22:29 +0100 (ven., 12 janv. 2018) | 16 lines

Fixed: Birt plugin depends on example plugin
(OFBIZ-9383)

The BIRT demo data for flexible reports depends on the Example entity from the
Example plugin.

We should either provide BIRT's own example data with example reports
OR
setup a gradle dependency on the example plugin so that everything is in place.

jleroux: this simply duplicates example data in birt component. There are
cases where duplication is the simplest solution even at the cost of possible
divergence in the future (not a problem for the birt component, so it's OK)


Thanks: Michael Brohl for report and Taher for discussion
------------------------------------------------------------------------


Added:
    ofbiz/ofbiz-plugins/branches/release17.12/birt/data/example/
      - copied from r1820973, ofbiz/ofbiz-plugins/trunk/birt/data/example/
Modified:
    ofbiz/ofbiz-plugins/branches/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/birt/ofbiz-component.xml

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 12 12:24:01 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820973

Modified: ofbiz/ofbiz-plugins/branches/release17.12/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/birt/ofbiz-component.xml?rev=1820975&r1=1820974&r2=1820975&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/birt/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/birt/ofbiz-component.xml Fri Jan 12 12:24:01 2018
@@ -31,6 +31,14 @@ under the License.
     <entity-resource type="data" reader-name="demo" loader="main" location="data/BirtSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/BirtMasterData.xml"/>
 
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleTypeData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortletData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortalSeedData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleHelpData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleDemoData.xml"/>
+
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/ServiceReportsView.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>