You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/12/02 07:38:17 UTC
svn commit: r886060 - in /ofbiz/branches/addbirt/framework/birt: config/
data/helpdata/ webapp/birt/ webapp/birt/WEB-INF/ webapp/birt/birt/
webapp/birt/webcontent/ widget/
Author: hansbak
Date: Wed Dec 2 06:38:17 2009
New Revision: 886060
URL: http://svn.apache.org/viewvc?rev=886060&view=rev
Log:
remove viewer screen, menu, ftl and remove viewer content from help file and delete all js, jsp, css, image files and viewer.properties files. This to meet the license concerns of Scott reported in the mailing list
Removed:
ofbiz/branches/addbirt/framework/birt/webapp/birt/CancelTask.jsp
ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/viewer.properties
ofbiz/branches/addbirt/framework/birt/webapp/birt/birt/viewer.ftl
ofbiz/branches/addbirt/framework/birt/webapp/birt/webcontent/
Modified:
ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml
ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml
ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml
ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml
ofbiz/branches/addbirt/framework/birt/widget/Menus.xml
Modified: ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml Wed Dec 2 06:38:17 2009
@@ -35,9 +35,6 @@
<value xml:lang="en">Framework Eclipse BIRT</value>
<value xml:lang="th">Framework Eclipse BIRT</value>
</property>
- <property key="BirtViewer">
- <value xml:lang="en">HTML Paged</value>
- </property>
<property key="BirtReport">
<value xml:lang="en">HTML</value>
</property>
Modified: ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml Wed Dec 2 06:38:17 2009
@@ -33,20 +33,16 @@
This is a short document to help you get started using BIRT to make a report.
</para>
<section>
- <title>1. Viewer tab</title>
- <para>When you click on the Viewer tab. It will show the report in the viewer where the report can be paged.</para>
+ <title>1. HTML tab</title>
+ <para>When you click on this tab. It will show the complete report in an iframe.</para>
</section>
<section>
- <title>2. Report tab</title>
- <para>When you click on the Report tab. It will show the complete report in an iframe.</para>
+ <title>2. PDF tab</title>
+ <para>When you click on this tab. It will render the report in a pdf format</para>
</section>
<section>
- <title>3. Mail tab</title>
- <para>When you click on the Mail tab. It will show a form that can send the report per email.</para>
- </section>
- <section>
- <title>4. View Handler tab</title>
- <para>When you click on the View Handler tab. It will render the report in a pdf format</para>
+ <title>3. Send any format through Mail tab</title>
+ <para>When you click on this tab. It will show a form that can send the report per email.</para>
</section>
<section>
<title>Examine the Example Report</title>
@@ -66,8 +62,8 @@
<section>
<title>Important tag's attribute in ftl.</title>
<para>
- The BIRT Viewer uses some servlets and resource files such as image, js, css for rendering the report and viewer.
- When you use the viewer tag or report tag in a ftl file you must add a specific "baseURL" attribute to the birt webapp for these resources like baseURL="/birt".
+ The BIRT uses some servlets for rendering the report.
+ When you use the report tag in a ftl file you must add a specific "baseURL" attribute to the birt webapp for these resources like baseURL="/birt".
</para>
</section>
<section>
Modified: ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml Wed Dec 2 06:38:17 2009
@@ -55,10 +55,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
</request-map>
- <request-map uri="Viewer">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="Viewer"/>
- </request-map>
<request-map uri="Report">
<security https="true" auth="true"/>
<response name="success" type="view" value="Report"/>
@@ -70,8 +66,8 @@
<request-map uri="sendBirtMail">
<security https="true" auth="true"/>
<event type="service" invoke="sendBirtMail"/>
- <response name="success" type="view" value="BirtMail"/>
- <response name="error" type="view" value="BirtMail"/>
+ <response name="success" type="view" value="Mail"/>
+ <response name="error" type="view" value="Mail"/>
</request-map>
<request-map uri="ViewHandler">
<security https="true" auth="true"/>
Modified: ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml Wed Dec 2 06:38:17 2009
@@ -232,10 +232,12 @@
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Viewer Servlet, Supports SOAP -->
+ <!--
<servlet>
<servlet-name>ViewerServlet</servlet-name>
<servlet-class>org.ofbiz.birt.report.servlet.BirtViewerServlet</servlet-class>
</servlet>
+ -->
<!-- Engine Servlet -->
<servlet>
<servlet-name>EngineServlet</servlet-name>
@@ -243,6 +245,7 @@
</servlet>
<servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
+ <!--
<servlet-mapping>
<servlet-name>ViewerServlet</servlet-name>
<url-pattern>/frameset</url-pattern>
@@ -252,6 +255,7 @@
<servlet-name>ViewerServlet</servlet-name>
<url-pattern>/run</url-pattern>
</servlet-mapping>
+ -->
<servlet-mapping>
<servlet-name>EngineServlet</servlet-name>
Modified: ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml Wed Dec 2 06:38:17 2009
@@ -23,31 +23,6 @@
</section>
</screen>
- <screen name="Viewer">
- <section>
- <actions>
- <set field="tabButtonItem" value="Viewer"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="Using viewer tag">
- <platform-specific>
- <html>
- <html-template location="component://birt/webapp/birt/birt/viewer.ftl"/>
- </html>
- </platform-specific>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="Report">
<section>
<actions>
Modified: ofbiz/branches/addbirt/framework/birt/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/widget/Menus.xml?rev=886060&r1=886059&r2=886060&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/widget/Menus.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/widget/Menus.xml Wed Dec 2 06:38:17 2009
@@ -24,9 +24,8 @@
</menu>
<menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="Viewer" title="${uiLabelMap.BirtViewer}"><link target="Viewer"/></menu-item>
<menu-item name="Report" title="${uiLabelMap.BirtReport}"><link target="Report"/></menu-item>
- <menu-item name="Mail" title="${uiLabelMap.BirtMail}"><link target="Mail"/></menu-item>
<menu-item name="Export" title="${uiLabelMap.BirtViewHandler}"><link target="ViewHandler"/></menu-item>
+ <menu-item name="Mail" title="${uiLabelMap.BirtMail}"><link target="Mail"/></menu-item>
</menu>
</menus>
Re: svn commit: r886060 - in /ofbiz/branches/addbirt/framework/birt:
config/ data/helpdata/ webapp/birt/ webapp/birt/WEB-INF/ webapp/birt/birt/
webapp/birt/webcontent/ widget/
Posted by Adam Heath <do...@brainfood.com>.
Tim Ruppert wrote:
> I'd still ask legal on this topic, but it could make sense.
And if it is allowed, then it shows that legal is stupid and broken.
Either both ways are allowed, or neither.
Re: svn commit: r886060 - in /ofbiz/branches/addbirt/framework/birt: config/ data/helpdata/ webapp/birt/ webapp/birt/WEB-INF/ webapp/birt/birt/ webapp/birt/webcontent/ widget/
Posted by Tim Ruppert <ti...@hotwaxmedia.com>.
I'd still ask legal on this topic, but it could make sense.
Cheers,
Ruppert
On Dec 1, 2009, at 11:44 PM, Adam Heath wrote:
> hansbak@apache.org wrote:
>> Author: hansbak
>> Date: Wed Dec 2 06:38:17 2009
>> New Revision: 886060
>>
>> URL: http://svn.apache.org/viewvc?rev=886060&view=rev
>> Log:
>> remove viewer screen, menu, ftl and remove viewer content from help
>> file and delete all js, jsp, css, image files and viewer.properties
>> files. This to meet the license concerns of Scott reported in the
>> mailing list
>>
>> Removed:
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/CancelTask.jsp
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/
>> viewer.properties
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/birt/viewer.ftl
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/webcontent/
>> Modified:
>> ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
>> ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/
>> controller.xml
>> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml
>> ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml
>> ofbiz/branches/addbirt/framework/birt/widget/Menus.xml
>
> You're gonna love this, but there might be a better way.
>
> The question was wether the 'source' files, the ftl and jsp files that
> came from BIRT were allowed to be included in an apache project. EPL
> *compiled* files can, but not source files.
>
> So, take all their 'source' files, move them into a .war, then make
> ofbiz accept wars.
>
Re: svn commit: r886060 - in /ofbiz/branches/addbirt/framework/birt:
config/ data/helpdata/ webapp/birt/ webapp/birt/WEB-INF/ webapp/birt/birt/
webapp/birt/webcontent/ widget/
Posted by Adam Heath <do...@brainfood.com>.
hansbak@apache.org wrote:
> Author: hansbak
> Date: Wed Dec 2 06:38:17 2009
> New Revision: 886060
>
> URL: http://svn.apache.org/viewvc?rev=886060&view=rev
> Log:
> remove viewer screen, menu, ftl and remove viewer content from help file and delete all js, jsp, css, image files and viewer.properties files. This to meet the license concerns of Scott reported in the mailing list
>
> Removed:
> ofbiz/branches/addbirt/framework/birt/webapp/birt/CancelTask.jsp
> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/viewer.properties
> ofbiz/branches/addbirt/framework/birt/webapp/birt/birt/viewer.ftl
> ofbiz/branches/addbirt/framework/birt/webapp/birt/webcontent/
> Modified:
> ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
> ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml
> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml
> ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml
> ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml
> ofbiz/branches/addbirt/framework/birt/widget/Menus.xml
You're gonna love this, but there might be a better way.
The question was wether the 'source' files, the ftl and jsp files that
came from BIRT were allowed to be included in an apache project. EPL
*compiled* files can, but not source files.
So, take all their 'source' files, move them into a .war, then make
ofbiz accept wars.