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 er...@apache.org on 2011/08/17 16:29:32 UTC

svn commit: r1158740 - in /james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james: spring-mailbox-authenticator.xml spring-mailbox-locker.xml spring-mailbox-util.xml spring-mailbox.xml

Author: eric
Date: Wed Aug 17 14:29:32 2011
New Revision: 1158740

URL: http://svn.apache.org/viewvc?rev=1158740&view=rev
Log:
Split the util into authenticator and locker: better reflect the goals, allows more fine-grained overwriting by module users (MAILBOX-76)

Added:
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml
      - copied, changed from r1158689, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-util.xml
Removed:
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-util.xml
Modified:
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml

Added: james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml?rev=1158740&view=auto
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml (added)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml Wed Aug 17 14:29:32 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.mailbox.spring.AnonymousAuthenticator"/>
+
+</beans>

Copied: james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml (from r1158689, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-util.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml?p2=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-util.xml&r1=1158689&r2=1158740&rev=1158740&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-util.xml (original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml Wed Aug 17 14:29:32 2011
@@ -24,10 +24,9 @@
           http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
 
     <!-- 
-      Mailbox Util
+      Mailbox Locker
      -->
 
     <bean id="jvm-locker" class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
-    <bean id="authenticator" class="org.apache.james.mailbox.spring.AnonymousAuthenticator"/>
 
 </beans>

Modified: james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml?rev=1158740&r1=1158739&r2=1158740&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml (original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml Wed Aug 17 14:29:32 2011
@@ -31,7 +31,8 @@
       Mailbox Managers
      -->
      
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-util.xml" />
+    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-locker.xml" />
+    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-authenticator.xml" />
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-lucene.xml" />
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-jpa.xml" />
 <!-- 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org