svn commit: r950269 - in /ofbiz/trunk/framework: common/webcommon/WEB-INF/common-controller.xml webtools/ofbiz-component.xml webtools/webapp/webtools/WEB-INF/web.xml

[doogie-3]

Author: doogie
Date: Tue Jun  1 21:55:59 2010
New Revision: 950269

URL: http://svn.apache.org/viewvc?rev=950269&view=rev
Log:
Revert wrongly committed 950265

Modified:
    ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/trunk/framework/webtools/ofbiz-component.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=950269&r1=950268&r2=950269&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Tue Jun  1 21:55:59 2010
@@ -52,9 +52,7 @@ under the License.
     <handler name="screentext" type="view" class="org.ofbiz.widget.screen.ScreenTextViewHandler"/-->
     <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
-    <!--
     <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
-    -->
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
     <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
 

Modified: ofbiz/trunk/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/ofbiz-component.xml?rev=950269&r1=950268&r2=950269&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/webtools/ofbiz-component.xml Tue Jun  1 21:55:59 2010
@@ -30,7 +30,7 @@ under the License.
         title="WebTools"
         menu-name="secondary"
         server="default-server"
-        location="webapp/webslinger"
+        location="webapp/webtools"
         base-permission="OFBTOOLS,WEBTOOLS"
         mount-point="/webtools"/>
 </ofbiz-component>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=950269&r1=950268&r2=950269&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Tue Jun  1 21:55:59 2010
@@ -40,7 +40,7 @@ under the License.
     <!--<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>-->
   </context-param>
   <context-param>
-    <param-name>_serviceReaderUrls</param-name>
+    <param-name>serviceReaderUrls</param-name>
     <param-value>/WEB-INF/services.xml</param-value>
     <!--<description>Configuration File(s) For The Service Dispatcher</description>-->
   </context-param>
@@ -75,7 +75,7 @@ under the License.
         </init-param>
         <init-param>
             <param-name>allowedPaths</param-name>
-            <param-value>/index:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet:/includes/maincss.css</param-value>
+            <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet:/includes/maincss.css</param-value>
         </init-param>
         <init-param>
             <param-name>errorCode</param-name>