1. fix framework for using jsp tag in freemarker.

2. change order building birt component to after common component in framework/build.xml file 3. specific birt container before beanshell container in framework/base/config/ofbiz-containers.xml file 4. specific loading birt component after bi component in framework/component-load.xml 5. list all birt's jar files that have Eclipse Public License - v 1.0 in LICENSE file 6. change example report's path in mail form's tooltip. 7. delete four duplicated jar files. - framework/birt/lib/axis.jar - framework/birt/lib/commons-discovery-0.2.jar - framework/birt/lib/axis-ant.jar - framework/birt/lib/commons-cli-1.0.jar git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/addbirt@833294 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 6, 2009 · e4b19cc · e4b19cc
1 parent 4906096
commit e4b19cc
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 7 deletions.
diff --git a/framework/birt/lib/axis-ant.jar b/framework/birt/lib/axis-ant.jar
diff --git a/framework/birt/lib/axis.jar b/framework/birt/lib/axis.jar
diff --git a/framework/birt/lib/commons-cli-1.0.jar b/framework/birt/lib/commons-cli-1.0.jar
diff --git a/framework/birt/lib/commons-discovery-0.2.jar b/framework/birt/lib/commons-discovery-0.2.jar
diff --git a/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java b/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java
@@ -42,7 +42,6 @@ public BirtViewerAttributeBean(HttpServletRequest arg0) {
      * @param request
      * @throws Exception
      */
-    @Override
     protected void __init( HttpServletRequest request ) throws Exception
     {
         // If GetImage operate, return directly.

diff --git a/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java b/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java
@@ -15,7 +15,6 @@ public OFBizBirtContext(HttpServletRequest request,
         // TODO Auto-generated constructor stub
     }
 
-    @Override
     protected void __init() {
         // TODO Auto-generated method stub
         this.bean = (ViewerAttributeBean) request

diff --git a/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java b/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
@@ -45,7 +45,6 @@ public OFBizBirtViewerReportService(ServletContext servletContext) {
         // TODO Auto-generated constructor stub
     }
 
-    @Override
     public String runReport(IViewerReportDesignHandle design,
             String outputDocName, InputOptions runOptions, Map parameters,
             Map displayTexts, List<Exception> errorList) throws ReportServiceException {

diff --git a/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java b/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
@@ -23,7 +23,6 @@ public class BirtViewerServlet extends BirtSoapMessageDispatcherServlet {
 
     public final static String module = BirtViewerServlet.class.getName();
 
-    @Override
     protected void __init(ServletConfig config) {
         // TODO Auto-generated method stub
         BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config

diff --git a/framework/birt/widget/BirtForms.xml b/framework/birt/widget/BirtForms.xml
@@ -25,7 +25,7 @@ under the License.
         <field name="sendFrom"><text/></field>
         <field name="sendTo"><text/></field>
         <field name="subject"><text/></field>
-        <field name="birtReportLocation" tooltip="Example is component://webtools/webapp/birt/report/product.rptdesign"><text/></field>
+        <field name="birtReportLocation" tooltip="Example is component://birt/webapp/birt/report/product.rptdesign"><text/></field>
         <field name="birtContentType">
             <drop-down>
                 <option key="text/html" description="text/html"/>

diff --git a/framework/build.xml b/framework/build.xml
@@ -29,9 +29,9 @@ under the License.
                webslinger/build.xml,
                bi/build.xml,datafile/build.xml,minilang/build.xml,
                webapp/build.xml,guiapp/build.xml,widget/build.xml,
-               common/build.xml,
+               common/build.xml,birt/build.xml,
                testtools/build.xml,
-               appserver/build.xml,webtools/build.xml,example/build.xml,birt/build.xml"/>
+               appserver/build.xml,webtools/build.xml,example/build.xml"/>
 
     <filelist id="test-builds" dir="." files="base/build.xml,entity/build.xml"/>