james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r675912 - in /james/server/trunk: ./ avalon-spring-bridge-library/src/main/config/ avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/ avalon-spring-bridge-library/src/main/resources/ avalon-spring-brid...
Date Fri, 11 Jul 2008 10:41:36 GMT
Author: bago
Date: Fri Jul 11 03:41:35 2008
New Revision: 675912

URL: http://svn.apache.org/viewvc?rev=675912&view=rev
Log:
Ant build fixes for the avalon-spring-bridge-library module.

Added:
    james/server/trunk/avalon-spring-bridge-library/src/main/config/
    james/server/trunk/avalon-spring-bridge-library/src/main/resources/
    james/server/trunk/avalon-spring-bridge-library/src/test/
    james/server/trunk/avalon-spring-bridge-library/src/test/config/
    james/server/trunk/avalon-spring-bridge-library/src/test/java/
    james/server/trunk/avalon-spring-bridge-library/src/test/java/org/
      - copied from r675877, james/server/trunk/avalon-spring-bridge-library/src/main/test/org/
    james/server/trunk/avalon-spring-bridge-library/src/test/resources/
Removed:
    james/server/trunk/avalon-spring-bridge-library/src/main/test/org/
Modified:
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
    james/server/trunk/build-tools/base-build.xml
    james/server/trunk/include.properties

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=675912&r1=675911&r2=675912&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 03:41:35 2008
@@ -21,10 +21,10 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.support.AbstractRefreshableApplicationContext;
 import org.springframework.context.ApplicationContext;
-import org.springframework.core.io.Resource;
+import org.springframework.context.support.AbstractRefreshableApplicationContext;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 
@@ -45,18 +45,20 @@
     /**
      * configuration-by-convention constructor, tries to find default config files on classpath
      */
-    public AvalonApplicationContext() {
-        this(SPRING_BEANS_CONF, PHOENIX_ASSEMBLY_CONF);
+    public static AvalonApplicationContext newAvalonApplicationContext() {
+        return newAvalonApplicationContext(SPRING_BEANS_CONF, PHOENIX_ASSEMBLY_CONF);
     }
     
-    public AvalonApplicationContext(String containerConf, String applicationConf) {
-        this(new ClassPathResource(containerConf), new ClassPathResource(applicationConf));
+    public static AvalonApplicationContext newAvalonApplicationContext(String containerConf,
String applicationConf) {
+        return newAvalonApplicationContext(new ClassPathResource(containerConf), new ClassPathResource(applicationConf));
     }
     
     
-    public AvalonApplicationContext(Resource containerConfigurationResource,
+    public static AvalonApplicationContext newAvalonApplicationContext(Resource containerConfigurationResource,
                                     Resource applicationConfigurationResource) {
-        this(null, containerConfigurationResource, applicationConfigurationResource);
+        AvalonApplicationContext result = new AvalonApplicationContext(null, containerConfigurationResource,
applicationConfigurationResource);
+        result.refresh();
+        return result;
     }
 
     public AvalonApplicationContext(ApplicationContext parent, 
@@ -65,7 +67,6 @@
         super(parent);
         this.containerConfigurationResource = containerConfigurationResource;
         this.applicationConfigurationResource = applicationConfigurationResource;
-        refresh();
     }
 
     protected void loadBeanDefinitions(DefaultListableBeanFactory defaultListableBeanFactory)
throws IOException, BeansException {

Modified: james/server/trunk/build-tools/base-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?rev=675912&r1=675911&r2=675912&view=diff
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Fri Jul 11 03:41:35 2008
@@ -226,6 +226,9 @@
                     <include name="${jackrabbit-rmi.jar}"/>
                     <include name="${jcr.jar}"/>
                     <include name="${base-mailet.jar}"/>
+                    <include name="${spring.jar}"/>     
+                    <include name="${log4j.jar}"/>     
+                    <include name="${avalon-phoenix.jar}"/>     
                 </fileset>   
             </path>   
             <path id='classpath.base.test'>  

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=675912&r1=675911&r2=675912&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Fri Jul 11 03:41:35 2008
@@ -94,6 +94,20 @@
 path.lib.jackrabbit=org.apache.jackrabbit/jars
 path.lib.jcr=javax.jcr/jars
 path.lib.backport-util-concurrent=backport-util-concurrent/jars
+# Spring bridge
+path.lib.spring=org.springframework/jars
+path.lib.avalon-phoenix=avalon-phoenix/jars
+path.lib.log4j=log4j/jars
+
+# ----- Spring -----
+jarname.spring.jar=spring-2.0.jar
+spring.jar=${path.lib.spring}/${jarname.spring.jar}
+
+jarname.avalon-phoenix.jar=avalon-phoenix-client-4.2-SNAPSHOT.jar
+avalon-phoenix.jar=${path.lib.avalon-phoenix}/${jarname.avalon-phoenix.jar}
+
+jarname.log4j.jar=log4j-1.2.14.jar
+log4j.jar=${path.lib.log4j}/${jarname.log4j.jar}
 
 # --------------------------------------------------
 #                REQUIRED LIBRARIES



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message