Author: julien(a)jboss.com
Date: 2007-04-25 12:55:18 -0400 (Wed, 25 Apr 2007)
New Revision: 7050
Added:
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java
Removed:
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerException.java
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerSelector.java
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/Controller.java
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/controller/classic/ThrowableResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
move ResponseHandler related class to the handler package
Modified: trunk/core/src/main/org/jboss/portal/core/controller/Controller.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-04-25
15:59:51 UTC (rev 7049)
+++ trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -32,6 +32,7 @@
import org.jboss.portal.core.controller.handler.CommandForward;
import org.jboss.portal.core.controller.handler.ResponseHandler;
import org.jboss.portal.core.controller.handler.AjaxResponse;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.content.ContentRendererRegistry;
import org.jboss.portal.core.model.instance.InstanceContainer;
Deleted:
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerException.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerException.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerException.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -1,49 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.core.controller;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class ResponseHandlerException extends Exception
-{
- public ResponseHandlerException()
- {
- }
-
- public ResponseHandlerException(String message)
- {
- super(message);
- }
-
- public ResponseHandlerException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public ResponseHandlerException(Throwable cause)
- {
- super(cause);
- }
-}
Deleted:
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerSelector.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerSelector.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerSelector.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -1,72 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.core.controller;
-
-import org.jboss.portal.core.controller.handler.ResponseHandler;
-import org.jboss.portal.core.controller.handler.HandlerResponse;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class ResponseHandlerSelector implements ResponseHandler
-{
-
- /** . */
- private ResponseHandler classicResponseHandler;
-
- /** . */
- private ResponseHandler ajaxResponseHandler;
-
- public ResponseHandler getClassicResponseHandler()
- {
- return classicResponseHandler;
- }
-
- public void setClassicResponseHandler(ResponseHandler classicResponseHandler)
- {
- this.classicResponseHandler = classicResponseHandler;
- }
-
- public ResponseHandler getAjaxResponseHandler()
- {
- return ajaxResponseHandler;
- }
-
- public void setAjaxResponseHandler(ResponseHandler ajaxResponseHandler)
- {
- this.ajaxResponseHandler = ajaxResponseHandler;
- }
-
- public HandlerResponse processCommandResponse(ControllerContext controllerContext,
ControllerCommand command, ControllerResponse response) throws ResponseHandlerException
- {
- if (ControllerContext.AJAX_TYPE == controllerContext.getType())
- {
- return ajaxResponseHandler.processCommandResponse(controllerContext, command,
response);
- }
- else
- {
- return classicResponseHandler.processCommandResponse(controllerContext, command,
response);
- }
- }
-}
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -28,7 +28,7 @@
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.controller.handler.CommandForward;
import org.jboss.portal.core.controller.portlet.PortletResponseHandler;
import org.jboss.portal.core.model.portal.command.response.PortletWindowResponse;
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -32,7 +32,7 @@
import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.controller.ControllerResponse;
import org.jboss.portal.core.controller.handler.AbstractResponseHandler;
import org.jboss.portal.core.controller.handler.HTTPResponse;
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/classic/ThrowableResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/classic/ThrowableResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/classic/ThrowableResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -25,9 +25,9 @@
import org.jboss.portal.core.controller.handler.ResponseHandler;
import org.jboss.portal.core.controller.handler.HandlerResponse;
import org.jboss.portal.core.controller.handler.HTTPResponse;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ResponseHandlerException;
import org.jboss.portal.core.controller.ControllerSecurityException;
import org.jboss.portal.core.controller.ResourceNotFoundException;
import org.jboss.portal.core.controller.ControllerException;
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -24,7 +24,7 @@
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.controller.ControllerResponse;
/**
Copied:
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java
(from rev 7048,
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerException.java)
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java
(rev 0)
+++
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.controller.handler;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class ResponseHandlerException extends Exception
+{
+ public ResponseHandlerException()
+ {
+ }
+
+ public ResponseHandlerException(String message)
+ {
+ super(message);
+ }
+
+ public ResponseHandlerException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public ResponseHandlerException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Copied:
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java
(from rev 7048,
trunk/core/src/main/org/jboss/portal/core/controller/ResponseHandlerSelector.java)
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java
(rev 0)
+++
trunk/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.controller.handler;
+
+import org.jboss.portal.core.controller.handler.ResponseHandler;
+import org.jboss.portal.core.controller.handler.HandlerResponse;
+import org.jboss.portal.core.controller.ControllerContext;
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class ResponseHandlerSelector implements ResponseHandler
+{
+
+ /** . */
+ private ResponseHandler classicResponseHandler;
+
+ /** . */
+ private ResponseHandler ajaxResponseHandler;
+
+ public ResponseHandler getClassicResponseHandler()
+ {
+ return classicResponseHandler;
+ }
+
+ public void setClassicResponseHandler(ResponseHandler classicResponseHandler)
+ {
+ this.classicResponseHandler = classicResponseHandler;
+ }
+
+ public ResponseHandler getAjaxResponseHandler()
+ {
+ return ajaxResponseHandler;
+ }
+
+ public void setAjaxResponseHandler(ResponseHandler ajaxResponseHandler)
+ {
+ this.ajaxResponseHandler = ajaxResponseHandler;
+ }
+
+ public HandlerResponse processCommandResponse(ControllerContext controllerContext,
ControllerCommand command, ControllerResponse response) throws ResponseHandlerException
+ {
+ if (ControllerContext.AJAX_TYPE == controllerContext.getType())
+ {
+ return ajaxResponseHandler.processCommandResponse(controllerContext, command,
response);
+ }
+ else
+ {
+ return classicResponseHandler.processCommandResponse(controllerContext, command,
response);
+ }
+ }
+}
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -25,7 +25,7 @@
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.controller.handler.HTTPResponse;
import org.jboss.portal.core.controller.handler.CommandForward;
import org.jboss.portal.core.controller.handler.AbstractResponseHandler;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -29,10 +29,9 @@
import org.jboss.portal.core.controller.handler.HTTPResponse;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import
org.jboss.portal.core.model.instance.command.response.UpdatePortletInstanceResponse;
import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand;
-import org.jboss.portal.server.ServerException;
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.web.ServletContextDispatcher;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-04-25
15:59:51 UTC (rev 7049)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-04-25
16:55:18 UTC (rev 7050)
@@ -30,7 +30,7 @@
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ResponseHandlerException;
+import org.jboss.portal.core.controller.handler.ResponseHandlerException;
import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse;
import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse;
import org.jboss.portal.core.model.portal.command.view.ViewPageCommand;
Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-25
15:59:51 UTC (rev 7049)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-25
16:55:18 UTC (rev 7050)
@@ -944,7 +944,7 @@
<!-- The response handler selector -->
<mbean
- code="org.jboss.portal.core.controller.ResponseHandlerSelector"
+ code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
name="portal:service=ResponseHandler,type=Selector"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">