Author: btellier Date: Tue Dec 15 14:04:37 2015 New Revision: 1720167 URL: http://svn.apache.org/viewvc?rev=1720167&view=rev Log: JAMES-1615 As a user I should be able to configure the SieveRepository used using Spring - contributed by Erwan Guyomarc'h
Added: james/project/trunk/dockerfiles/run/spring/destination/conf/sieverepository.xml james/project/trunk/server/app/src/main/resources/sieverepository-template.xml Modified: james/project/trunk/server/container/spring/src/main/resources/META-INF/spring/loaders-context.xml james/project/trunk/server/data/data-api/src/main/resources/sieverepository.xml james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java Added: james/project/trunk/dockerfiles/run/spring/destination/conf/sieverepository.xml URL: http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/sieverepository.xml?rev=1720167&view=auto ============================================================================== --- james/project/trunk/dockerfiles/run/spring/destination/conf/sieverepository.xml (added) +++ james/project/trunk/dockerfiles/run/spring/destination/conf/sieverepository.xml Tue Dec 15 14:04:37 2015 @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- + 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. + --> + +<!-- See http://james.apache.org/server/3/config.html for usage --> +<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository"> +</sieverepository> Added: james/project/trunk/server/app/src/main/resources/sieverepository-template.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/app/src/main/resources/sieverepository-template.xml?rev=1720167&view=auto ============================================================================== --- james/project/trunk/server/app/src/main/resources/sieverepository-template.xml (added) +++ james/project/trunk/server/app/src/main/resources/sieverepository-template.xml Tue Dec 15 14:04:37 2015 @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- + 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. + --> + +<!-- See http://james.apache.org/server/3/config.html for usage --> +<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository"> +</sieverepository> Modified: james/project/trunk/server/container/spring/src/main/resources/META-INF/spring/loaders-context.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/resources/META-INF/spring/loaders-context.xml?rev=1720167&r1=1720166&r2=1720167&view=diff ============================================================================== --- james/project/trunk/server/container/spring/src/main/resources/META-INF/spring/loaders-context.xml (original) +++ james/project/trunk/server/container/spring/src/main/resources/META-INF/spring/loaders-context.xml Tue Dec 15 14:04:37 2015 @@ -47,6 +47,14 @@ <!-- no alias needed --> <value></value> </entry> + <!-- Sieve Repository--> + <entry> + <key> + <value>sieverepository</value> + </key> + <!-- no alias needed --> + <value></value> + </entry> <!-- Recipient Rewrite Table--> <entry> <key> @@ -123,10 +131,6 @@ <!--<bean id="filesystem" class="org.apache.james.container.spring.filesystem.FileSystemImpl" autowire="byName"/>--> <bean id="filesystem" class="org.apache.james.container.spring.filesystem.ResourceLoaderFileSystem"/> - <bean id="sieverepository" class="org.apache.james.sieverepository.file.SieveFileRepository"> - <constructor-arg index="0" ref="filesystem"/> - </bean> - <bean id="sieveparser" class="org.apache.james.managesieve.jsieve.Parser"> <property name="configurationManager" ref="configurationmanager"/> </bean> Modified: james/project/trunk/server/data/data-api/src/main/resources/sieverepository.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/resources/sieverepository.xml?rev=1720167&r1=1720166&r2=1720167&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/src/main/resources/sieverepository.xml (original) +++ james/project/trunk/server/data/data-api/src/main/resources/sieverepository.xml Tue Dec 15 14:04:37 2015 @@ -19,5 +19,5 @@ --> <!-- See http://james.apache.org/server/3/config.html for usage --> -<sieverepository class="org.apache.james.sieverepository.file"> +<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository"> </sieverepository> Modified: james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java?rev=1720167&r1=1720166&r2=1720167&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java (original) +++ james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java Tue Dec 15 14:04:37 2015 @@ -138,7 +138,7 @@ public class SieveFileRepository impleme * Creates a new instance of SieveFileRepository. */ public SieveFileRepository() { - super(); + } /** @@ -147,7 +147,6 @@ public class SieveFileRepository impleme * @param fileSystem */ public SieveFileRepository(FileSystem fileSystem) { - this(); setFileSystem(fileSystem); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org