JAMES-1589 Disable autodetect IP during tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea22ede0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea22ede0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea22ede0 Branch: refs/heads/master Commit: ea22ede00dbf6abe9c3af4ae29bc86ab2d18b4da Parents: f1aae40 Author: benwa <btell...@linagora.com> Authored: Fri Aug 4 17:18:21 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Aug 8 17:10:16 2017 +0700 ---------------------------------------------------------------------- .../cassandra/src/test/resources/domainlist.xml | 2 +- .../domainlist/lib/AbstractDomainList.java | 6 ++--- .../src/test/resources/domainlist.xml | 24 ++++++++++++++++++++ .../src/test/resources/domainlist.xml | 24 ++++++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ea22ede0/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml b/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml index db021bb..cb6a2e8 100644 --- a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml +++ b/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml @@ -23,6 +23,6 @@ <domainname>mydomain.tld</domainname> </domainnames> <autodetect>false</autodetect> - <autodetectIP>true</autodetectIP> + <autodetectIP>false</autodetectIP> <defaultDomain>localhost</defaultDomain> </domainlist> http://git-wip-us.apache.org/repos/asf/james-project/blob/ea22ede0/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java index 8e2a423..e238d4b 100644 --- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java +++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java @@ -83,13 +83,13 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf @Override public void configure(HierarchicalConfiguration config) throws ConfigurationException { + setAutoDetect(config.getBoolean(CONFIGURE_AUTODETECT, true)); + setAutoDetectIP(config.getBoolean(CONFIGURE_AUTODETECT_IP, true)); + configureDefaultDomain(config); addEnvDomain(); addConfiguredDomains(config); - - setAutoDetect(config.getBoolean(CONFIGURE_AUTODETECT, true)); - setAutoDetectIP(config.getBoolean(CONFIGURE_AUTODETECT_IP, true)); } protected void addConfiguredDomains(HierarchicalConfiguration config) { http://git-wip-us.apache.org/repos/asf/james-project/blob/ea22ede0/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/domainlist.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/domainlist.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/domainlist.xml new file mode 100644 index 0000000..fe17431 --- /dev/null +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/domainlist.xml @@ -0,0 +1,24 @@ +<?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. + --> + +<domainlist> + <autodetect>false</autodetect> + <autodetectIP>false</autodetectIP> +</domainlist> http://git-wip-us.apache.org/repos/asf/james-project/blob/ea22ede0/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/domainlist.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/domainlist.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/domainlist.xml new file mode 100644 index 0000000..fe17431 --- /dev/null +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/domainlist.xml @@ -0,0 +1,24 @@ +<?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. + --> + +<domainlist> + <autodetect>false</autodetect> + <autodetectIP>false</autodetectIP> +</domainlist> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
