james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1158789 - in /james/app/trunk/src/main/config/james: ./ META-INF/org/ META-INF/org/apache/ META-INF/org/apache/james/ context/
Date Wed, 17 Aug 2011 15:57:04 GMT
Author: eric
Date: Wed Aug 17 15:57:03 2011
New Revision: 1158789

URL: http://svn.apache.org/viewvc?rev=1158789&view=rev
Log:
Use spring-mailbox module definitions (JAMES-1295)

Added:
    james/app/trunk/src/main/config/james/META-INF/org/
    james/app/trunk/src/main/config/james/META-INF/org/apache/
    james/app/trunk/src/main/config/james/META-INF/org/apache/james/
    james/app/trunk/src/main/config/james/META-INF/org/apache/james/spring-mailbox-authenticator.xml
Removed:
    james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml
    james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml
    james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml
    james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml
    james/app/trunk/src/main/config/james/database.properties
Modified:
    james/app/trunk/src/main/config/james/context/james-server-context.xml

Added: james/app/trunk/src/main/config/james/META-INF/org/apache/james/spring-mailbox-authenticator.xml
URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/META-INF/org/apache/james/spring-mailbox-authenticator.xml?rev=1158789&view=auto
==============================================================================
--- james/app/trunk/src/main/config/james/META-INF/org/apache/james/spring-mailbox-authenticator.xml
(added)
+++ james/app/trunk/src/main/config/james/META-INF/org/apache/james/spring-mailbox-authenticator.xml
Wed Aug 17 15:57:03 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+
+    <!-- 
+      Mailbox Authenticator
+     -->
+
+    <bean id="authenticator" class="org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator"/>
+
+</beans>

Modified: james/app/trunk/src/main/config/james/context/james-server-context.xml
URL: http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-server-context.xml?rev=1158789&r1=1158788&r2=1158789&view=diff
==============================================================================
--- james/app/trunk/src/main/config/james/context/james-server-context.xml (original)
+++ james/app/trunk/src/main/config/james/context/james-server-context.xml Wed Aug 17 15:57:03
2011
@@ -290,11 +290,7 @@
     <bean class="org.apache.james.container.spring.bean.factorypostprocessor.MailboxConfigurationBeanFactoryPostProcessor"/>
      
     <bean id="locker" class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
-    <bean id="authenticator" class="org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator"/>
-    <import resource="james-mailbox-jpa-context.xml" />
-    <import resource="james-mailbox-jcr-context.xml" />
-    <import resource="james-mailbox-maildir-context.xml" />
-    <import resource="james-mailbox-memory-context.xml" />
+    <import resource="classpath:META-INF/org/apache/james/spring-mailbox.xml" />
 
     <!-- 
       Mailbox Copier
@@ -314,7 +310,7 @@
           
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="ignoreUnresolvablePlaceholders" value="true"/>
-        <property name ="location" value="file://conf/database.properties"/>
+        <property name ="location" value="classpath:META-INF/org/apache/james/database.properties"/>
     </bean>
     <bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName" value="${database.driverClassName}" />
@@ -332,7 +328,7 @@
         <!-- set this to true for debugging purposes -->
         <property name="showSql" value="false"/>
     </bean>
-
+    
     <!-- 
     ===========================================================================
        JMX



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