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:37:50 UTC
svn commit: r631229 - in /myfaces/orchestra/trunk/core/src/test:
java/org/apache/myfaces/orchestra/conversation/
java/org/apache/myfaces/orchestra/conversation/spring/
java/org/apache/myfaces/orchestra/lib/jsf/
java/org/apache/myfaces/orchestra/request...
Author: skitching
Date: Tue Feb 26 06:37:47 2008
New Revision: 631229
URL: http://svn.apache.org/viewvc?rev=631229&view=rev
Log:
Tabs to spaces
Modified:
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvice.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvisor.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleBean.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleInterface.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestScope.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatefulConverter.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatelessConverter.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBean.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBeanInterface.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestDefaultViewControllerNameMapper.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestInterfaceViewControllerExecutor.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestReflectiveViewControllerExecutor.java
myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/TestScope.xml
myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml
myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvice.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvice.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvice.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvice.java Tue Feb 26 06:37:47 2008
@@ -29,19 +29,19 @@
*/
public class MockAdvice implements MethodInterceptor
{
- private final Log log = LogFactory.getLog(MockAdvice.class);
- private String msg = "Invoking method";
+ private final Log log = LogFactory.getLog(MockAdvice.class);
+ private String msg = "Invoking method";
- public Object invoke(MethodInvocation methodInvocation) throws Throwable
- {
- log.info("before:" + msg);
- Object ret = methodInvocation.proceed();
- log.info("after: " + msg);
- return ret;
- }
-
- public void setMessage(String msg)
- {
- this.msg = msg;
- }
+ public Object invoke(MethodInvocation methodInvocation) throws Throwable
+ {
+ log.info("before:" + msg);
+ Object ret = methodInvocation.proceed();
+ log.info("after: " + msg);
+ return ret;
+ }
+
+ public void setMessage(String msg)
+ {
+ this.msg = msg;
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvisor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvisor.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvisor.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/MockAdvisor.java Tue Feb 26 06:37:47 2008
@@ -39,25 +39,25 @@
*/
public class MockAdvisor implements PointcutAdvisor
{
- MockAdvice advice = new MockAdvice();
- public Advice getAdvice()
- {
- return advice;
- }
+ MockAdvice advice = new MockAdvice();
+ public Advice getAdvice()
+ {
+ return advice;
+ }
- public boolean isPerInstance()
- {
- return false;
- }
+ public boolean isPerInstance()
+ {
+ return false;
+ }
- public Pointcut getPointcut()
- {
- // return a pointcut that matches all methods
- return Pointcut.TRUE;
- }
-
- public void setMessage(String msg)
- {
- advice.setMessage(msg);
- }
+ public Pointcut getPointcut()
+ {
+ // return a pointcut that matches all methods
+ return Pointcut.TRUE;
+ }
+
+ public void setMessage(String msg)
+ {
+ advice.setMessage(msg);
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleBean.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleBean.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleBean.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleBean.java Tue Feb 26 06:37:47 2008
@@ -31,67 +31,67 @@
// <i>final</i> class which CGLIB simply cannot generate a subclass of.
public class SimpleBean implements SimpleInterface, ConversationAware
{
- private String data;
+ private String data;
- SimpleBean[] thisRefHolder;
- SimpleBean thisRef;
-
- int conversationAwareCount = 0;
-
- public SimpleBean()
- {
- }
-
- public SimpleBean getThis()
- {
- thisRefHolder = new SimpleBean[1];
- thisRefHolder[0] = this;
- thisRef = this;
- return this;
- }
-
- public SimpleBean getThisRef()
- {
- return thisRef;
- }
-
- public SimpleBean[] getThisRefHolder()
- {
- return thisRefHolder;
- }
-
- public String getData()
- {
- return data;
- }
-
- public void setData(String data)
- {
- this.data = data;
- }
-
- public void transactionalMethod()
- {
- }
-
- public void setConversation(Conversation conversation)
- {
- ++conversationAwareCount;
- }
-
- public int getConversationAwareCount()
- {
- return conversationAwareCount;
- }
-
- public void doSomething()
- {
- // TODO Auto-generated method stub
-
- }
-
- public void callback(Runnable callback)
- {
- callback.run();
- }
+ SimpleBean[] thisRefHolder;
+ SimpleBean thisRef;
+
+ int conversationAwareCount = 0;
+
+ public SimpleBean()
+ {
+ }
+
+ public SimpleBean getThis()
+ {
+ thisRefHolder = new SimpleBean[1];
+ thisRefHolder[0] = this;
+ thisRef = this;
+ return this;
+ }
+
+ public SimpleBean getThisRef()
+ {
+ return thisRef;
+ }
+
+ public SimpleBean[] getThisRefHolder()
+ {
+ return thisRefHolder;
+ }
+
+ public String getData()
+ {
+ return data;
+ }
+
+ public void setData(String data)
+ {
+ this.data = data;
+ }
+
+ public void transactionalMethod()
+ {
+ }
+
+ public void setConversation(Conversation conversation)
+ {
+ ++conversationAwareCount;
+ }
+
+ public int getConversationAwareCount()
+ {
+ return conversationAwareCount;
+ }
+
+ public void doSomething()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void callback(Runnable callback)
+ {
+ callback.run();
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleInterface.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleInterface.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/SimpleInterface.java Tue Feb 26 06:37:47 2008
@@ -20,5 +20,5 @@
public interface SimpleInterface
{
- void doSomething();
+ void doSomething();
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java Tue Feb 26 06:37:47 2008
@@ -29,105 +29,105 @@
*/
public class TestConversation extends AbstractDependencyInjectionSpringContextTests implements ConversationBindingListener
{
- protected String[] getConfigLocations()
- {
- return new String[]
- {
- "classpath:testApplicationContext.xml"
- };
- }
-
-
- private int valueBoundCount = 0;
- private int valueUnboundCount = 0;
-
- protected void onSetUp() throws Exception
- {
- super.onSetUp();
-
- LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
- frameworkAdapter.setApplicationContext(applicationContext);
- frameworkAdapter.setConversationMessager(new LogConversationMessager());
+ protected String[] getConfigLocations()
+ {
+ return new String[]
+ {
+ "classpath:testApplicationContext.xml"
+ };
+ }
+
+
+ private int valueBoundCount = 0;
+ private int valueUnboundCount = 0;
+
+ protected void onSetUp() throws Exception
+ {
+ super.onSetUp();
+
+ LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
+ frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
}
- public void testConversation() throws Exception
- {
- DummyBean.callback=this;
- final String BEAN_NAME = "dummyBean";
+ public void testConversation() throws Exception
+ {
+ DummyBean.callback=this;
+ final String BEAN_NAME = "dummyBean";
- // The Spring configuration for dummyBean does not explicitly set a conversation name,
- // so conversation-name = bean-name
- final String CONVERSATION_NAME = BEAN_NAME;
+ // The Spring configuration for dummyBean does not explicitly set a conversation name,
+ // so conversation-name = bean-name
+ final String CONVERSATION_NAME = BEAN_NAME;
- valueBoundCount = 0;
- valueUnboundCount = 0;
+ valueBoundCount = 0;
+ valueUnboundCount = 0;
- /* simple create test */
- DummyBean bean = (DummyBean) applicationContext.getBean(BEAN_NAME);
+ /* simple create test */
+ DummyBean bean = (DummyBean) applicationContext.getBean(BEAN_NAME);
- assertTrue("should be a scoped object", bean instanceof ScopedObject);
+ assertTrue("should be a scoped object", bean instanceof ScopedObject);
- assertFalse("conversation should not have been started yet", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- assertEquals("value bound", 0, valueBoundCount);
- assertEquals("value unbound", 0, valueUnboundCount);
- bean.touch();
- assertEquals("value bound", 1, valueBoundCount);
- assertEquals("value unbound", 0, valueUnboundCount);
- assertTrue("conversation should have been started", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ assertFalse("conversation should not have been started yet", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ assertEquals("value bound", 0, valueBoundCount);
+ assertEquals("value unbound", 0, valueUnboundCount);
+ bean.touch();
+ assertEquals("value bound", 1, valueBoundCount);
+ assertEquals("value unbound", 0, valueUnboundCount);
+ assertTrue("conversation should have been started", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- /* check if correct conversation has been started */
- Conversation conversationHolder = bean.checkCurrentConversation();
- assertNotNull("current conversation", conversationHolder);
- assertEquals("conversation name", CONVERSATION_NAME, conversationHolder.getName());
+ /* check if correct conversation has been started */
+ Conversation conversationHolder = bean.checkCurrentConversation();
+ assertNotNull("current conversation", conversationHolder);
+ assertEquals("conversation name", CONVERSATION_NAME, conversationHolder.getName());
- /* invalidate conversation */
- bean.invalidateSelf();
+ /* invalidate conversation */
+ bean.invalidateSelf();
- assertFalse("conversation should not be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- assertTrue("conversation should be marked invalid", conversationHolder.isInvalid());
- assertEquals("value bound", 1, valueBoundCount);
- assertEquals("value unbound", 1, valueUnboundCount);
+ assertFalse("conversation should not be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ assertTrue("conversation should be marked invalid", conversationHolder.isInvalid());
+ assertEquals("value bound", 1, valueBoundCount);
+ assertEquals("value unbound", 1, valueUnboundCount);
- bean.touch();
- assertTrue("conversation should have been started", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- assertEquals("value bound", 2, valueBoundCount);
+ bean.touch();
+ assertTrue("conversation should have been started", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ assertEquals("value bound", 2, valueBoundCount);
- /* check if a new conversation bean has been created */
- bean.setData("check");
+ /* check if a new conversation bean has been created */
+ bean.setData("check");
- bean.invalidateAndRestartSelf();
+ bean.invalidateAndRestartSelf();
- assertEquals("value bound", 2, valueBoundCount);
- assertEquals("value unbound", 2, valueUnboundCount);
+ assertEquals("value bound", 2, valueBoundCount);
+ assertEquals("value unbound", 2, valueUnboundCount);
- assertTrue("conversation should still be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ assertTrue("conversation should still be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- DummyBean beanNew = (DummyBean) applicationContext.getBean(BEAN_NAME);
+ DummyBean beanNew = (DummyBean) applicationContext.getBean(BEAN_NAME);
- assertNotNull("should have got a new conversation", beanNew);
- assertNull("the conversation is not new", bean.getData());
+ assertNotNull("should have got a new conversation", beanNew);
+ assertNull("the conversation is not new", bean.getData());
- beanNew.touch();
+ beanNew.touch();
- assertEquals("value bound", 3, valueBoundCount);
+ assertEquals("value bound", 3, valueBoundCount);
- /* clear the whole conversation context */
+ /* clear the whole conversation context */
- ConversationManager.getInstance().clearCurrentConversationContext();
+ ConversationManager.getInstance().clearCurrentConversationContext();
- assertEquals("value unbound", 3, valueUnboundCount);
- assertFalse("conversation should not be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
- }
+ assertEquals("value unbound", 3, valueUnboundCount);
+ assertFalse("conversation should not be running", ConversationManager.getInstance().hasConversation(CONVERSATION_NAME));
+ }
- public void valueBound(ConversationBindingEvent event)
- {
- valueBoundCount++;
- }
+ public void valueBound(ConversationBindingEvent event)
+ {
+ valueBoundCount++;
+ }
- public void valueUnbound(ConversationBindingEvent event)
- {
- valueUnboundCount++;
- }
+ public void valueUnbound(ConversationBindingEvent event)
+ {
+ valueUnboundCount++;
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestScope.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestScope.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestScope.java Tue Feb 26 06:37:47 2008
@@ -88,92 +88,92 @@
*/
public class TestScope extends AbstractDependencyInjectionSpringContextTests
{
- protected String[] getConfigLocations()
- {
- return new String[]
- {
- "classpath:org/apache/myfaces/orchestra/conversation/TestScope.xml"
- };
- }
-
- protected void onSetUp() throws Exception
- {
- super.onSetUp();
+ protected String[] getConfigLocations()
+ {
+ return new String[]
+ {
+ "classpath:org/apache/myfaces/orchestra/conversation/TestScope.xml"
+ };
}
-
- public void testFoo() throws Exception {
- // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
- LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
- frameworkAdapter.setApplicationContext(applicationContext);
- frameworkAdapter.setConversationMessager(new LogConversationMessager());
+ protected void onSetUp() throws Exception
+ {
+ super.onSetUp();
+ }
+
+ public void testFoo() throws Exception {
+
+ // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
+ LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
+ frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
- // Get the object from spring. Orchestra should wrap it in a proxy that implements ScopedObject
+ // Get the object from spring. Orchestra should wrap it in a proxy that implements ScopedObject
SimpleBean b1 = (SimpleBean) applicationContext.getBean("unscopedBean");
- assertNotNull(b1);
- assertTrue(b1 instanceof ScopedObject);
+ assertNotNull(b1);
+ assertTrue(b1 instanceof ScopedObject);
- // The proxy also checks any return values, and modifies them so that methods on the target
- // that return the target object actually return the proxy. Tricky! This means that the
- // "method chaining" pattern can work, eg foo.doX().doY().doZ() and all invocations pass
- // through the proxy.
- SimpleBean b1a = b1.getThis();
- assertTrue(b1 == b1a);
- assertTrue(b1 == b1.getThisRef());
-
- // However the proxy cannot completely hide itself. The most obvious way is that the proxy
- // has fields (because it subclasses SimpleBean) but they are not initialised by the call
- // to getThis(), because it is the target object that ran that method, not the proxy.
- assertNull(b1.thisRef);
- assertNull(b1.thisRefHolder);
-
- // And it cannot perform its "ref replacement" trick when the ref is nested inside some
- // more complicated object. Note that this means that when the target object passes its
- // "this" parameter to another object, it is the raw unproxied this that gets passed.
- SimpleBean[] refHolder = b1.getThisRefHolder();
- assertNotNull(refHolder);
- assertFalse(b1 == refHolder[0]);
-
- b1.setData("hello, world");
- String s1 = b1.getData();
- assertEquals("hello, world", s1);
-
- assertEquals(1, b1.getConversationAwareCount());
- }
-
- public void testCorrectConversation() throws Exception
- {
- // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
- LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
- frameworkAdapter.setApplicationContext(applicationContext);
- frameworkAdapter.setConversationMessager(new LogConversationMessager());
+ // The proxy also checks any return values, and modifies them so that methods on the target
+ // that return the target object actually return the proxy. Tricky! This means that the
+ // "method chaining" pattern can work, eg foo.doX().doY().doZ() and all invocations pass
+ // through the proxy.
+ SimpleBean b1a = b1.getThis();
+ assertTrue(b1 == b1a);
+ assertTrue(b1 == b1.getThisRef());
+
+ // However the proxy cannot completely hide itself. The most obvious way is that the proxy
+ // has fields (because it subclasses SimpleBean) but they are not initialised by the call
+ // to getThis(), because it is the target object that ran that method, not the proxy.
+ assertNull(b1.thisRef);
+ assertNull(b1.thisRefHolder);
+
+ // And it cannot perform its "ref replacement" trick when the ref is nested inside some
+ // more complicated object. Note that this means that when the target object passes its
+ // "this" parameter to another object, it is the raw unproxied this that gets passed.
+ SimpleBean[] refHolder = b1.getThisRefHolder();
+ assertNotNull(refHolder);
+ assertFalse(b1 == refHolder[0]);
+
+ b1.setData("hello, world");
+ String s1 = b1.getData();
+ assertEquals("hello, world", s1);
+
+ assertEquals(1, b1.getConversationAwareCount());
+ }
+
+ public void testCorrectConversation() throws Exception
+ {
+ // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
+ LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
+ frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
final SimpleBean b1 = (SimpleBean) applicationContext.getBean("unscopedBean");
- assertNotNull(b1);
+ assertNotNull(b1);
- // We are not within any method of an orchestra bean, so no current bean exists
- Object currentBean = ConversationUtils.getCurrentBean();
- assertNull(currentBean);
-
- b1.callback(new Runnable() {
- public void run()
- {
- // We are within a method of the orchestra bean b1, so it should be the
- // current bean.
- Object currentBean = ConversationUtils.getCurrentBean();
- assertTrue(b1 == currentBean);
- }
- });
- }
-
- public void testPlainBean() throws Exception
- {
- // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
- LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
- frameworkAdapter.setApplicationContext(applicationContext);
- frameworkAdapter.setConversationMessager(new LogConversationMessager());
+ // We are not within any method of an orchestra bean, so no current bean exists
+ Object currentBean = ConversationUtils.getCurrentBean();
+ assertNull(currentBean);
+
+ b1.callback(new Runnable() {
+ public void run()
+ {
+ // We are within a method of the orchestra bean b1, so it should be the
+ // current bean.
+ Object currentBean = ConversationUtils.getCurrentBean();
+ assertTrue(b1 == currentBean);
+ }
+ });
+ }
+
+ public void testPlainBean() throws Exception
+ {
+ // Set up the FrameworkAdapter. This is needed by any ConversationManager operation.
+ LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
+ frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
// The object is proxied by a JDK proxy; this is the default behaviour. It therefore
@@ -183,6 +183,5 @@
assertNotNull(b1);
assertFalse(b1 instanceof SimpleBean);
b1.doSomething();
- }
-
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/spring/TestSpringUtils.java Tue Feb 26 06:37:47 2008
@@ -53,8 +53,8 @@
protected void onTearDown() throws Exception
{
- FrameworkAdapter.setCurrentInstance(null);
- super.onTearDown();
+ FrameworkAdapter.setCurrentInstance(null);
+ super.onTearDown();
}
public void testConversation() throws Exception
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatefulConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatefulConverter.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatefulConverter.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatefulConverter.java Tue Feb 26 06:37:47 2008
@@ -26,41 +26,41 @@
public class StatefulConverter implements Converter, StateHolder
{
- int count = 17;
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
- {
- ++count;
- return value.toUpperCase() + ":" + count;
- }
+ int count = 17;
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+ {
+ ++count;
+ return value.toUpperCase() + ":" + count;
+ }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
- {
- ++count;
- if (value == null)
- return null;
- else
- return value.toString().toUpperCase() + ":" + count;
- }
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+ {
+ ++count;
+ if (value == null)
+ return null;
+ else
+ return value.toString().toUpperCase() + ":" + count;
+ }
- public boolean isTransient()
- {
- return false;
- }
+ public boolean isTransient()
+ {
+ return false;
+ }
- public void restoreState(FacesContext context, Object oldState)
- {
- Object[] state = (Object[]) oldState;
- count = ((Integer) state[0]).intValue();
- }
+ public void restoreState(FacesContext context, Object oldState)
+ {
+ Object[] state = (Object[]) oldState;
+ count = ((Integer) state[0]).intValue();
+ }
- public Object saveState(FacesContext context)
- {
- Object[] state = new Object[1];
- state[0] = new Integer(count);
- return state;
- }
+ public Object saveState(FacesContext context)
+ {
+ Object[] state = new Object[1];
+ state[0] = new Integer(count);
+ return state;
+ }
- public void setTransient(boolean newTransientValue)
- {
- }
+ public void setTransient(boolean newTransientValue)
+ {
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatelessConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatelessConverter.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatelessConverter.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/StatelessConverter.java Tue Feb 26 06:37:47 2008
@@ -26,16 +26,16 @@
public class StatelessConverter implements Converter
{
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
- {
- return value.toUpperCase();
- }
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+ {
+ return value.toUpperCase();
+ }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
- {
- if (value == null)
- return null;
- else
- return value.toString().toUpperCase();
- }
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+ {
+ if (value == null)
+ return null;
+ else
+ return value.toString().toUpperCase();
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java Tue Feb 26 06:37:47 2008
@@ -33,37 +33,37 @@
public class TestSerializableConverter extends AbstractDependencyInjectionSpringContextTests
{
- static class ShaleHandler extends AbstractJsfTestCase
- {
- public ShaleHandler()
- {
- super("none");
- }
-
- public void doSetUp() throws Exception
- {
- this.setUp();
- }
-
- public void doTearDown() throws Exception
- {
- this.tearDown();
- }
- }
-
- ShaleHandler shale = new ShaleHandler();
-
- protected String[] getConfigLocations()
- {
- return new String[]
- {
- "classpath:org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml"
- };
- }
-
- protected void onSetUp() throws Exception
- {
- super.onSetUp();
+ static class ShaleHandler extends AbstractJsfTestCase
+ {
+ public ShaleHandler()
+ {
+ super("none");
+ }
+
+ public void doSetUp() throws Exception
+ {
+ this.setUp();
+ }
+
+ public void doTearDown() throws Exception
+ {
+ this.tearDown();
+ }
+ }
+
+ ShaleHandler shale = new ShaleHandler();
+
+ protected String[] getConfigLocations()
+ {
+ return new String[]
+ {
+ "classpath:org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml"
+ };
+ }
+
+ protected void onSetUp() throws Exception
+ {
+ super.onSetUp();
shale.doSetUp();
LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
@@ -71,82 +71,82 @@
frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
- }
+ }
- protected void onTearDown() throws Exception
- {
- shale.doTearDown();
- super.onTearDown();
- }
-
- static class SpringVariableResolver extends DelegatingVariableResolver
- {
- BeanFactory factory;
- SpringVariableResolver(BeanFactory factory, VariableResolver orig)
- {
- super(orig);
- this.factory = factory;
- }
-
- protected BeanFactory getBeanFactory(FacesContext facesContext)
- {
- return factory;
- }
- }
-
- /**
- * Test saving and restoring of a SerializableConverter that references
- * a Converter object that does not implement StateHolder.
- */
- public void testStateless() throws Exception
- {
- Object result;
-
- // as for testStateful, but converter does not implement StateHolder
- // define a stateful converter
- FacesContext facesContext = FacesContext.getCurrentInstance();
- Application app = facesContext.getApplication();
-
- // DelegatingResolver requires a WebApplicationContext object...
- SpringVariableResolver springResolver = new SpringVariableResolver(applicationContext, app.getVariableResolver());
- app.setVariableResolver(springResolver);
-
- SerializableConverter conv = new SerializableConverter("statelessConverter");
- UIComponent component = null;
- result = conv.getAsObject(facesContext, component, "aabb");
- assertEquals("AABB", result);
-
- Object state = conv.saveState(facesContext);
-
- SerializableConverter conv2 = new SerializableConverter();
- conv2.restoreState(facesContext, state);
- result = conv.getAsObject(facesContext, component, "ccdd");
- assertEquals("CCDD", result);
- }
-
- public void testStateful() throws Exception
- {
- Object result;
-
- // as for testStateful, but converter does not implement StateHolder
- // define a stateful converter
- FacesContext facesContext = FacesContext.getCurrentInstance();
- Application app = facesContext.getApplication();
-
- // DelegatingResolver requires a WebApplicationContext object...
- SpringVariableResolver springResolver = new SpringVariableResolver(applicationContext, app.getVariableResolver());
- app.setVariableResolver(springResolver);
-
- SerializableConverter conv = new SerializableConverter("statefulConverter");
- UIComponent component = null;
- result = conv.getAsObject(facesContext, component, "aabb");
- assertEquals("AABB:18", result);
-
- Object state = conv.saveState(facesContext);
-
- SerializableConverter conv2 = new SerializableConverter();
- conv2.restoreState(facesContext, state);
- result = conv.getAsObject(facesContext, component, "ccdd");
- assertEquals("CCDD:19", result);
- }
+ protected void onTearDown() throws Exception
+ {
+ shale.doTearDown();
+ super.onTearDown();
+ }
+
+ static class SpringVariableResolver extends DelegatingVariableResolver
+ {
+ BeanFactory factory;
+ SpringVariableResolver(BeanFactory factory, VariableResolver orig)
+ {
+ super(orig);
+ this.factory = factory;
+ }
+
+ protected BeanFactory getBeanFactory(FacesContext facesContext)
+ {
+ return factory;
+ }
+ }
+
+ /**
+ * Test saving and restoring of a SerializableConverter that references
+ * a Converter object that does not implement StateHolder.
+ */
+ public void testStateless() throws Exception
+ {
+ Object result;
+
+ // as for testStateful, but converter does not implement StateHolder
+ // define a stateful converter
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ Application app = facesContext.getApplication();
+
+ // DelegatingResolver requires a WebApplicationContext object...
+ SpringVariableResolver springResolver = new SpringVariableResolver(applicationContext, app.getVariableResolver());
+ app.setVariableResolver(springResolver);
+
+ SerializableConverter conv = new SerializableConverter("statelessConverter");
+ UIComponent component = null;
+ result = conv.getAsObject(facesContext, component, "aabb");
+ assertEquals("AABB", result);
+
+ Object state = conv.saveState(facesContext);
+
+ SerializableConverter conv2 = new SerializableConverter();
+ conv2.restoreState(facesContext, state);
+ result = conv.getAsObject(facesContext, component, "ccdd");
+ assertEquals("CCDD", result);
+ }
+
+ public void testStateful() throws Exception
+ {
+ Object result;
+
+ // as for testStateful, but converter does not implement StateHolder
+ // define a stateful converter
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ Application app = facesContext.getApplication();
+
+ // DelegatingResolver requires a WebApplicationContext object...
+ SpringVariableResolver springResolver = new SpringVariableResolver(applicationContext, app.getVariableResolver());
+ app.setVariableResolver(springResolver);
+
+ SerializableConverter conv = new SerializableConverter("statefulConverter");
+ UIComponent component = null;
+ result = conv.getAsObject(facesContext, component, "aabb");
+ assertEquals("AABB:18", result);
+
+ Object state = conv.saveState(facesContext);
+
+ SerializableConverter conv2 = new SerializableConverter();
+ conv2.restoreState(facesContext, state);
+ result = conv.getAsObject(facesContext, component, "ccdd");
+ assertEquals("CCDD:19", result);
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java Tue Feb 26 06:37:47 2008
@@ -25,32 +25,32 @@
public class TestRequestParameterProviderManager extends TestCase
{
- public void testParameterAdding()
- {
- LocalFrameworkAdapter lfa = new LocalFrameworkAdapter();
- lfa.setConversationMessager(new LogConversationMessager());
- lfa.setRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED, Boolean.TRUE);
- FrameworkAdapter.setCurrentInstance(lfa);
- RequestParameterProviderManager man = RequestParameterProviderManager.getInstance();
- man.register(new RequestParameterProvider()
- {
+ public void testParameterAdding()
+ {
+ LocalFrameworkAdapter lfa = new LocalFrameworkAdapter();
+ lfa.setConversationMessager(new LogConversationMessager());
+ lfa.setRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED, Boolean.TRUE);
+ FrameworkAdapter.setCurrentInstance(lfa);
+ RequestParameterProviderManager man = RequestParameterProviderManager.getInstance();
+ man.register(new RequestParameterProvider()
+ {
- public String[] getFields()
- {
- return new String[] {"FIELD"};
- }
+ public String[] getFields()
+ {
+ return new String[] {"FIELD"};
+ }
- public String getFieldValue(String field)
- {
- return "VALUE";
- }
- });
+ public String getFieldValue(String field)
+ {
+ return "VALUE";
+ }
+ });
- assertEquals("http://domain/path?FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path"));
- assertEquals("http://domain/path?ab=cd&FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path?ab=cd"));
- assertEquals("http://domain/path?FIELD=VALUE#", man.encodeAndAttachParameters("http://domain/path#"));
- assertEquals("http://domain/path?FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path#22"));
- assertEquals("http://domain/path?ab=cd&FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path?ab=cd#22"));
- assertEquals("#", man.encodeAndAttachParameters("#"));
- }
+ assertEquals("http://domain/path?FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path"));
+ assertEquals("http://domain/path?ab=cd&FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path?ab=cd"));
+ assertEquals("http://domain/path?FIELD=VALUE#", man.encodeAndAttachParameters("http://domain/path#"));
+ assertEquals("http://domain/path?FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path#22"));
+ assertEquals("http://domain/path?ab=cd&FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path?ab=cd#22"));
+ assertEquals("#", man.encodeAndAttachParameters("#"));
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBean.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBean.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBean.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBean.java Tue Feb 26 06:37:47 2008
@@ -22,25 +22,25 @@
public class TargetBean
{
- private String called;
+ private String called;
- public void initView()
- {
- called="initView";
- }
+ public void initView()
+ {
+ called="initView";
+ }
- public void preRenderView()
- {
- called="preRenderView";
- }
+ public void preRenderView()
+ {
+ called="preRenderView";
+ }
public void preProcess()
{
called="preProcess";
}
- public String getCalled()
- {
- return called;
- }
+ public String getCalled()
+ {
+ return called;
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBeanInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBeanInterface.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBeanInterface.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TargetBeanInterface.java Tue Feb 26 06:37:47 2008
@@ -22,24 +22,25 @@
public class TargetBeanInterface implements ViewController
{
- private String called;
+ private String called;
- public void initView()
- {
- called = "initView";
- }
+ public void initView()
+ {
+ called = "initView";
+ }
- public void preRenderView()
- {
- called = "preRenderView";
- }
+ public void preRenderView()
+ {
+ called = "preRenderView";
+ }
- public String getCalled()
- {
- return called;
- }
+ public String getCalled()
+ {
+ return called;
+ }
- public void preProcess() {
+ public void preProcess()
+ {
called = "preProcess";
}
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestDefaultViewControllerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestDefaultViewControllerNameMapper.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestDefaultViewControllerNameMapper.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestDefaultViewControllerNameMapper.java Tue Feb 26 06:37:47 2008
@@ -24,13 +24,13 @@
public class TestDefaultViewControllerNameMapper extends TestCase
{
- public void testMapViewId()
- {
- DefaultViewControllerNameMapper mapper = new DefaultViewControllerNameMapper();
+ public void testMapViewId()
+ {
+ DefaultViewControllerNameMapper mapper = new DefaultViewControllerNameMapper();
- assertEquals("mainform", mapper.mapViewId("mainform.jsp"));
- assertEquals("userDataPassword", mapper.mapViewId("userData/password.jsp"));
- assertEquals("_requestScope", mapper.mapViewId("requestScope.jsp"));
- assertEquals("_123set", mapper.mapViewId("123set.jsp"));
- }
+ assertEquals("mainform", mapper.mapViewId("mainform.jsp"));
+ assertEquals("userDataPassword", mapper.mapViewId("userData/password.jsp"));
+ assertEquals("_requestScope", mapper.mapViewId("requestScope.jsp"));
+ assertEquals("_123set", mapper.mapViewId("123set.jsp"));
+ }
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestInterfaceViewControllerExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestInterfaceViewControllerExecutor.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestInterfaceViewControllerExecutor.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestInterfaceViewControllerExecutor.java Tue Feb 26 06:37:47 2008
@@ -25,17 +25,17 @@
public class TestInterfaceViewControllerExecutor extends TestCase
{
- public void testInvokes()
- {
- TargetBeanInterface targetBean = new TargetBeanInterface();
+ public void testInvokes()
+ {
+ TargetBeanInterface targetBean = new TargetBeanInterface();
- InterfaceViewControllerExecutor executor = new InterfaceViewControllerExecutor();
+ InterfaceViewControllerExecutor executor = new InterfaceViewControllerExecutor();
- executor.invokeInitView(null, targetBean);
- assertEquals("initView", targetBean.getCalled());
+ executor.invokeInitView(null, targetBean);
+ assertEquals("initView", targetBean.getCalled());
- executor.invokePreRenderView(null, targetBean);
- assertEquals("preRenderView", targetBean.getCalled());
+ executor.invokePreRenderView(null, targetBean);
+ assertEquals("preRenderView", targetBean.getCalled());
executor.invokePreProcess(null, targetBean);
assertEquals("preProcess", targetBean.getCalled());
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestReflectiveViewControllerExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestReflectiveViewControllerExecutor.java?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestReflectiveViewControllerExecutor.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/viewController/TestReflectiveViewControllerExecutor.java Tue Feb 26 06:37:47 2008
@@ -25,17 +25,17 @@
public class TestReflectiveViewControllerExecutor extends TestCase
{
- public void testInvokes()
- {
- TargetBean targetBean = new TargetBean();
+ public void testInvokes()
+ {
+ TargetBean targetBean = new TargetBean();
- ReflectiveViewControllerExecutor executor = new ReflectiveViewControllerExecutor();
+ ReflectiveViewControllerExecutor executor = new ReflectiveViewControllerExecutor();
- executor.invokeInitView(null, targetBean);
- assertEquals("initView", targetBean.getCalled());
+ executor.invokeInitView(null, targetBean);
+ assertEquals("initView", targetBean.getCalled());
- executor.invokePreRenderView(null, targetBean);
- assertEquals("preRenderView", targetBean.getCalled());
+ executor.invokePreRenderView(null, targetBean);
+ assertEquals("preRenderView", targetBean.getCalled());
executor.invokePreProcess(null, targetBean);
assertEquals("preProcess", targetBean.getCalled());
Modified: myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/TestScope.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/TestScope.xml?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/TestScope.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/conversation/TestScope.xml Tue Feb 26 06:37:47 2008
@@ -19,84 +19,84 @@
-->
<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">
-
- <bean id="interceptor" class="org.apache.myfaces.orchestra.conversation.MockAdvisor">
- <property name="message" value="Invoking"/>
- </bean>
+ 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">
+
+ <bean id="interceptor" class="org.apache.myfaces.orchestra.conversation.MockAdvisor">
+ <property name="message" value="Invoking"/>
+ </bean>
<!--
- Force Spring to generate an AOP proxy for the specified beans. This tests Orchestra's proxying
- in the presence of another auto-generated proxy object for the same bean.
-->
- <bean id="proxier" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
- <property name="beanNames">
- <list>
- <value>unscopedBean</value>
- <value>plainBean</value>
- </list>
- </property>
- <property name="interceptorNames">
- <list>
- <value>interceptor</value>
- </list>
- </property>
- </bean>
-
- <bean id="conversationAdvice" class="org.apache.myfaces.orchestra.conversation.MockAdvice">
- <property name="message" value="Conversation Method"/>
- </bean>
-
- <!-- register our custom spring scope -->
- <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
- <property name="scopes">
- <map>
- <entry key="conversation.manual">
- <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
- <property name="timeout" value="30"/>
- <property name="advices">
- <list>
- <ref bean="conversationAdvice"/>
- </list>
- </property>
- </bean>
- </entry>
- <entry key="conversation.access">
- <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
- <property name="lifetime" value="access"/>
- </bean>
- </entry>
- </map>
- </property>
- </bean>
-
-
- <!-- our beans -->
-
- <bean
- name="scopedBean"
- class="org.apache.myfaces.orchestra.conversation.SimpleBean"
- scope="conversation.manual"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
-
- <bean
- name="unscopedBean"
- class="org.apache.myfaces.orchestra.conversation.SimpleBean"
- scope="conversation.manual"
- autowire="byName"/>
-
- <bean
- name="plainBean"
- class="org.apache.myfaces.orchestra.conversation.SimpleBean"
- scope="prototype"/>
+ <bean id="proxier" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
+ <property name="beanNames">
+ <list>
+ <value>unscopedBean</value>
+ <value>plainBean</value>
+ </list>
+ </property>
+ <property name="interceptorNames">
+ <list>
+ <value>interceptor</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="conversationAdvice" class="org.apache.myfaces.orchestra.conversation.MockAdvice">
+ <property name="message" value="Conversation Method"/>
+ </bean>
+
+ <!-- register our custom spring scope -->
+ <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+ <property name="scopes">
+ <map>
+ <entry key="conversation.manual">
+ <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
+ <property name="timeout" value="30"/>
+ <property name="advices">
+ <list>
+ <ref bean="conversationAdvice"/>
+ </list>
+ </property>
+ </bean>
+ </entry>
+ <entry key="conversation.access">
+ <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
+ <property name="lifetime" value="access"/>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+
+ <!-- our beans -->
+
+ <bean
+ name="scopedBean"
+ class="org.apache.myfaces.orchestra.conversation.SimpleBean"
+ scope="conversation.manual"
+ autowire="byName">
+
+ <aop:scoped-proxy/>
+ </bean>
+
+ <bean
+ name="unscopedBean"
+ class="org.apache.myfaces.orchestra.conversation.SimpleBean"
+ scope="conversation.manual"
+ autowire="byName"/>
+
+ <bean
+ name="plainBean"
+ class="org.apache.myfaces.orchestra.conversation.SimpleBean"
+ scope="prototype"/>
</beans>
Modified: myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml?rev=631229&r1=631228&r2=631229&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.xml Tue Feb 26 06:37:47 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,15 +45,15 @@
</property>
</bean>
- <!-- our beans -->
+ <!-- our beans -->
- <bean
- name="statelessConverter"
- class="org.apache.myfaces.orchestra.lib.jsf.StatelessConverter"
- scope="conversation.manual"/>
+ <bean
+ name="statelessConverter"
+ class="org.apache.myfaces.orchestra.lib.jsf.StatelessConverter"
+ scope="conversation.manual"/>
- <bean
- name="statefulConverter"
- class="org.apache.myfaces.orchestra.lib.jsf.StatefulConverter"
- scope="conversation.manual"/>
+ <bean
+ name="statefulConverter"
+ class="org.apache.myfaces.orchestra.lib.jsf.StatefulConverter"
+ 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=631229&r1=631228&r2=631229&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:37:47 2008
@@ -20,42 +20,42 @@
<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"
- xmlns:orchestra="http://myfaces.apache.org/orchestra"
- 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:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:orchestra="http://myfaces.apache.org/orchestra"
+ 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">
- <property name="scopes">
- <map>
- <entry key="conversation.manual">
- <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
- <property name="timeout" value="30"/>
- </bean>
- </entry>
- <entry key="conversation.access">
- <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
- <property name="lifetime" value="access"/>
- </bean>
- </entry>
- </map>
- </property>
- </bean>
+ <!-- register our custom spring scope -->
+ <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+ <property name="scopes">
+ <map>
+ <entry key="conversation.manual">
+ <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
+ <property name="timeout" value="30"/>
+ </bean>
+ </entry>
+ <entry key="conversation.access">
+ <bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
+ <property name="lifetime" value="access"/>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ </bean>
- <!-- our beans -->
+ <!-- our beans -->
- <bean
- name="dummyBean"
- class="org.apache.myfaces.orchestra.conversation.DummyBean"
- scope="conversation.manual"
- autowire="byName">
+ <bean
+ name="dummyBean"
+ class="org.apache.myfaces.orchestra.conversation.DummyBean"
+ scope="conversation.manual"
+ autowire="byName">
- <aop:scoped-proxy/>
- </bean>
+ <aop:scoped-proxy/>
+ </bean>
</beans>