svn commit: r1602807 - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ specialpurpose/birt/data/helpdata/ specialpurpose/birt/src/org/ofbiz/birt/ specialpurpose/birt/src/org/ofbiz/birt/container/ specialpurpose/birt/webapp/birt/WEB-INF/

Author: jleroux
Date: Mon Jun 16 06:41:36 2014
New Revision: 1602807

URL: http://svn.apache.org/r1602807
Log:
Keeps in sync with OFBiz trunk HEAD

Modified:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/   (props changed)
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/data/helpdata/HELP_BIRT.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtWorker.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1601550-1602806
  Merged /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23:r1601552-1602806

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/data/helpdata/HELP_BIRT.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/data/helpdata/HELP_BIRT.xml?rev=1602807&r1=1602806&r2=1602807&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/data/helpdata/HELP_BIRT.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/data/helpdata/HELP_BIRT.xml Mon Jun 16 06:41:36 2014
@@ -82,5 +82,8 @@ under the License.
         <para>application/vnd.oasis.opendocument.text</para>
         <para>application/vnd.oasis.opendocument.spreadsheet</para>
         <para>application/vnd.oasis.opendocument.presentation</para>
+        <para>application/vnd.openxmlformats-officedocument.wordprocessingml.document</para>
+        <para>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</para>
+        <para>application/vnd.openxmlformats-officedocument.presentationml.presentation</para>
     </section>
 </section>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtWorker.java?rev=1602807&r1=1602806&r2=1602807&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtWorker.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtWorker.java Mon Jun 16 06:41:36 2014
@@ -124,6 +124,12 @@ public class BirtWorker {
             options.setOutputFormat("ods");
         } else if ("application/vnd.oasis.opendocument.presentation".equalsIgnoreCase(contentType)) { // Open Document Presentation
             options.setOutputFormat("odp");
+        } else if ("application/vnd.openxmlformats-officedocument.wordprocessingml.document".equalsIgnoreCase(contentType)) { // MS Word 2007
+            options.setOutputFormat("docx");
+        } else if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equalsIgnoreCase(contentType)) { // MS Excel 2007
+            options.setOutputFormat("xlsx");
+        } else if ("application/vnd.openxmlformats-officedocument.presentationml.presentation".equalsIgnoreCase(contentType)) { // MS Word 2007
+            options.setOutputFormat("pptx");
         } else {
             throw new GeneralException("Unknown content type : " + contentType);
         }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1602807&r1=1602806&r2=1602807&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java Mon Jun 16 06:41:36 2014
@@ -41,6 +41,7 @@ public class BirtContainer implements Co
 
     private String name;
 
+    @Override
     public void init(String[] args, String name, String configFile) throws ContainerException {
         this.name = name;
         this.configFile = configFile;
@@ -49,6 +50,7 @@ public class BirtContainer implements Co
     /**
      * start container
      */
+    @Override
     public boolean start() throws ContainerException {
         Debug.logInfo("Start BIRT container", module);
 
@@ -66,7 +68,7 @@ public class BirtContainer implements Co
         EngineConfig config = new EngineConfig();
         String ofbizHome = System.getProperty("ofbiz.home");
         config.setTempDir(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "tempfiles");
-        config.setLogConfig(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "logs", Level.ALL);
+        config.setLogConfig(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "logs" + File.separatorChar + "birt", Level.ALL);
 
         // set system properties
         System.setProperty(IBirtConstants.SYS_PROP_WORKING_PATH, config.getTempDir());
@@ -104,9 +106,11 @@ public class BirtContainer implements Co
         return false;
     }
 
+    @Override
     public void stop() throws ContainerException {
     }
 
+    @Override
     public String getName() {
         return name;
     }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml?rev=1602807&r1=1602806&r2=1602807&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml Mon Jun 16 06:41:36 2014
@@ -105,6 +105,9 @@ under the License.
         application/vnd.oasis.opendocument.text
         application/vnd.oasis.opendocument.spreadsheet
         application/vnd.oasis.opendocument.presentation
+        application/vnd.openxmlformats-officedocument.wordprocessingml.document
+        application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+        application/vnd.openxmlformats-officedocument.presentationml.presentation
      -->
     <view-map name="ViewHandler" type="birt" page="component://birt/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
     <view-map name="chartViewHandler" type="birt" page="component://birt/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/>