You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/08/30 09:40:56 UTC
svn commit: r571062 - in /myfaces/orchestra/trunk:
core/src/main/java/org/apache/myfaces/orchestra/viewController/
core/src/main/resources/META-INF/ core/src/site/xdoc/
core15/src/main/resources/META-INF/
Author: imario
Date: Thu Aug 30 00:40:55 2007
New Revision: 571062
URL: http://svn.apache.org/viewvc?rev=571062&view=rev
Log:
fixed ViewController documentation and naming issue (Thanks to Simon Kitching for pointing it out)
fixed NPE with latest FlashScopeManager configuration (Thanks to Dan Tran fro pointing it out)
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java
myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml
myfaces/orchestra/trunk/core/src/site/xdoc/viewController.xml
myfaces/orchestra/trunk/core15/src/main/resources/META-INF/spring-orchestra-init.xml
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java?rev=571062&r1=571061&r2=571062&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java Thu Aug 30 00:40:55 2007
@@ -22,30 +22,30 @@
/**
* Route per-view lifecycle events to the correct user methods.
- *
+ *
* <p>The ViewControllerPhaseListener retrieves a concrete implementation of this interface then
* invokes it at various processing phases. The concrete implementation is responsible for
* determining which methods on which objects (backing beans) should be invoked.</p>
- *
+ *
* <p>Orchestra provides a couple of different implementations; see
- * {@link DefaultViewControllerManager} and {@link ReflectiveViewControllerManager}.</p>
+ * {@link DefaultViewControllerManager} and {@link ReflectiveViewControllerExecutor}.</p>
*
* <h2>Defining your own ViewControllerManager</h2>
- *
+ *
* <p>If you would like to use your own naming scheme or executor just implement your own {@link ViewControllerManager} or
* derive from {@link DefaultViewControllerManager} (the recommended way) and overload
* {@link AbstractViewControllerManager#getViewControllerNameMapper()} or
* {@link AbstractViewControllerManager#getViewControllerExecutor()} }.</p>
- *
+ *
* <p>To activate your manager just configure it as managed bean in your faces-config.xml or your spring
* configuration, preferably in application scope or as singleton.</p>
- *
- * <p>The managed-bean-name has to be "<code>orchestra_ViewControllerManager</code>" (see constant
- * {@link ViewControllerManager#VIEW_CONTROLLER_MANAGER_NAME})</p>
+ *
+ * <p>The managed-bean-name has to be "<code>org.apache.myfaces.orchestra.viewController.ViewControllerManager</code>"
+ * (see constant {@link ViewControllerManager#VIEW_CONTROLLER_MANAGER_NAME})</p>
*/
public interface ViewControllerManager
{
- public final static String VIEW_CONTROLLER_MANAGER_NAME = ViewControllerManager.class.getName().replace('.', '$');
+ public final static String VIEW_CONTROLLER_MANAGER_NAME = ViewControllerManager.class.getName();
public Object getViewController(String viewId);
Modified: myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml?rev=571062&r1=571061&r2=571062&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml (original)
+++ myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml Thu Aug 30 00:40:55 2007
@@ -33,6 +33,16 @@
<property
name="flashScopeManagerConfiguration"
ref="org.apache.myfaces.orchestra.conversation.FlashScopeManagerConfiguration" />
+
+ </bean>
+
+ <!-- provide an empty instanceo of the FlashScopeManagerConfiguration to make spring happy.
+ Users have to override it in their own spring configuration to provide a real configuration -->
+ <bean
+ name="org.apache.myfaces.orchestra.conversation.FlashScopeManagerConfiguration"
+ class="org.apache.myfaces.orchestra.conversation.FlashScopeManagerConfiguration"
+ scope="singleton">
+
</bean>
</beans>
Modified: myfaces/orchestra/trunk/core/src/site/xdoc/viewController.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/site/xdoc/viewController.xml?rev=571062&r1=571061&r2=571062&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/site/xdoc/viewController.xml (original)
+++ myfaces/orchestra/trunk/core/src/site/xdoc/viewController.xml Thu Aug 30 00:40:55 2007
@@ -87,10 +87,10 @@
<code>>NameMapper</code> and the <code>Executor</code>.
<br/>
Finally you have to configure your implementation by adding an bean definition with the name
- <code>org$apache$myfaces$orchestra$viewController$ViewControllerManager</code>. For example:
+ <code>org.apache.myfaces.orchestra.viewController.ViewControllerManager</code>. For example:
<pre>
<bean
- name="org$apache$myfaces$orchestra$viewController$ViewControllerManager"
+ name="org.apache.myfaces.orchestra.viewController.ViewControllerManager"
class="your.package.YourViewController"
scope="singleton">
Modified: myfaces/orchestra/trunk/core15/src/main/resources/META-INF/spring-orchestra-init.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/resources/META-INF/spring-orchestra-init.xml?rev=571062&r1=571061&r2=571062&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/resources/META-INF/spring-orchestra-init.xml (original)
+++ myfaces/orchestra/trunk/core15/src/main/resources/META-INF/spring-orchestra-init.xml Thu Aug 30 00:40:55 2007
@@ -41,11 +41,11 @@
</bean>
<bean
- name="org$apache$myfaces$orchestra$viewController$ViewControllerManager"
+ name="org.apache.myfaces.orchestra.viewController.ViewControllerManager"
class="org.apache.myfaces.orchestra.viewController.AnnotationsViewControllerManager"
init-method="initManager"
scope="singleton">
-
+
<property
name="annotationInfoManager"
ref="org.apache.myfaces.orchestra.annotation.AnnotationInfoManager"/>