You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/04/20 23:55:34 UTC
svn commit: r1328522 - in /ofbiz/trunk/specialpurpose: ./ example/
example/webapp/exampleext/ example/webapp/exampleext/WEB-INF/
example/widget/exampleext/ exampleext/
Author: erwan
Date: Fri Apr 20 21:55:33 2012
New Revision: 1328522
URL: http://svn.apache.org/viewvc?rev=1328522&view=rev
Log:
Merging exampleext in example application
Added:
ofbiz/trunk/specialpurpose/example/webapp/exampleext/
- copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/
ofbiz/trunk/specialpurpose/example/widget/exampleext/
- copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/widget/example/
Removed:
ofbiz/trunk/specialpurpose/exampleext/
Modified:
ofbiz/trunk/specialpurpose/component-load.xml
ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Fri Apr 20 21:55:33 2012
@@ -38,7 +38,6 @@ under the License.
<load-component component-location="ldap"/>
<load-component component-location="webpos"/>
<load-component component-location="example"/>
- <load-component component-location="exampleext"/>
<!-- The component below are not maintained by the community, or at least not very actively
Still they are functional (or at least should be).
So if you need them simply uncomment and have a look also in the build file -->
Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Fri Apr 20 21:55:33 2012
@@ -59,6 +59,15 @@ under the License.
location="webapp/example"
base-permission="OFBTOOLS,EXAMPLE"
mount-point="/example"/>
+
+ <webapp name="exampleext"
+ title="ExampleExt"
+ menu-name="secondary"
+ server="default-server"
+ location="webapp/exampleext"
+ base-permission="OFBTOOLS,EXAMPLE"
+ mount-point="/exampleext"/>
+
<webapp name="birt"
title="BIRT"
server="default-server"
Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml Fri Apr 20 21:55:33 2012
@@ -24,5 +24,5 @@ under the License.
<description>Extended Catalog Manager Controller Configuration File</description>
- <view-map name="EditExample" type="screen" page="component://exampleext/widget/example/ExampleScreens.xml#EditExampleExt"/>
+ <view-map name="EditExample" type="screen" page="component://example/widget/exampleext/ExampleScreens.xml#EditExampleExt"/>
</site-conf>
Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml Fri Apr 20 21:55:33 2012
@@ -33,7 +33,7 @@ under the License.
</context-param>
<context-param>
<param-name>mainDecoratorLocation</param-name>
- <param-value>component://exampleext/widget/example/CommonScreens.xml</param-value>
+ <param-value>component://example/widget/exampleext/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml Fri Apr 20 21:55:33 2012
@@ -50,7 +50,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EditExample" location="component://exampleext/widget/example/ExampleMenus.xml"/>
+ <include-menu name="EditExample" location="component://example/widget/exampleext/ExampleMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml Fri Apr 20 21:55:33 2012
@@ -33,7 +33,7 @@ under the License.
<widgets>
<decorator-screen name="CommonExampleDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditExampleExt" location="component://exampleext/widget/example/ExampleForms.xml"/>
+ <include-form name="EditExampleExt" location="component://example/widget/exampleext/ExampleForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Re: svn commit: r1328522 - in /ofbiz/trunk/specialpurpose: ./ example/ example/webapp/exampleext/ example/webapp/exampleext/WEB-INF/ example/widget/exampleext/ exampleext/
Posted by Jacques Le Roux <ja...@les7arts.com>.
+1
Morevoer it would be good to apply/commit patches at https://issues.apache.org/jira/browse/OFBIZ-4829
So I suggest to revert this one and r1328503 to easily apply those patches. Then to move them again in specialpurpose
Thanks
Jacques
From: "Adrian Crum" <ad...@sandglass-software.com>
> Why is this being done? The exampleext component is intended to demonstrate how a component can be extended easily. Merging the
> two defeats that purpose.
>
> -Adrian
>
> On 4/20/2012 10:55 PM, erwan@apache.org wrote:
>> Author: erwan
>> Date: Fri Apr 20 21:55:33 2012
>> New Revision: 1328522
>>
>> URL: http://svn.apache.org/viewvc?rev=1328522&view=rev
>> Log:
>> Merging exampleext in example application
>>
>> Added:
>> ofbiz/trunk/specialpurpose/example/webapp/exampleext/
>> - copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/
>> ofbiz/trunk/specialpurpose/example/widget/exampleext/
>> - copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/widget/example/
>> Removed:
>> ofbiz/trunk/specialpurpose/exampleext/
>> Modified:
>> ofbiz/trunk/specialpurpose/component-load.xml
>> ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
>> ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
>> ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
>> ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
>> ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
>>
>> Modified: ofbiz/trunk/specialpurpose/component-load.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/component-load.xml (original)
>> +++ ofbiz/trunk/specialpurpose/component-load.xml Fri Apr 20 21:55:33 2012
>> @@ -38,7 +38,6 @@ under the License.
>> <load-component component-location="ldap"/>
>> <load-component component-location="webpos"/>
>> <load-component component-location="example"/>
>> -<load-component component-location="exampleext"/>
>> <!-- The component below are not maintained by the community, or at least not very actively
>> Still they are functional (or at least should be).
>> So if you need them simply uncomment and have a look also in the build file -->
>>
>> Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
>> +++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Fri Apr 20 21:55:33 2012
>> @@ -59,6 +59,15 @@ under the License.
>> location="webapp/example"
>> base-permission="OFBTOOLS,EXAMPLE"
>> mount-point="/example"/>
>> +
>> +<webapp name="exampleext"
>> + title="ExampleExt"
>> + menu-name="secondary"
>> + server="default-server"
>> + location="webapp/exampleext"
>> + base-permission="OFBTOOLS,EXAMPLE"
>> + mount-point="/exampleext"/>
>> +
>> <webapp name="birt"
>> title="BIRT"
>> server="default-server"
>>
>> Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml (original)
>> +++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml Fri Apr 20 21:55:33 2012
>> @@ -24,5 +24,5 @@ under the License.
>>
>> <description>Extended Catalog Manager Controller Configuration File</description>
>>
>> -<view-map name="EditExample" type="screen" page="component://exampleext/widget/example/ExampleScreens.xml#EditExampleExt"/>
>> +<view-map name="EditExample" type="screen" page="component://example/widget/exampleext/ExampleScreens.xml#EditExampleExt"/>
>> </site-conf>
>>
>> Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml (original)
>> +++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml Fri Apr 20 21:55:33 2012
>> @@ -33,7 +33,7 @@ under the License.
>> </context-param>
>> <context-param>
>> <param-name>mainDecoratorLocation</param-name>
>> -<param-value>component://exampleext/widget/example/CommonScreens.xml</param-value>
>> +<param-value>component://example/widget/exampleext/CommonScreens.xml</param-value>
>> <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in
>> screen def XML files.</description>
>> </context-param>
>>
>>
>> Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml Fri Apr 20 21:55:33 2012
>> @@ -50,7 +50,7 @@ under the License.
>> </and>
>> </condition>
>> <widgets>
>> -<include-menu name="EditExample" location="component://exampleext/widget/example/ExampleMenus.xml"/>
>> +<include-menu name="EditExample" location="component://example/widget/exampleext/ExampleMenus.xml"/>
>> </widgets>
>> </section>
>> </decorator-section>
>>
>> Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml Fri Apr 20 21:55:33 2012
>> @@ -33,7 +33,7 @@ under the License.
>> <widgets>
>> <decorator-screen name="CommonExampleDecorator" location="${parameters.mainDecoratorLocation}">
>> <decorator-section name="body">
>> -<include-form name="EditExampleExt" location="component://exampleext/widget/example/ExampleForms.xml"/>
>> +<include-form name="EditExampleExt" location="component://example/widget/exampleext/ExampleForms.xml"/>
>> </decorator-section>
>> </decorator-screen>
>> </widgets>
>>
>>
Re: svn commit: r1328522 - in /ofbiz/trunk/specialpurpose: ./ example/
example/webapp/exampleext/ example/webapp/exampleext/WEB-INF/ example/widget/exampleext/
exampleext/
Posted by Adrian Crum <ad...@sandglass-software.com>.
Why is this being done? The exampleext component is intended to
demonstrate how a component can be extended easily. Merging the two
defeats that purpose.
-Adrian
On 4/20/2012 10:55 PM, erwan@apache.org wrote:
> Author: erwan
> Date: Fri Apr 20 21:55:33 2012
> New Revision: 1328522
>
> URL: http://svn.apache.org/viewvc?rev=1328522&view=rev
> Log:
> Merging exampleext in example application
>
> Added:
> ofbiz/trunk/specialpurpose/example/webapp/exampleext/
> - copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/
> ofbiz/trunk/specialpurpose/example/widget/exampleext/
> - copied from r1328503, ofbiz/trunk/specialpurpose/exampleext/widget/example/
> Removed:
> ofbiz/trunk/specialpurpose/exampleext/
> Modified:
> ofbiz/trunk/specialpurpose/component-load.xml
> ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
> ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
> ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
> ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
>
> Modified: ofbiz/trunk/specialpurpose/component-load.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/component-load.xml (original)
> +++ ofbiz/trunk/specialpurpose/component-load.xml Fri Apr 20 21:55:33 2012
> @@ -38,7 +38,6 @@ under the License.
> <load-component component-location="ldap"/>
> <load-component component-location="webpos"/>
> <load-component component-location="example"/>
> -<load-component component-location="exampleext"/>
> <!-- The component below are not maintained by the community, or at least not very actively
> Still they are functional (or at least should be).
> So if you need them simply uncomment and have a look also in the build file -->
>
> Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1328522&r1=1328521&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
> +++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Fri Apr 20 21:55:33 2012
> @@ -59,6 +59,15 @@ under the License.
> location="webapp/example"
> base-permission="OFBTOOLS,EXAMPLE"
> mount-point="/example"/>
> +
> +<webapp name="exampleext"
> + title="ExampleExt"
> + menu-name="secondary"
> + server="default-server"
> + location="webapp/exampleext"
> + base-permission="OFBTOOLS,EXAMPLE"
> + mount-point="/exampleext"/>
> +
> <webapp name="birt"
> title="BIRT"
> server="default-server"
>
> Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml Fri Apr 20 21:55:33 2012
> @@ -24,5 +24,5 @@ under the License.
>
> <description>Extended Catalog Manager Controller Configuration File</description>
>
> -<view-map name="EditExample" type="screen" page="component://exampleext/widget/example/ExampleScreens.xml#EditExampleExt"/>
> +<view-map name="EditExample" type="screen" page="component://example/widget/exampleext/ExampleScreens.xml#EditExampleExt"/>
> </site-conf>
>
> Modified: ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml (original)
> +++ ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml Fri Apr 20 21:55:33 2012
> @@ -33,7 +33,7 @@ under the License.
> </context-param>
> <context-param>
> <param-name>mainDecoratorLocation</param-name>
> -<param-value>component://exampleext/widget/example/CommonScreens.xml</param-value>
> +<param-value>component://example/widget/exampleext/CommonScreens.xml</param-value>
> <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
> </context-param>
>
>
> Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml Fri Apr 20 21:55:33 2012
> @@ -50,7 +50,7 @@ under the License.
> </and>
> </condition>
> <widgets>
> -<include-menu name="EditExample" location="component://exampleext/widget/example/ExampleMenus.xml"/>
> +<include-menu name="EditExample" location="component://example/widget/exampleext/ExampleMenus.xml"/>
> </widgets>
> </section>
> </decorator-section>
>
> Modified: ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml?rev=1328522&r1=1328503&r2=1328522&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml Fri Apr 20 21:55:33 2012
> @@ -33,7 +33,7 @@ under the License.
> <widgets>
> <decorator-screen name="CommonExampleDecorator" location="${parameters.mainDecoratorLocation}">
> <decorator-section name="body">
> -<include-form name="EditExampleExt" location="component://exampleext/widget/example/ExampleForms.xml"/>
> +<include-form name="EditExampleExt" location="component://example/widget/exampleext/ExampleForms.xml"/>
> </decorator-section>
> </decorator-screen>
> </widgets>
>
>