Author: berndf
Date: Thu Jan 31 00:01:05 2008
New Revision: 617037
URL: http://svn.apache.org/viewvc?rev=617037&view=rev
Log:
spring-deployment: add no-arg constructor to AvalonApplicationContext
Added:
james/server/trunk/spring-deployment/src/main/config/spring-beans.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/beans-base-config.xml
Removed:
james/server/trunk/spring-deployment/src/main/config/beans-base-config.xml
Modified:
james/server/trunk/spring-deployment/HOW-TO.txt
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
Modified: james/server/trunk/spring-deployment/HOW-TO.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/HOW-TO.txt?rev=617037&r1=617036&r2=617037&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/HOW-TO.txt (original)
+++ james/server/trunk/spring-deployment/HOW-TO.txt Thu Jan 31 00:01:05 2008
@@ -21,7 +21,7 @@
if you are not root/Administrator on your machine or have a mail server
already running on some privileged port,
it is recommended to change in file
- spring-integration/spring-deployment/src/main/config/beans-base-config.xml
+ spring-integration/spring-deployment/src/main/config/spring-beans.xml
line
<!--<ref bean="exampleConfigurationInterceptor" />-->
into
@@ -36,7 +36,7 @@
4. JMX
-Enabling: Uncomment the JMX section in beans-base-config.xml
+Enabling: Uncomment the JMX section in spring-beans.xml
Connecting: The default connection URL defined in this file is
service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver
You can use this URL on the command line under Java 1.5 (or newer) like this:
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java?rev=617037&r1=617036&r2=617037&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
Thu Jan 31 00:01:05 2008
@@ -19,18 +19,14 @@
package org.apache.james.container.spring;
import org.apache.james.container.spring.beanfactory.AvalonApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
/**
* Bootstraps James using a Spring container
*/
-public class Main {
+public class Main {
public static void main(String[] args) {
- Resource containerResource = new
ClassPathResource("beans-base-config.xml");
- Resource applicationResource = new
ClassPathResource("james-assembly.xml");
- AvalonApplicationContext context = new
AvalonApplicationContext(containerResource, applicationResource);
+ new AvalonApplicationContext();
}
}
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java?rev=617037&r1=617036&r2=617037&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
Thu Jan 31 00:01:05 2008
@@ -24,6 +24,7 @@
import
org.springframework.context.support.AbstractRefreshableApplicationContext;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
+import org.springframework.core.io.ClassPathResource;
import java.io.IOException;
@@ -35,9 +36,25 @@
*/
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");
+
private Resource containerConfigurationResource;
private Resource applicationConfigurationResource;
+ /**
+ * configuration-by-convention constructor, tries to find default config
files on classpath
+ */
+ public AvalonApplicationContext() {
+ this(RESOURCE_SPRING_BEANS, RESOURCE_JAMES_ASSEMBLY);
+ }
+
+
+ public AvalonApplicationContext(Resource containerConfigurationResource,
+ Resource applicationConfigurationResource)
{
+ this(null, containerConfigurationResource,
applicationConfigurationResource);
+ }
+
public AvalonApplicationContext(ApplicationContext parent,
Resource containerConfigurationResource,
Resource applicationConfigurationResource)
{
@@ -45,11 +62,6 @@
this.containerConfigurationResource = containerConfigurationResource;
this.applicationConfigurationResource =
applicationConfigurationResource;
refresh();
- }
-
- public AvalonApplicationContext(Resource containerConfigurationResource,
- Resource applicationConfigurationResource)
{
- this(null, containerConfigurationResource,
applicationConfigurationResource);
}
protected void loadBeanDefinitions(DefaultListableBeanFactory
defaultListableBeanFactory) throws IOException, BeansException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
