You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/27 12:28:02 UTC
svn commit: r903613 - in /james/server/trunk/spring-deployment/src/main:
config/james/ java/org/apache/james/container/spring/
java/org/apache/james/container/spring/adaptor/
Author: norman
Date: Wed Jan 27 11:28:01 2010
New Revision: 903613
URL: http://svn.apache.org/viewvc?rev=903613&view=rev
Log:
* Move FileSystemBridge in a other package and rename it to SpringFileSystem
* Move database config stuff to an extra properties file to not force normal users to struggle with spring-beans.xml
Added:
james/server/trunk/spring-deployment/src/main/config/james/database.properties
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
- copied, changed from r902754, james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
Removed:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Added: james/server/trunk/spring-deployment/src/main/config/james/database.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/database.properties?rev=903613&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/database.properties (added)
+++ james/server/trunk/spring-deployment/src/main/config/james/database.properties Wed Jan 27 11:28:01 2010
@@ -0,0 +1,10 @@
+
+# Use derby as default
+database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+database.url=jdbc:derby:../var/derbydb;create=true
+database.username=app
+database.password=app
+
+# Supported adapters are:
+# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE
+vendorAdapter.database=DERBY
\ No newline at end of file
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=903613&r1=903612&r2=903613&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 Wed Jan 27 11:28:01 2010
@@ -79,6 +79,10 @@
<property name="configurationResource" value="classpath:james-config.xml" />
</bean>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name = "location" value="classpath:database.properties"/>
+ </bean>
+
<bean
class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
<property name="logProvider" ref="logProvider" />
@@ -164,7 +168,7 @@
<!-- The context FileSystem implementation -->
- <bean id="filesystem" class="org.apache.james.container.spring.adaptor.FileSystemBridge" />
+ <bean id="filesystem" class="org.apache.james.container.spring.SpringFileSystem" />
<!-- The VirtualUserTable Management block -->
<bean id="virtualusertablemanagementservice"
@@ -176,9 +180,6 @@
<bean id="defaultvirtualusertable" name="virtualusertablemanagement" class="org.apache.james.impl.vut.DefaultVirtualUserTable" />
- <!--
- ########################################################################
- -->
<!-- The context domainlist implementation -->
<bean id="domainlist" class="org.apache.james.domain.XMLDomainList" />
@@ -244,11 +245,26 @@
<constructor-arg index="2" ref="entityManagerFactory"/>
</bean>
+ <bean id="domainlistmanagement" class="org.apache.james.management.impl.DomainListManagement" />
+
+
+ <!-- The Time Scheduler block -->
+ <bean id="scheduler" class="java.util.concurrent.Executors" factory-method="newScheduledThreadPool">
+ <constructor-arg value="20"/>
+ </bean>
+
+ <!-- The DataSourceSelector block -->
+ <bean id="database-connections" class="org.apache.james.container.spring.SpringDataSourceSelector"/>
+
+
+
+ <!-- Database related beans -->
+
<bean id="maildb" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
- <property name="url" value="jdbc:derby:../var/derbydb;create=true" />
- <property name="username" value="app" />
- <property name="password" value="app" />
+ <property name="driverClassName" value="${database.driverClassName}" />
+ <property name="url" value="${database.url}" />
+ <property name="username" value="${database.username}" />
+ <property name="password" value="${database.password}" />
</bean>
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -257,23 +273,10 @@
</bean>
<bean id="vendorAdapter" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
- <property name="database" value="DERBY"/>
+ <property name="database" value="${vendorAdapter.database}"/>
<!-- set this to true for debugging purposes -->
<property name="showSql" value="false"/>
</bean>
- <!--
- ####################################################################
- -->
-
- <bean id="domainlistmanagement" class="org.apache.james.management.impl.DomainListManagement" />
-
-
- <!-- The Time Scheduler block -->
- <bean id="scheduler" class="java.util.concurrent.Executors" factory-method="newScheduledThreadPool">
- <constructor-arg value="20"/>
- </bean>
-
- <!-- The DataSourceSelector block -->
- <bean id="database-connections" class="org.apache.james.container.spring.SpringDataSourceSelector"/>
-
+
+ <!-- #################################################################### -->
</beans>
\ No newline at end of file
Copied: james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java (from r902754, james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java?p2=james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java&p1=james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java&r1=902754&r2=903613&rev=903613&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java (original)
+++ james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java Wed Jan 27 11:28:01 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.adaptor;
+package org.apache.james.container.spring;
import org.apache.james.services.FileSystem;
import org.springframework.context.ResourceLoaderAware;
@@ -27,7 +27,7 @@
import java.io.IOException;
import java.io.InputStream;
-public class FileSystemBridge implements FileSystem, ResourceLoaderAware {
+public class SpringFileSystem implements FileSystem, ResourceLoaderAware {
public File getBasedir() throws FileNotFoundException {
return new File("./../");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org