This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0dc6204cb632473463c78cba6e0f314a3402d860 Author: tran tien duc <[email protected]> AuthorDate: Thu Feb 21 10:59:50 2019 +0700 MAILBOX-379 Use LF line break in spring xml files --- .../resources/META-INF/spring/mailbox-maildir.xml | 134 ++++++++++----------- .../resources/META-INF/spring/mailbox-memory.xml | 114 +++++++++--------- 2 files changed, 124 insertions(+), 124 deletions(-) diff --git a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml index 13a40a0..de43601 100644 --- a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml +++ b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml @@ -1,67 +1,67 @@ -<?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 http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <!-- - Mailbox Maildir - WARNING: Maildir does only work on UNIX like operation systems - --> - <bean id="maildir-mailboxIdFactory" class="org.apache.james.mailbox.maildir.MaildirId.Factory" /> - - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - <property name="ignoreUnresolvablePlaceholders" value="true"/> - <property name ="location" value="classpath:mailbox-maildir.properties"/> - </bean> - - <bean id="maildir-mailboxmanager" class="org.apache.james.mailbox.store.StoreMailboxManager"> - <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> - <constructor-arg index="1" ref="sessionProvider"/> - <constructor-arg index="2" ref="memory-locker"/> - <constructor-arg index="3" ref="messageParser"/> - <constructor-arg index="4" ref="messageIdFactory" /> - <constructor-arg index="5" ref="storeMailboxAnnotationManager" /> - <constructor-arg index="6" ref="event-bus" /> - <constructor-arg index="7" ref="storeRightManager" /> - <constructor-arg index="8" ref="quotaComponents" /> - <constructor-arg index="9" ref="indexer" /> - <constructor-arg index="10" ref="no-mailbox-configuration" /> - </bean> - - <bean id ="no-mailbox-configuration" class="org.apache.james.mailbox.store.MailboxManagerConfiguration.NoMailboxConfiguration"/> - - <bean id ="maildir-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> - <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> - </bean> - <bean id="maildir-sessionMapperFactory" class="org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory"> - <constructor-arg index="0" ref="maildirStore"/> - </bean> - <bean id="maildirStore" class="org.apache.james.mailbox.maildir.MaildirStore"> - <constructor-arg index="0" value="${maildir.folder}"/> - <property name="messageNameStrictParse" value="${maildir.messageNameParser.strictMode}"/> - </bean> - <alias name="jvm-locker" alias="maildir-locker"/> - - <bean id="maildir-mailbox-id-deserializer" class="org.apache.james.mailbox.maildir.MaildirMailboxIdDeserializer"/> - -</beans> +<?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 http://www.springframework.org/schema/beans/spring-beans.xsd";> + + <!-- + Mailbox Maildir + WARNING: Maildir does only work on UNIX like operation systems + --> + <bean id="maildir-mailboxIdFactory" class="org.apache.james.mailbox.maildir.MaildirId.Factory" /> + + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="ignoreUnresolvablePlaceholders" value="true"/> + <property name ="location" value="classpath:mailbox-maildir.properties"/> + </bean> + + <bean id="maildir-mailboxmanager" class="org.apache.james.mailbox.store.StoreMailboxManager"> + <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> + <constructor-arg index="1" ref="sessionProvider"/> + <constructor-arg index="2" ref="memory-locker"/> + <constructor-arg index="3" ref="messageParser"/> + <constructor-arg index="4" ref="messageIdFactory" /> + <constructor-arg index="5" ref="storeMailboxAnnotationManager" /> + <constructor-arg index="6" ref="event-bus" /> + <constructor-arg index="7" ref="storeRightManager" /> + <constructor-arg index="8" ref="quotaComponents" /> + <constructor-arg index="9" ref="indexer" /> + <constructor-arg index="10" ref="no-mailbox-configuration" /> + </bean> + + <bean id ="no-mailbox-configuration" class="org.apache.james.mailbox.store.MailboxManagerConfiguration.NoMailboxConfiguration"/> + + <bean id ="maildir-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> + <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> + </bean> + <bean id="maildir-sessionMapperFactory" class="org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory"> + <constructor-arg index="0" ref="maildirStore"/> + </bean> + <bean id="maildirStore" class="org.apache.james.mailbox.maildir.MaildirStore"> + <constructor-arg index="0" value="${maildir.folder}"/> + <property name="messageNameStrictParse" value="${maildir.messageNameParser.strictMode}"/> + </bean> + <alias name="jvm-locker" alias="maildir-locker"/> + + <bean id="maildir-mailbox-id-deserializer" class="org.apache.james.mailbox.maildir.MaildirMailboxIdDeserializer"/> + +</beans> diff --git a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml index 4366588..4dd811f 100644 --- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml +++ b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml @@ -1,57 +1,57 @@ -<?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 http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean id="memory-mailboxIdFactory" class="org.apache.james.mailbox.inmemory.InMemoryId.Factory" /> - - <!-- - Mailbox Memory - --> - <!-- WARNING: Memory does not persist the mailbox. --> - <!-- Information will be lost after jvm restart. --> - - <bean id="memory-mailboxManager" class="org.apache.james.mailbox.inmemory.InMemoryMailboxManager"> - <constructor-arg index="0" ref="memory-sessionMapperFactory"/> - <constructor-arg index="1" ref="sessionProvider"/> - <constructor-arg index="2" ref="memory-locker"/> - <constructor-arg index="3" ref="messageParser"/> - <constructor-arg index="4" ref="messageIdFactory" /> - <constructor-arg index="5" ref="event-bus" /> - <constructor-arg index="6" ref="storeMailboxAnnotationManager" /> - <constructor-arg index="7" ref="storeRightManager" /> - <constructor-arg index="8" ref="quotaComponents" /> - <constructor-arg index="9" ref="indexer" /> - </bean> - - <bean id ="memory-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> - <constructor-arg index="0" ref="memory-sessionMapperFactory"/> - </bean> - - <bean id="memory-sessionMapperFactory" class="org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory" /> - - <alias name="jvm-locker" alias="memory-locker"/> - - <bean id="memory-mailbox-id-deserializer" class="org.apache.james.mailbox.inmemory.InMemoryMailboxIdDeserializer"/> - -</beans> +<?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 http://www.springframework.org/schema/beans/spring-beans.xsd";> + + <bean id="memory-mailboxIdFactory" class="org.apache.james.mailbox.inmemory.InMemoryId.Factory" /> + + <!-- + Mailbox Memory + --> + <!-- WARNING: Memory does not persist the mailbox. --> + <!-- Information will be lost after jvm restart. --> + + <bean id="memory-mailboxManager" class="org.apache.james.mailbox.inmemory.InMemoryMailboxManager"> + <constructor-arg index="0" ref="memory-sessionMapperFactory"/> + <constructor-arg index="1" ref="sessionProvider"/> + <constructor-arg index="2" ref="memory-locker"/> + <constructor-arg index="3" ref="messageParser"/> + <constructor-arg index="4" ref="messageIdFactory" /> + <constructor-arg index="5" ref="event-bus" /> + <constructor-arg index="6" ref="storeMailboxAnnotationManager" /> + <constructor-arg index="7" ref="storeRightManager" /> + <constructor-arg index="8" ref="quotaComponents" /> + <constructor-arg index="9" ref="indexer" /> + </bean> + + <bean id ="memory-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> + <constructor-arg index="0" ref="memory-sessionMapperFactory"/> + </bean> + + <bean id="memory-sessionMapperFactory" class="org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory" /> + + <alias name="jvm-locker" alias="memory-locker"/> + + <bean id="memory-mailbox-id-deserializer" class="org.apache.james.mailbox.inmemory.InMemoryMailboxIdDeserializer"/> + +</beans> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
