svn commit: r675887 - in /james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring: Main.java beanfactory/AvalonApplicationContext.java

[bago]

Author: bago
Date: Fri Jul 11 02:31:44 2008
New Revision: 675887

URL: http://svn.apache.org/viewvc?rev=675887&view=rev
Log:
Made AvalonApplicationContext application agnostic (moved james references to 
JAMES Main).

Modified:
    
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/Main.java
    
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java

Modified: 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/Main.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/Main.java?rev=675887&r1=675886&r2=675887&view=diff
==============================================================================
--- 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/Main.java
 (original)
+++ 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/Main.java
 Fri Jul 11 02:31:44 2008
@@ -26,7 +26,7 @@
 public class Main {    
 
     public static void main(String[] args) {
-        new AvalonApplicationContext();
+        new AvalonApplicationContext("spring-beans.xml", "james-assembly.xml");
     }
 
 }

Modified: 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java?rev=675887&r1=675886&r2=675887&view=diff
==============================================================================
--- 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
 (original)
+++ 
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
 Fri Jul 11 02:31:44 2008
@@ -36,8 +36,8 @@
  */
 public class AvalonApplicationContext extends 
AbstractRefreshableApplicationContext {
 
-    public static final Resource RESOURCE_SPRING_BEANS = new 
ClassPathResource("spring-beans.xml");
-    public static final Resource RESOURCE_JAMES_ASSEMBLY = new 
ClassPathResource("james-assembly.xml");
+    public static final String SPRING_BEANS_CONF = "spring-beans.xml";
+    public static final String PHOENIX_ASSEMBLY_CONF = "assembly.xml";
     
     private Resource containerConfigurationResource;
     private Resource applicationConfigurationResource;
@@ -46,7 +46,11 @@
      * configuration-by-convention constructor, tries to find default config 
files on classpath
      */
     public AvalonApplicationContext() {
-        this(RESOURCE_SPRING_BEANS, RESOURCE_JAMES_ASSEMBLY);
+        this(SPRING_BEANS_CONF, PHOENIX_ASSEMBLY_CONF);
+    }
+    
+    public AvalonApplicationContext(String containerConf, String 
applicationConf) {
+        this(new ClassPathResource(containerConf), new 
ClassPathResource(applicationConf));
     }
     
     



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]