svn commit: r1787536 - in /ofbiz/branches/release16.11: ./ framework/webtools/webapp/webtools/WEB-INF/controller.xml

Author: jleroux
Date: Sat Mar 18 09:23:29 2017
New Revision: 1787536

URL: http://svn.apache.org/viewvc?rev=1787536&view=rev
Log:
"Applied fix from trunk framework for revision: 1787535"
------------------------------------------------------------------------
r1787535 | jleroux | 2017-03-18 10:23:12 +0100 (sam. 18 mars 2017) | 12 lignes

Fixed: Induce Model XML from Database throws exception
(OFBIZ-7473)

Go to Webtools -> Import/Export -> Induce Model XML from Database
(https://localhost:8443/webtools/control/view/ModelInduceFromDb)
An exception is thrown: javax.servlet.ServletException: File
[/entity/ModelInduceFromDb.jsp] not found.

jleroux: after moving FTL template to the template sub-dir we forgot links
in the ctrlr. Changing the ctrlr is the best way.

Thanks: Thanks Gopal Yadav for the report . William Wang for the real cause
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/webtools/webapp/webtools/WEB-INF/controller.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 18 09:23:29 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1787536&r1=1787535&r2=1787536&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat Mar 18 09:23:29 2017
@@ -584,18 +584,18 @@ under the License.
     <view-map name="ViewRelations" type="screen" page="component://webtools/widget/EntityScreens.xml#ViewRelations"/>
 
     <!-- these are NOT regions because they generate text output that should never be decorated -->
-    <view-map name="tablesMySql" page="/entity/tablesMySql.jsp"/>
-    <view-map name="droptablesMySql" page="/entity/droptablesMySql.jsp"/>
-    <view-map name="droptablesplain" page="/entity/droptablesplain.jsp"/>
-    <view-map name="dataMySql" page="/entity/dataMySql.jsp"/>
-    <view-map name="ModelWriter" page="/entity/ModelWriter.jsp"/>
-    <view-map name="ModelGroupWriter" page="/entity/ModelGroupWriter.jsp"/>
-    <view-map name="ModelInduceFromDb" page="/entity/ModelInduceFromDb.jsp"/>
+    <view-map name="tablesMySql" page="template/entity/tablesMySql.jsp"/>
+    <view-map name="droptablesMySql" page="template/entity/droptablesMySql.jsp"/>
+    <view-map name="droptablesplain" page="template/entity/droptablesplain.jsp"/>
+    <view-map name="dataMySql" page="template/entity/dataMySql.jsp"/>
+    <view-map name="ModelWriter" page="template/entity/ModelWriter.jsp"/>
+    <view-map name="ModelGroupWriter" page="template/entity/ModelGroupWriter.jsp"/>
+    <view-map name="ModelInduceFromDb" page="template/entity/ModelInduceFromDb.jsp"/>
     <view-map name="EntityEoModelBundle" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityEoModelBundle"/>
 
     <view-map name="checkdb" type="screen" page="component://webtools/widget/EntityScreens.xml#CheckDb"/>
     <view-map name="xmldsdump" type="screen" page="component://webtools/widget/EntityScreens.xml#xmldsdump"/>
-    <view-map name="xmldsrawdump" page="/entity/xmldsrawdump.jsp"/>
+    <view-map name="xmldsrawdump" page="template/entity/xmldsrawdump.jsp"/>
 
     <view-map name="FindUtilCache" type="screen" page="component://webtools/widget/CacheScreens.xml#FindUtilCache"/>
     <view-map name="FindUtilCacheElements" type="screen" page="component://webtools/widget/CacheScreens.xml#FindUtilCacheElements"/>