svn commit: r1579356 - in /ofbiz/trunk/specialpurpose/birt: src/org/ofbiz/birt/container/ src/org/ofbiz/birt/report/context/ src/org/ofbiz/birt/report/servlet/ webapp/birt/WEB-INF/

Author: jleroux
Date: Wed Mar 19 19:08:52 2014
New Revision: 1579356

URL: http://svn.apache.org/r1579356
Log:
A patch from Chatree Srichart for "BIRT Web Viewer Integration" https://issues.apache.org/jira/browse/OFBIZ-4952

Chatree Srichart:
I have created a patch to solve a viewer servlet problem and uncomment the viewer servlet in the birt webapp. To do this will allow a user to use BIRT Web Viewer to render a report by coping a webcontent directory from birt-runtime-x_x_x/WebViewerExample directory and paste into the birt webapp directory ($OFBIZ_HOME/specialpurpose/example/webapp/birt).

These are URLs to render example reports using BIRT Web Viewer.
http://localhost:8080/birt/frameset?__report=component://example/webapp/birt/report/example.rptdesign
http://localhost:8080/birt/frameset?__report=component://example/webapp/birt/report/chart.rptdesign

jleroux: a more detailled documentation is available at https://cwiki.apache.org/confluence/display/OFBIZ/Using+BIRT+with+OFBiz

Removed:
    ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java
    ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java
Modified:
    ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java
    ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java
    ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
    ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml

Modified: ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1579356&r1=1579355&r2=1579356&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java Wed Mar 19 19:08:52 2014
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import org.eclipse.birt.core.exception.BirtException;
 import org.eclipse.birt.core.framework.Platform;
+import org.eclipse.birt.report.IBirtConstants;
 import org.eclipse.birt.report.engine.api.EngineConfig;
 import org.eclipse.birt.report.engine.api.IReportEngine;
 import org.eclipse.birt.report.engine.api.IReportEngineFactory;
@@ -67,6 +68,9 @@ public class BirtContainer implements Co
         config.setTempDir(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "tempfiles");
         config.setLogConfig(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "logs", Level.ALL);
 
+        // set system properties
+        System.setProperty(IBirtConstants.SYS_PROP_WORKING_PATH, config.getTempDir());
+
         // startup platform
         try {
             Debug.logInfo("Startup BIRT platform", module);

Modified: ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java?rev=1579356&r1=1579355&r2=1579356&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Wed Mar 19 19:08:52 2014
@@ -24,12 +24,13 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.birt.core.exception.BirtException;
+import org.eclipse.birt.report.context.BirtContext;
 import org.eclipse.birt.report.context.IContext;
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
 import org.eclipse.birt.report.service.ReportEngineService;
+import org.eclipse.birt.report.utility.ParameterAccessor;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.report.context.OFBizBirtContext;
 
 @SuppressWarnings("serial")
 public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet {
@@ -44,6 +45,7 @@ public class BirtEngineServlet extends o
         Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext());
         BirtWorker.setWebContextObjects(appContext, request, response);
         
-        return new OFBizBirtContext( request, response );
+        return new BirtContext(new ViewerServletRequest(ParameterAccessor.getParameter(request, ParameterAccessor.PARAM_REPORT)
+                        , request), response);
     }
 }

Modified: ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java?rev=1579356&r1=1579355&r2=1579356&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Wed Mar 19 19:08:52 2014
@@ -24,13 +24,14 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.birt.core.exception.BirtException;
+import org.eclipse.birt.report.context.BirtContext;
 import org.eclipse.birt.report.context.IContext;
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
 import org.eclipse.birt.report.service.ReportEngineService;
 import org.eclipse.birt.report.servlet.ViewerServlet;
+import org.eclipse.birt.report.utility.ParameterAccessor;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.report.context.OFBizBirtContext;
 
 @SuppressWarnings("serial")
 public class BirtViewerServlet extends ViewerServlet {
@@ -45,6 +46,7 @@ public class BirtViewerServlet extends V
         Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext());
         BirtWorker.setWebContextObjects(appContext, request, response);
         
-        return new OFBizBirtContext( request, response );
+        return new BirtContext(new ViewerServletRequest(ParameterAccessor.getParameter(request, ParameterAccessor.PARAM_REPORT)
+                        , request), response);
     }
 }

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=1579356&r1=1579355&r2=1579356&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Wed Mar 19 19:08:52 2014
@@ -85,7 +85,7 @@ under the License.
     -->
     <context-param>
         <param-name>WORKING_FOLDER_ACCESS_ONLY</param-name>
-        <param-value>true</param-value>
+        <param-value>false</param-value>
     </context-param>
     
     <!--
@@ -227,12 +227,10 @@ under the License.
         <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>
@@ -240,7 +238,6 @@ under the License.
     </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>
@@ -250,7 +247,6 @@ under the License.
         <servlet-name>ViewerServlet</servlet-name>
         <url-pattern>/run</url-pattern>
     </servlet-mapping>
-    -->
     
     <servlet-mapping>
         <servlet-name>EngineServlet</servlet-name>