svn commit: r891180 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/ applications/order/webapp/ordermgr/WEB-INF/ applications/product/webapp/facility/WEB-INF/ framework/birt/src/org/ofbiz/birt/email/ framework/birt/src/org/ofbiz/bi...

[hansbak-2]

Author: hansbak
Date: Wed Dec 16 10:44:27 2009
New Revision: 891180

URL: http://svn.apache.org/viewvc?rev=891180&view=rev
Log:
Although we do not experience compile problems here, there were some problems as reported https://issues.apache.org/jira/browse/OFBIZ-3353. which should be fixed now, contribution by chattree

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
    ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
    ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java
    ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml
    ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/trunk/specialpurpose/component-load.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Dec 16 10:44:27 2009
@@ -24,7 +24,6 @@
     <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
     <description>Accounting Manager Module Site Configuration File</description>
     <owner>Copyright 2001-2009 The Apache Software Foundation</owner>
-    <handler name="birt" type="view" class="org.ofbiz.webapp.view.BirtViewHandler"/>
 
     <!-- Events to run on every request before security (chains exempt) -->
     <!--

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Dec 16 10:44:27 2009
@@ -30,7 +30,6 @@
     <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
     <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
     <handler name="jsonjava" type="request" class="org.ofbiz.webapp.event.JSONJavaEventHandler"/>
-    <handler name="birt" type="view" class="org.ofbiz.webapp.view.BirtViewHandler"/>
     <!-- Events to run on every request before security (chains exempt) -->
     <!--
     <preprocessor>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Dec 16 10:44:27 2009
@@ -27,7 +27,6 @@
 
     <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
     <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
-    <handler name="birt" type="view" class="org.ofbiz.webapp.view.BirtViewHandler"/>
 
 
     <!-- Events to run on every request before security (chains exempt) -->

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java Wed Dec 16 10:44:27 2009
@@ -48,7 +48,7 @@
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.widget.birt.BirtFactory;
+import org.ofbiz.birt.widget.BirtFactory;
 import org.ofbiz.widget.html.HtmlScreenRenderer;
 import org.ofbiz.widget.screen.ScreenRenderer;
 import org.xml.sax.SAXException;

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java Wed Dec 16 10:44:27 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-package org.ofbiz.webapp.view;
+package org.ofbiz.birt.webapp.view;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +41,9 @@
 import org.ofbiz.birt.BirtWorker;
 import org.ofbiz.birt.container.BirtContainer;
 import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.widget.birt.BirtFactory;
+import org.ofbiz.webapp.view.ViewHandler;
+import org.ofbiz.webapp.view.ViewHandlerException;
+import org.ofbiz.birt.widget.BirtFactory;
 import org.xml.sax.SAXException;
 
 public class BirtViewHandler implements ViewHandler {

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java Wed Dec 16 10:44:27 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-package org.ofbiz.widget.birt;
+package org.ofbiz.birt.widget;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml Wed Dec 16 10:44:27 2009
@@ -35,8 +35,6 @@
         <handler name="jasperreportspdf" type="view" class="org.ofbiz.webapp.view.JasperReportsPdfViewHandler"/>
         <handler name="jasperreportsxml" type="view" class="org.ofbiz.webapp.view.JasperReportsXmlViewHandler"/>
     -->
-    
-    <handler name="birt" type="view" class="org.ofbiz.webapp.view.BirtViewHandler"/>
 
     <!-- Events to run on every request before security (chains exempt) -->
     <!--

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Wed Dec 16 10:44:27 2009
@@ -51,6 +51,7 @@
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
+    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
 
     <preprocessor>
         <!-- Events to run on every request before security (chains exempt) -->

Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=891180&r1=891179&r2=891180&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Wed Dec 16 10:44:27 2009
@@ -34,6 +34,7 @@
     <load-component component-location="myportal"/>
     <load-component component-location="webpos"/>
     <load-component component-location="crowd"/>
+    <!-- load-component component-location="ldap"/>-->
     <!-- <load-component component-location="workflow"/> -->
     <!-- <load-component component-location="shark"/> -->
 </component-loader>