Author: lektran
Date: Mon Jan 18 18:27:35 2010
New Revision: 900497
URL: http://svn.apache.org/viewvc?rev=900497&view=rev
Log:
Removed or commented all references to the commonext component from the
framework, this may will break some things but the dependency should never have
been introduced in the first place and needs to be fixed. Inspired by
OFBIZ-3329 but I don't believe it resolves that issue.
Modified:
ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml
ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml
ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
Modified: ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml?rev=900497&r1=900496&r2=900497&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml Mon Jan 18
18:27:35 2010
@@ -22,7 +22,6 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd";>
<include
location="component://common/webcommon/WEB-INF/common-controller.xml"/>
- <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Business Intelligence Component Site Configuration
File</description>
<!-- Request Mappings -->
Modified: ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml?rev=900497&r1=900496&r2=900497&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml Mon Jan 18
18:27:35 2010
@@ -24,7 +24,6 @@
can be found in the following xml file. A component can override the
elements found in the common-controller.xml file. -->
<include
location="component://common/webcommon/WEB-INF/common-controller.xml"/>
- <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Birt Component Site Configuration File</description>
<owner>Copyright 2001-2008 The Apache Software Foundation</owner>
Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?rev=900497&r1=900496&r2=900497&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Mon Jan
18 18:27:35 2010
@@ -265,8 +265,10 @@
<view-map name="ListExampleFormOnly" type="screen"
page="component://example/widget/example/ExampleAjaxScreens.xml#ListExampleFormOnly"/>
<view-map name="CreateExampleFormOnly" type="screen"
page="component://example/widget/example/ExampleAjaxScreens.xml#CreateExampleFormOnly"/>
<view-map name="printExampleFOPFonts" type="screenfop"
page="component://example/widget/example/FormWidgetExampleScreens.xml#printExampleFOPFonts"
content-type="application/pdf" encoding="none"/>
+ <!-- Commenting these out because commonext is an application component
and shouldn't be referred to from the framework
<view-map name="showHelp" type="screen"
page="component://commonext/widget/HelpScreens.xml#ShowHelp"/>
<view-map name="ShowDocument" type="screen"
page="component://commonext/widget/HelpScreens.xml#showDocument"/>
+ -->
<view-map name="ExampleGeoLocationPointSet1" type="screen"
page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet1"/>
<view-map name="ExampleGeoLocationPointSet2" type="screen"
page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet2"/>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=900497&r1=900496&r2=900497&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Mon
Jan 18 18:27:35 2010
@@ -21,7 +21,6 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd";>
<include
location="component://common/webcommon/WEB-INF/common-controller.xml"/>
- <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include
location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
<include
location="component://testtools/webapp/testtools/WEB-INF/controller.xml"/>
<description>WebTools Site Configuration File</description>
