You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/26 15:50:27 UTC
svn commit: r631236 - in /myfaces/orchestra/trunk/core/src:
main/java/org/apache/myfaces/orchestra/viewController/
main/java/org/apache/myfaces/orchestra/viewController/spring/
main/resources/META-INF/ main/resources/org/apache/myfaces/orchestra/
test/...
Author: skitching
Date: Tue Feb 26 06:50:25 2008
New Revision: 631236
URL: http://svn.apache.org/viewvc?rev=631236&view=rev
Log:
Tabs to spaces
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java
myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml
myfaces/orchestra/trunk/core/src/main/resources/META-INF/spring-orchestra-init.xml
myfaces/orchestra/trunk/core/src/main/resources/org/apache/myfaces/orchestra/orchestra.xsd
myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.xml
myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java Tue Feb 26 06:50:25 2008
@@ -28,20 +28,20 @@
*/
public class DefaultViewControllerManager extends AbstractViewControllerManager
{
- private ViewControllerNameMapper viewControllerNameMapper = new DefaultViewControllerNameMapper();
- private ViewControllerExecutor viewControllerExecutor = new ReflectiveViewControllerExecutor();
+ private ViewControllerNameMapper viewControllerNameMapper = new DefaultViewControllerNameMapper();
+ private ViewControllerExecutor viewControllerExecutor = new ReflectiveViewControllerExecutor();
- public DefaultViewControllerManager()
- {
- }
+ public DefaultViewControllerManager()
+ {
+ }
- protected ViewControllerNameMapper getViewControllerNameMapper()
- {
- return viewControllerNameMapper;
- }
+ protected ViewControllerNameMapper getViewControllerNameMapper()
+ {
+ return viewControllerNameMapper;
+ }
- protected ViewControllerExecutor getViewControllerExecutor()
- {
- return viewControllerExecutor;
- }
+ protected ViewControllerExecutor getViewControllerExecutor()
+ {
+ return viewControllerExecutor;
+ }
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java Tue Feb 26 06:50:25 2008
@@ -59,16 +59,16 @@
*/
public class SpringViewControllerScope extends AbstractSpringOrchestraScope
{
- private final static ViewControllerManager DEFAULT_VCM = new DefaultViewControllerManager();
+ private final static ViewControllerManager DEFAULT_VCM = new DefaultViewControllerManager();
- public SpringViewControllerScope()
- {
- }
+ public SpringViewControllerScope()
+ {
+ }
- public Conversation createConversation(ConversationContext context, String conversationName)
- {
- throw new IllegalStateException("the viewController scope is not supposed to start a conversation on its own. conversation to start: " + conversationName);
- }
+ public Conversation createConversation(ConversationContext context, String conversationName)
+ {
+ throw new IllegalStateException("the viewController scope is not supposed to start a conversation on its own. conversation to start: " + conversationName);
+ }
protected void assertSameScope(String beanName, Conversation conversation)
{
@@ -84,13 +84,13 @@
* controller bean, not the specified bean at all.
*/
protected String getConversationNameForBean(String beanName)
- {
- // TODO: this is JSF-specific. Remove it.
- FacesContext facesContext = FacesContext.getCurrentInstance();
+ {
+ // TODO: this is JSF-specific. Remove it.
+ FacesContext facesContext = FacesContext.getCurrentInstance();
- // TODO: avoid using the _ViewControllerUtils class here. That is JSF-specific which this class is
- // not supposed to be.
- ViewControllerManager viewControllerManager = getViewControllerManager(facesContext);
+ // TODO: avoid using the _ViewControllerUtils class here. That is JSF-specific which this class is
+ // not supposed to be.
+ ViewControllerManager viewControllerManager = getViewControllerManager(facesContext);
String viewControllerName = viewControllerManager.getViewControllerName(facesContext.getViewRoot().getViewId());
if (viewControllerName == null)
{
Modified: myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml Tue Feb 26 06:50:25 2008
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<!--
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,27 +25,27 @@
<faces-config>
- <application>
- <variable-resolver>org.apache.myfaces.orchestra.viewController.jsf.ViewControllerVariableResolver</variable-resolver>
- </application>
-
- <component>
- <component-type>org.apache.myfaces.orchestra.EndConversation</component-type>
- <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UIEndConversation</component-class>
- </component>
- <component>
- <component-type>org.apache.myfaces.orchestra.SeparateConversationContext</component-type>
- <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext</component-class>
- </component>
-
- <lifecycle>
- <phase-listener>org.apache.myfaces.orchestra.conversation.jsf.AccessScopePhaseListener</phase-listener>
- <phase-listener>org.apache.myfaces.orchestra.viewController.jsf.ViewControllerPhaseListener</phase-listener>
- </lifecycle>
-
- <factory>
- <faces-context-factory>org.apache.myfaces.orchestra.lib.jsf.OrchestraFacesContextFactory</faces-context-factory>
- <faces-context-factory>org.apache.myfaces.orchestra.requestParameterProvider.jsf.RequestParameterFacesContextFactory</faces-context-factory>
- </factory>
+ <application>
+ <variable-resolver>org.apache.myfaces.orchestra.viewController.jsf.ViewControllerVariableResolver</variable-resolver>
+ </application>
+
+ <component>
+ <component-type>org.apache.myfaces.orchestra.EndConversation</component-type>
+ <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UIEndConversation</component-class>
+ </component>
+ <component>
+ <component-type>org.apache.myfaces.orchestra.SeparateConversationContext</component-type>
+ <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext</component-class>
+ </component>
+
+ <lifecycle>
+ <phase-listener>org.apache.myfaces.orchestra.conversation.jsf.AccessScopePhaseListener</phase-listener>
+ <phase-listener>org.apache.myfaces.orchestra.viewController.jsf.ViewControllerPhaseListener</phase-listener>
+ </lifecycle>
+
+ <factory>
+ <faces-context-factory>org.apache.myfaces.orchestra.lib.jsf.OrchestraFacesContextFactory</faces-context-factory>
+ <faces-context-factory>org.apache.myfaces.orchestra.requestParameterProvider.jsf.RequestParameterFacesContextFactory</faces-context-factory>
+ </factory>
</faces-config>
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=631236&r1=631235&r2=631236&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 Tue Feb 26 06:50:25 2008
@@ -19,30 +19,30 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
- <bean
- name="org.apache.myfaces.orchestra.conversation.AccessScopeManager"
- class="org.apache.myfaces.orchestra.conversation.AccessScopeManager"
- scope="request">
+ <bean
+ name="org.apache.myfaces.orchestra.conversation.AccessScopeManager"
+ class="org.apache.myfaces.orchestra.conversation.AccessScopeManager"
+ scope="request">
- <property
- name="accessScopeManagerConfiguration"
- ref="org.apache.myfaces.orchestra.conversation.AccessScopeManagerConfiguration" />
+ <property
+ name="accessScopeManagerConfiguration"
+ ref="org.apache.myfaces.orchestra.conversation.AccessScopeManagerConfiguration" />
- </bean>
+ </bean>
- <!-- provide an empty instanceo of the AccessScopeManagerConfiguration 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.AccessScopeManagerConfiguration"
- class="org.apache.myfaces.orchestra.conversation.AccessScopeManagerConfiguration"
- scope="singleton">
+ <!-- provide an empty instanceo of the AccessScopeManagerConfiguration 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.AccessScopeManagerConfiguration"
+ class="org.apache.myfaces.orchestra.conversation.AccessScopeManagerConfiguration"
+ scope="singleton">
- </bean>
+ </bean>
</beans>
Modified: myfaces/orchestra/trunk/core/src/main/resources/org/apache/myfaces/orchestra/orchestra.xsd
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/resources/org/apache/myfaces/orchestra/orchestra.xsd?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/resources/org/apache/myfaces/orchestra/orchestra.xsd (original)
+++ myfaces/orchestra/trunk/core/src/main/resources/org/apache/myfaces/orchestra/orchestra.xsd Tue Feb 26 06:50:25 2008
@@ -18,13 +18,13 @@
under the License.
-->
<xsd:schema xmlns="http://myfaces.apache.org/orchestra"
- targetNamespace="http://myfaces.apache.org/orchestra"
- elementFormDefault="qualified" attributeFormDefault="unqualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ targetNamespace="http://myfaces.apache.org/orchestra"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <!-- todo: limit to bean element -->
- <xsd:attribute
- name="conversationName"
- type="xsd:string" />
+ <!-- todo: limit to bean element -->
+ <xsd:attribute
+ name="conversationName"
+ type="xsd:string" />
</xsd:schema>
Modified: myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.xml?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.xml Tue Feb 26 06:50:25 2008
@@ -19,13 +19,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<!-- register our custom spring scope -->
<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
@@ -45,10 +45,10 @@
</property>
</bean>
- <!-- our beans -->
+ <!-- our beans -->
- <bean
- name="simpleBean"
- class="org.apache.myfaces.orchestra.conversation.SimpleBean"
- scope="conversation.manual"/>
+ <bean
+ name="simpleBean"
+ class="org.apache.myfaces.orchestra.conversation.SimpleBean"
+ scope="conversation.manual"/>
</beans>
Modified: myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml?rev=631236&r1=631235&r2=631236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml Tue Feb 26 06:50:25 2008
@@ -19,7 +19,7 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:orchestra="http://myfaces.apache.org/orchestra"