svn commit: r832368 - in /ofbiz/trunk: applications/content/ofbiz-component.xml framework/example/ofbiz-component.xml framework/example/webapp/example/WEB-INF/controller.xml

Author: jleroux
Date: Tue Nov  3 09:58:06 2009
New Revision: 832368

URL: http://svn.apache.org/viewvc?rev=832368&view=rev
Log:
A patch from Erwan de FERRIERES "help link in example is not working" (https://issues.apache.org/jira/browse/OFBIZ-3097) - OFBIZ-3097
when clicking the help link in the example app, the showHelp request is not recognised.
-> added a request in the example controller
-> created the ExampleHelpData file
-> added the needed line to load the data in the Example ofbiz-component file.

Modified:
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/framework/example/ofbiz-component.xml
    ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=832368&r1=832367&r2=832368&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Tue Nov  3 09:58:06 2009
@@ -42,6 +42,7 @@
     <!-- these files cannot be loaded in their original component because they are earlier than the content component -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
 
     <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>

Modified: ofbiz/trunk/framework/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/ofbiz-component.xml?rev=832368&r1=832367&r2=832368&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/example/ofbiz-component.xml Tue Nov  3 09:58:06 2009
@@ -39,6 +39,7 @@
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
 
     <!-- service resources: model(s), eca(s) and group definitions -->
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

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=832368&r1=832367&r2=832368&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Tue Nov  3 09:58:06 2009
@@ -201,6 +201,11 @@
       <security https="true" auth="true"/>
       <response name="success" type="view" value="printExampleFOPFonts"/>
     </request-map>
+
+    <request-map uri="showHelp">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="showHelp"/>
+    </request-map>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -226,5 +231,6 @@
     <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"/>
+    <view-map name="ShowDocument" type="screen" page="component://commonext/widget/HelpScreens.xml#showDocument"/>
     <!-- end of view mappings -->
 </site-conf>