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/11 13:37:04 UTC
svn commit: r564899 - in /myfaces/orchestra/trunk:
core/src/main/java/org/apache/myfaces/orchestra/conversation/
core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/
core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/ core15/...
Author: imario
Date: Sat Aug 11 04:37:03 2007
New Revision: 564899
URL: http://svn.apache.org/viewvc?view=rev&rev=564899
Log:
reduced dependency on spring internals
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java Sat Aug 11 04:37:03 2007
@@ -48,7 +48,7 @@
conversation.invalidateAndRestart();
- return FrameworkAdapter.getInstance().getApplicationContext().getBean(name);
+ return FrameworkAdapter.getInstance().getBean(name);
}
/**
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java Sat Aug 11 04:37:03 2007
@@ -104,7 +104,7 @@
if (restart != null && restart.booleanValue())
{
- FrameworkAdapter.getInstance().getApplicationContext().getBean(conversationName);
+ FrameworkAdapter.getInstance().getBean(conversationName);
if (restartAction != null)
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java Sat Aug 11 04:37:03 2007
@@ -22,8 +22,6 @@
*/
package org.apache.myfaces.orchestra.frameworkAdapter;
-import org.springframework.context.ConfigurableApplicationContext;
-
import java.io.IOException;
/**
@@ -51,7 +49,7 @@
public String getRequestContextPath();
- public ConfigurableApplicationContext getApplicationContext();
-
public void redirect(String url) throws IOException;
+
+ public Object getBean(String name);
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java Sat Aug 11 04:37:03 2007
@@ -206,7 +206,7 @@
throw new IllegalStateException(ISE_MESSAGE);
}
- public ConfigurableApplicationContext getApplicationContext()
+ protected ConfigurableApplicationContext getApplicationContext()
{
// TODO: What about portlets ?
ServletContext servletContext = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
@@ -220,5 +220,10 @@
context.getExternalContext().redirect(url);
context.responseComplete();
+ }
+
+ public Object getBean(String name)
+ {
+ return getApplicationContext().getBean(name);
}
}
Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java Sat Aug 11 04:37:03 2007
@@ -107,7 +107,7 @@
return "/test";
}
- public ConfigurableApplicationContext getApplicationContext()
+ protected ConfigurableApplicationContext getApplicationContext()
{
return configurableApplicationContext;
}
@@ -119,5 +119,10 @@
public void redirect(String url) throws IOException
{
+ }
+
+ public Object getBean(String name)
+ {
+ return getApplicationContext().getBean(name);
}
}
Modified: myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java?view=diff&rev=564899&r1=564898&r2=564899
==============================================================================
--- myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java Sat Aug 11 04:37:03 2007
@@ -107,7 +107,7 @@
return "/test";
}
- public ConfigurableApplicationContext getApplicationContext()
+ protected ConfigurableApplicationContext getApplicationContext()
{
return configurableApplicationContext;
}
@@ -119,5 +119,10 @@
public void redirect(String url) throws IOException
{
+ }
+
+ public Object getBean(String name)
+ {
+ return getApplicationContext().getBean(name);
}
}