You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/12/21 06:01:21 UTC
svn commit: r892685 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/WEB-INF/
applications/party/webapp/partymgr/WEB-INF/
framework/common/webcommon/WEB-INF/
framework/webapp/src/org/ofbiz/webapp/event/
specialpurpose/ecommerce/webapp/ecommerce/WE...
Author: lektran
Date: Mon Dec 21 05:01:20 2009
New Revision: 892685
URL: http://svn.apache.org/viewvc?rev=892685&view=rev
Log:
Deprecated the various json event handlers and commented out references to them from the controllers
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Dec 21 05:01:20 2009
@@ -29,7 +29,6 @@
<!-- event handlers -->
<handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
<handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
- <handler name="jsonjava" type="request" class="org.ofbiz.webapp.event.JSONJavaEventHandler"/>
<!-- Events to run on every request before security (chains exempt) -->
<!--
<preprocessor>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Mon Dec 21 05:01:20 2009
@@ -28,7 +28,6 @@
<handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
<handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
- <handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
<!-- Events to run on every request before security (chains exempt) -->
<!--
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=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Mon Dec 21 05:01:20 2009
@@ -34,10 +34,14 @@
<handler name="service-stream" type="request" class="org.ofbiz.webapp.event.ServiceStreamHandler"/>
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
<handler name="groovy" type="request" class="org.ofbiz.webapp.event.GroovyEventHandler"/>
+ <handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/>
+ <!-- These event handlers have been deprecated, if you need to send json responses then chain
+ the json request from this controller after calling your event
<handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
<handler name="jsonservice-multi" type="request" class="org.ofbiz.webapp.event.JSONServiceMultiEventHandler"/>
<handler name="jsonsimple" type="request" class="org.ofbiz.webapp.event.JSONSimpleEventHandler"/>
- <handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/>
+ <handler name="jsonjava" type="request" class="org.ofbiz.webapp.event.JSONJavaEventHandler"/>
+ -->
<!-- view handlers -->
<handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java Mon Dec 21 05:01:20 2009
@@ -35,9 +35,10 @@
import org.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
+@Deprecated
public abstract class AbstractJSONEventHandler implements EventHandler {
- public static final String module = JSONSimpleEventHandler.class.getName();
+ public static final String module = AbstractJSONEventHandler.class.getName();
protected EventHandler service;
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java Mon Dec 21 05:01:20 2009
@@ -36,6 +36,7 @@
/**
* JSONJavaEventHandler - JSON Object Wrapper around the JavaEventHandler
*/
+@Deprecated
public class JSONJavaEventHandler implements EventHandler {
public static final String module = JSONJavaEventHandler.class.getName();
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java Mon Dec 21 05:01:20 2009
@@ -36,6 +36,7 @@
/**
* JSONServiceEventHandler - JSON Object Wrapper around the ServiceEventHandler
*/
+@Deprecated
public class JSONServiceEventHandler implements EventHandler {
public static final String module = JSONServiceEventHandler.class.getName();
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java Mon Dec 21 05:01:20 2009
@@ -36,6 +36,7 @@
/**
* JSONServiceMultiEventHandler - JSON Object Wrapper around the ServiceMultiEventHandler
*/
+@Deprecated
public class JSONServiceMultiEventHandler implements EventHandler {
public static final String module = JSONServiceMultiEventHandler.class.getName();
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java Mon Dec 21 05:01:20 2009
@@ -22,7 +22,7 @@
import javax.servlet.ServletContext;
-
+@Deprecated
public class JSONSimpleEventHandler extends AbstractJSONEventHandler{
@Override
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Dec 21 05:01:20 2009
@@ -31,9 +31,12 @@
<handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
<handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/>
+ <!-- These event handlers have been deprecated, if you need to send json responses then chain
+ the json request from this controller after calling your event
<handler name="jsonsimple" type="request" class="org.ofbiz.webapp.event.JSONSimpleEventHandler"/>
<handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
<handler name="jsonjava" type="request" class="org.ofbiz.webapp.event.JSONJavaEventHandler"/>
+ -->
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=892685&r1=892684&r2=892685&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Mon Dec 21 05:01:20 2009
@@ -36,7 +36,10 @@
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
+ <!-- These event handlers have been deprecated, if you need to send json responses then chain
+ the json request from this controller after calling your event
<handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
+ -->
<!-- Events run from here for the first hit in a visit -->
<firstvisit>