From 7abfecf00a2c4fa9feb2f0acaefe14fd293120e6 Mon Sep 17 00:00:00 2001 From: Erwan de Ferrieres Date: Sun, 22 Apr 2012 04:59:49 +0000 Subject: [PATCH] Reverting 1328522 Merging exampleext in example application which was a bad idea git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1328790 13f79535-47bb-0310-9956-ffa450edef68 --- component-load.xml | 1 + example/ofbiz-component.xml | 9 --------- .../webapp/exampleext/WEB-INF/controller.xml | 2 +- .../webapp/exampleext/WEB-INF/web.xml | 2 +- .../widget/example}/CommonScreens.xml | 2 +- .../widget/example}/ExampleScreens.xml | 2 +- 6 files changed, 5 insertions(+), 13 deletions(-) rename {example => exampleext}/webapp/exampleext/WEB-INF/controller.xml (94%) rename {example => exampleext}/webapp/exampleext/WEB-INF/web.xml (98%) rename {example/widget/exampleext => exampleext/widget/example}/CommonScreens.xml (98%) rename {example/widget/exampleext => exampleext/widget/example}/ExampleScreens.xml (96%) diff --git a/component-load.xml b/component-load.xml index 45a780c93..801b343f8 100644 --- a/component-load.xml +++ b/component-load.xml @@ -38,6 +38,7 @@ under the License. + diff --git a/example/ofbiz-component.xml b/example/ofbiz-component.xml index d295e4308..01b235717 100644 --- a/example/ofbiz-component.xml +++ b/example/ofbiz-component.xml @@ -59,15 +59,6 @@ under the License. location="webapp/example" base-permission="OFBTOOLS,EXAMPLE" mount-point="/example"/> - - - Extended Catalog Manager Controller Configuration File - + diff --git a/example/webapp/exampleext/WEB-INF/web.xml b/exampleext/webapp/exampleext/WEB-INF/web.xml similarity index 98% rename from example/webapp/exampleext/WEB-INF/web.xml rename to exampleext/webapp/exampleext/WEB-INF/web.xml index a59a00f1c..fc6128e47 100644 --- a/example/webapp/exampleext/WEB-INF/web.xml +++ b/exampleext/webapp/exampleext/WEB-INF/web.xml @@ -33,7 +33,7 @@ under the License. mainDecoratorLocation - component://example/widget/exampleext/CommonScreens.xml + component://exampleext/widget/example/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. diff --git a/example/widget/exampleext/CommonScreens.xml b/exampleext/widget/example/CommonScreens.xml similarity index 98% rename from example/widget/exampleext/CommonScreens.xml rename to exampleext/widget/example/CommonScreens.xml index 26e627406..0d2f2e211 100644 --- a/example/widget/exampleext/CommonScreens.xml +++ b/exampleext/widget/example/CommonScreens.xml @@ -50,7 +50,7 @@ under the License. - + diff --git a/example/widget/exampleext/ExampleScreens.xml b/exampleext/widget/example/ExampleScreens.xml similarity index 96% rename from example/widget/exampleext/ExampleScreens.xml rename to exampleext/widget/example/ExampleScreens.xml index 3908d046e..2b130d3f3 100644 --- a/example/widget/exampleext/ExampleScreens.xml +++ b/exampleext/widget/example/ExampleScreens.xml @@ -33,7 +33,7 @@ under the License. - +