james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r675893 - in /james/server/trunk: avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/ avalon-spring-bridge-library/s...
Date Fri, 11 Jul 2008 09:51:50 GMT
Author: bago
Date: Fri Jul 11 02:51:48 2008
New Revision: 675893

URL: http://svn.apache.org/viewvc?rev=675893&view=rev
Log:
Made avalon-spring-bridge classes JAMES agnostic.
Moved AvalonWebApplicationContext back to the spring-deployment module (it is JAMES specific).

Added:
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
      - copied unchanged from r675877, james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
Removed:
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
Modified:
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/logging/log4j/LoggerToComponentMapper.java
    james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
(original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
Fri Jul 11 02:51:48 2008
@@ -32,7 +32,7 @@
 import java.util.List;
 
 /**
- * loads the well-known classic James configuration file
+ * loads the well-known classic avalon/phoenix configuration file
  *
   * TODO make this thing be based on Resource class and inject resource.getInputStream()
into InputSource 
  */

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java
(original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java
Fri Jul 11 02:51:48 2008
@@ -31,16 +31,20 @@
 public class AvalonContext implements Context {
 
     private String applicationHome = null;
-
+    private String applicationName = null;
 
     public void setApplicationHome(String applicationHome) {
         this.applicationHome = applicationHome;
     }
+    
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
 
     public Object get(Object key) throws ContextException {
         if( BlockContext.APP_NAME.equals( key ) )
         {
-            return "James Server";
+            return applicationName;
         }
         else if( BlockContext.APP_HOME_DIR.equals( key ) )
         {
@@ -48,7 +52,7 @@
         }
         else if( BlockContext.NAME.equals( key ) )
         {
-            return "James Server";
+            return "Avalon Context";
         }
         else
         {

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
(original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
Fri Jul 11 02:51:48 2008
@@ -33,7 +33,7 @@
 import java.util.Iterator;
 
 /**
- * provides a Avalon-style service manager to all James components
+ * provides a Avalon-style service manager to all components
  */
 public class DefaultServiceManagerFactory implements ApplicationContextAware, ServiceManagerFactory
{
 
@@ -115,7 +115,7 @@
 	}
 
     /**
-     * for replacing services without changing vanilla Avalon james-assembly.xml
+     * for replacing services without changing vanilla Avalon/Phoenix assembly.xml
      * @param replacements - Map<String, String>, the key indicating the service reference
to be replaced, the value
      * indicating the replacement bean
      */

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=675893&r1=675892&r2=675893&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:51:48 2008
@@ -32,7 +32,7 @@
  * loads an Avalon/Phoenix configuration.
  * this is done by using a two step approach:
  * 1. loading the avalon mocking beans from a spring xml beans configuration
- * 2. loading the James beans from a james-assembly.xml 
+ * 2. loading the avalon application beans from the assembly.xml
  */
 public class AvalonApplicationContext extends AbstractRefreshableApplicationContext {
 

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
(original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
Fri Jul 11 02:51:48 2008
@@ -19,7 +19,7 @@
 package org.apache.james.container.spring.beanfactory;
 
 /**
- * content of a "provide" XML element from an james-assembly file.
+ * content of a "provide" XML element from an assembly file.
  * occurs within a block element like this:
  *     <provide name="domainlist" role="org.apache.james.services.DomainList"/>
  *

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/logging/log4j/LoggerToComponentMapper.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/logging/log4j/LoggerToComponentMapper.java?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/logging/log4j/LoggerToComponentMapper.java
(original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/logging/log4j/LoggerToComponentMapper.java
Fri Jul 11 02:51:48 2008
@@ -19,14 +19,13 @@
 package org.apache.james.container.spring.logging.log4j;
 
 import org.apache.avalon.framework.logger.Logger;
-import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.PropertyConfigurator;
-import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
 
-import java.util.Properties;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Properties;
 
 /**
  * simple default implementation. change the log4j configuration file to change specific
logging behavior

Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=675893&r1=675892&r2=675893&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Fri Jul 11
02:51:48 2008
@@ -92,7 +92,8 @@
     <bean id="JamesResourceLoader" class="org.apache.james.container.spring.adaptor.JamesResourceLoader"
/>
 
     <bean id="avalonContext" class="org.apache.james.container.spring.adaptor.AvalonContext"
>
-        <property name="applicationHome" value="data" />
+        <property name="applicationHome" value="data" />
+        <property name="applicationName" value="Apache JAMES Server" />
     </bean>
 
     <!--



---------------------------------------------------------------------
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