Author: jleroux
Date: Sat Oct 20 14:46:49 2012
New Revision: 1400463
URL: http://svn.apache.org/viewvc?rev=1400463&view=rev
Log:
A patch from Leon for "correct BIRT_VIEWER_SCRIPTLIB_DIR configuration"
https://issues.apache.org/jira/browse/OFBIZ-5053
Birt has been move to specialpurpose but BIRT_VIEWER_SCRIPTLIB_DIR in web.xml
is still configured to framework.
jleroux: while checking I found also an error in birt/documents/Birt.xml and
while at it I also commit a tiny part of OFBIZ-4941 in birt/ofbiz-component.xml
because it breaks the help.
Modified:
ofbiz/trunk/specialpurpose/birt/documents/Birt.xml
ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
Modified: ofbiz/trunk/specialpurpose/birt/documents/Birt.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/documents/Birt.xml?rev=1400463&r1=1400462&r2=1400463&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/documents/Birt.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/documents/Birt.xml Sat Oct 20 14:46:49 2012
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
+<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../applications/content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook";>
<title>BIRT report generator.</title>
+ <para> An example report sales can be found in the example component.
</para>
<para>
- An example report sales can be found in the example component.
+ <xi:include
href="../../../specialpurpose/birt/data/helpdata/HELP_BIRT.xml"/>
</para>
- <para>
- <xi:include href="../../../framework/birt/data/helpdata/HELP_BIRT.xml"
/>
- </para>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml?rev=1400463&r1=1400462&r2=1400463&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml Sat Oct 20 14:46:49 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main"
location="data/BirtHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/OrderPortletData.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
-
+
+ <!-- use when reports need to be injected into applications Note: this will
break context help for those applications.
<webapp name="accounting"
title="Accounting"
server="default-server"
@@ -49,7 +50,7 @@ under the License.
location="webapp/ordermgr"
base-permission="OFBTOOLS,ORDERMGR"
mount-point="/ordermgr"/>
- <!-- example -->
+ -->
<webapp name="birt"
title="BIRT"
server="default-server"
Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1400463&r1=1400462&r2=1400463&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Sat Oct 20
14:46:49 2012
@@ -114,7 +114,7 @@ under the License.
-->
<context-param>
<param-name>BIRT_VIEWER_SCRIPTLIB_DIR</param-name>
- <param-value>${ofbiz.home}/framework/birt/lib/scriptlib</param-value>
+
<param-value>${ofbiz.home}/specialpurpose/birt/lib/scriptlib</param-value>
</context-param>
<!-- Resource location directory. Defaults to ${birt home} -->
