[Beeframework-svn] SF.net SVN: beeframework:[244] trunk

[<m_p...@us...>]

Revision: 244
          http://sourceforge.net/p/beeframework/code/244
Author:   m_plomer
Date:     2014-10-08 09:12:00 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
removed previously deprecated Bee_MVC_Controller_MultiAction (replaced by Bee\MVC\Controller\MultiActionController)

Modified Paths:
--------------
    trunk/examples/conf/context.xml
    trunk/framework/Bee/MVC/Controller/MultiActionController.php
    trunk/framework/Bee/MVC/Controller/MultiActionMultiDelegates.php

Removed Paths:
-------------
    trunk/framework/Bee/MVC/Controller/MultiAction.php

Modified: trunk/examples/conf/context.xml
===================================================================
--- trunk/examples/conf/context.xml	2014-10-05 23:57:40 UTC (rev 243)
+++ trunk/examples/conf/context.xml	2014-10-08 09:12:00 UTC (rev 244)
@@ -23,7 +23,7 @@
     <!-- METHOD NAME RESOLVER -->
     <bean id="methodNameResolver" class="Bee_MVC_Controller_Multiaction_MethodNameResolver_AnnotationBased" scope="prototype"/>
 
-    <bean id="multiactionControllerTemplate" class="Bee_MVC_Controller_MultiAction">
+    <bean id="multiactionControllerTemplate" class="Bee\MVC\Controller\MultiActionController">
         <property name="methodNameResolver" ref="methodNameResolver"/>
     </bean>
 

Deleted: trunk/framework/Bee/MVC/Controller/MultiAction.php
===================================================================
--- trunk/framework/Bee/MVC/Controller/MultiAction.php	2014-10-05 23:57:40 UTC (rev 243)
+++ trunk/framework/Bee/MVC/Controller/MultiAction.php	2014-10-08 09:12:00 UTC (rev 244)
@@ -1,34 +0,0 @@
-<?php
-/*
- * Copyright 2008-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-use Bee\MVC\Controller\MultiActionController;
-
-/**
- * The multiaction controller handles requests by delegating to method calls on a delegate object. The methods to be used are
- * determined by the method name resolver.
- *
- * A handler method must take at least one argument, type-hinted to Bee_MVC_IHttpRequest, and return a Bee_MVC_ModelAndView.
- *
- * @see Bee_MVC_IHttpRequest
- * @see Bee_MVC_ModelAndView
- *
- * @author Michael Plomer <mic...@it...>
- * @author Benjamin Hartmann
- *
- * @deprecated replaced by \Bee\MVC\Controller\MultiActionController
- */
-class Bee_MVC_Controller_MultiAction extends MultiActionController {
-}

Modified: trunk/framework/Bee/MVC/Controller/MultiActionController.php
===================================================================
--- trunk/framework/Bee/MVC/Controller/MultiActionController.php	2014-10-05 23:57:40 UTC (rev 243)
+++ trunk/framework/Bee/MVC/Controller/MultiActionController.php	2014-10-08 09:12:00 UTC (rev 244)
@@ -19,6 +19,7 @@
 use Bee\MVC\Controller\Multiaction\IMethodNameResolver;
 use Bee\MVC\Controller\Multiaction\NoHandlerMethodFoundException;
 use Bee_MVC_IHttpRequest;
+use Bee_MVC_ModelAndView;
 use Bee_Utils_Assert;
 use Bee_Utils_Reflection;
 use Bee_Utils_Strings;
@@ -67,10 +68,10 @@
 	private $methodNameResolver;
 
 	protected function init() {
-		Bee_Utils_Assert::notNull($this->delegate, '\'delegate\' property is required in Bee_MVC_Controller_MultiAction');
+		Bee_Utils_Assert::notNull($this->delegate, '\'delegate\' property is required in ' . __CLASS__);
 		Bee_Utils_Assert::isTrue(
 			!is_null($this->methodInvocator) || !is_null($this->methodNameResolver),
-				'either \'methodInvocator\' or \'methodNameResolver\' property required in Bee_MVC_Controller_MultiAction'
+				'either \'methodInvocator\' or \'methodNameResolver\' property required in '  . __CLASS__
 		);
 	}
 
@@ -79,7 +80,7 @@
 	 *
 	 * @param Bee_MVC_IHttpRequest $request
 	 * @throws Exception
-	 * @return \Bee_MVC_ModelAndView
+	 * @return Bee_MVC_ModelAndView
 	 */
 	protected function handleRequestInternally(Bee_MVC_IHttpRequest $request) {
 		if(!is_null($this->methodInvocator)) {

Modified: trunk/framework/Bee/MVC/Controller/MultiActionMultiDelegates.php
===================================================================
--- trunk/framework/Bee/MVC/Controller/MultiActionMultiDelegates.php	2014-10-05 23:57:40 UTC (rev 243)
+++ trunk/framework/Bee/MVC/Controller/MultiActionMultiDelegates.php	2014-10-08 09:12:00 UTC (rev 244)
@@ -73,7 +73,7 @@
      */
     protected function init() {
 		parent::init();
-        Bee_Utils_Assert::notNull($this->delegateResolver, '\'methodNameResolver\' property is required in Bee_MVC_Controller_MultiAction');
+        Bee_Utils_Assert::notNull($this->delegateResolver, '\'methodNameResolver\' property is required in ' . __CLASS__);
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.