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/22 06:59:50 UTC
svn commit: r1328790 - in /ofbiz/trunk/specialpurpose: ./ example/
example/webapp/exampleext/WEB-INF/ example/widget/exampleext/ exampleext/
exampleext/webapp/ exampleext/webapp/exampleext/
exampleext/webapp/exampleext/WEB-INF/ exampleext/widget/ examp...
Author: erwan
Date: Sun Apr 22 04:59:49 2012
New Revision: 1328790
URL: http://svn.apache.org/viewvc?rev=1328790&view=rev
Log:
Reverting 1328522 Merging exampleext in example application which was a bad idea
Added:
ofbiz/trunk/specialpurpose/exampleext/
ofbiz/trunk/specialpurpose/exampleext/webapp/
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml (contents, props changed)
- copied, changed from r1328789, ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml (contents, props changed)
- copied, changed from r1328789, ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/exampleext/widget/
ofbiz/trunk/specialpurpose/exampleext/widget/example/
ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml (contents, props changed)
- copied, changed from r1328789, ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml
ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml (contents, props changed)
- copied, changed from r1328789, ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml
Removed:
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
ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1328790&r1=1328789&r2=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Sun Apr 22 04:59:49 2012
@@ -38,6 +38,7 @@ 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=1328790&r1=1328789&r2=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Sun Apr 22 04:59:49 2012
@@ -59,15 +59,6 @@ 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"
Copied: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml (from r1328789, ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml?p2=ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml&p1=ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml&r1=1328789&r2=1328790&rev=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml Sun Apr 22 04:59:49 2012
@@ -24,5 +24,5 @@ under the License.
<description>Extended Catalog Manager Controller Configuration File</description>
- <view-map name="EditExample" type="screen" page="component://example/widget/exampleext/ExampleScreens.xml#EditExampleExt"/>
+ <view-map name="EditExample" type="screen" page="component://exampleext/widget/example/ExampleScreens.xml#EditExampleExt"/>
</site-conf>
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml (from r1328789, ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml?p2=ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml&p1=ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml&r1=1328789&r2=1328790&rev=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/exampleext/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml Sun Apr 22 04:59:49 2012
@@ -33,7 +33,7 @@ under the License.
</context-param>
<context-param>
<param-name>mainDecoratorLocation</param-name>
- <param-value>component://example/widget/exampleext/CommonScreens.xml</param-value>
+ <param-value>component://exampleext/widget/example/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>
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml (from r1328789, ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml?p2=ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml&p1=ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml&r1=1328789&r2=1328790&rev=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/exampleext/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml Sun Apr 22 04:59:49 2012
@@ -50,7 +50,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EditExample" location="component://example/widget/exampleext/ExampleMenus.xml"/>
+ <include-menu name="EditExample" location="component://exampleext/widget/example/ExampleMenus.xml"/>
</widgets>
</section>
</decorator-section>
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml (from r1328789, ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml?p2=ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml&p1=ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml&r1=1328789&r2=1328790&rev=1328790&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/exampleext/ExampleScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml Sun Apr 22 04:59:49 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://example/widget/exampleext/ExampleForms.xml"/>
+ <include-form name="EditExampleExt" location="component://exampleext/widget/example/ExampleForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/exampleext/widget/example/ExampleScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml