Author: berndf
Date: Sun Feb 3 02:05:20 2008
New Revision: 617970
URL: http://svn.apache.org/viewvc?rev=617970&view=rev
Log:
spring-deployment: prepare adding config files for WAR and OSGi deployments
Added:
james/server/trunk/spring-deployment/src/main/config/james/
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
- copied unchanged from r614166,
james/server/trunk/spring-deployment/src/main/config/james-assembly.xml
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
- copied unchanged from r614166,
james/server/trunk/spring-deployment/src/main/config/james-config.xml
james/server/trunk/spring-deployment/src/main/config/james/james-fetchmail.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/james-fetchmail.xml
james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml
- copied unchanged from r615128,
james/server/trunk/spring-deployment/src/main/config/james-jms.xml
james/server/trunk/spring-deployment/src/main/config/james/james-listmanager.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/james-listmanager.xml
james/server/trunk/spring-deployment/src/main/config/james/james-liststores.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/james-liststores.xml
james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/james-smtphandlerchain.xml
james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/log4j.properties
james/server/trunk/spring-deployment/src/main/config/james/mailboxManagerSqlResources.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/mailboxManagerSqlResources.xml
james/server/trunk/spring-deployment/src/main/config/james/miResources.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/miResources.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
- copied unchanged from r617037,
james/server/trunk/spring-deployment/src/main/config/spring-beans.xml
james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml
- copied unchanged from r614134,
james/server/trunk/spring-deployment/src/main/config/sqlResources.xml
Removed:
james/server/trunk/spring-deployment/src/main/config/james-assembly.xml
james/server/trunk/spring-deployment/src/main/config/james-config.xml
james/server/trunk/spring-deployment/src/main/config/james-fetchmail.xml
james/server/trunk/spring-deployment/src/main/config/james-jms.xml
james/server/trunk/spring-deployment/src/main/config/james-listmanager.xml
james/server/trunk/spring-deployment/src/main/config/james-liststores.xml
james/server/trunk/spring-deployment/src/main/config/james-smtphandlerchain.xml
james/server/trunk/spring-deployment/src/main/config/log4j.properties
james/server/trunk/spring-deployment/src/main/config/mailboxManagerSqlResources.xml
james/server/trunk/spring-deployment/src/main/config/miResources.xml
james/server/trunk/spring-deployment/src/main/config/spring-beans.xml
james/server/trunk/spring-deployment/src/main/config/sqlResources.xml
Modified:
james/server/trunk/spring-deployment/build.xml
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
Modified: james/server/trunk/spring-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=617970&r1=617969&r2=617970&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Sun Feb 3 02:05:20 2008
@@ -198,7 +198,7 @@
<path id="runclasspath">
<path refid="classpath.all.libs" />
- <pathelement location="${basedir}/src/main/config/"/>
+ <pathelement location="${basedir}/src/main/config/james/"/>
<pathelement location="${spring-deployment.target.jar}"/>
</path>
@@ -306,7 +306,7 @@
<target name="package-aquire-config-files" >
<copy todir="${spring-deployment.target.config.dir}" flatten="true">
- <fileset dir="${basedir}/src/main/config">
+ <fileset dir="${basedir}/src/main/config/james">
<include name="*.xml" />
<include name="*.properties" />
</fileset>
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=617970&r1=617969&r2=617970&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
Sun Feb 3 02:05:20 2008
@@ -65,12 +65,16 @@
}
protected void loadBeanDefinitions(DefaultListableBeanFactory
defaultListableBeanFactory) throws IOException, BeansException {
+ loadAvalonBasedBeanDefinitions(defaultListableBeanFactory,
containerConfigurationResource, applicationConfigurationResource);
+ }
+
+ public static void
loadAvalonBasedBeanDefinitions(DefaultListableBeanFactory
defaultListableBeanFactory, Resource containerConfigurationResource, Resource
applicationConfigurationResource) {
XmlBeanDefinitionReader containerBeanDefinitionReader = new
XmlBeanDefinitionReader(defaultListableBeanFactory);
int containerBeanCount =
containerBeanDefinitionReader.loadBeanDefinitions(containerConfigurationResource);
AvalonBeanDefinitionReader applicationBeanDefinitionReader = new
AvalonBeanDefinitionReader(defaultListableBeanFactory);
int applicationBeanCount =
applicationBeanDefinitionReader.loadBeanDefinitions(applicationConfigurationResource);
-
+
int totalBeanCount = containerBeanCount + applicationBeanCount;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
