JAMES-1617 Cassandra Domain list tables should be contained in the appropriate package
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f657ad70 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f657ad70 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f657ad70 Branch: refs/heads/master Commit: f657ad709c252775a74e40a9ca37397fc7418cd1 Parents: d1d5712 Author: Benoit Tellier <btell...@apache.org> Authored: Wed Feb 17 14:30:36 2016 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Thu Apr 7 09:07:31 2016 +0700 ---------------------------------------------------------------------- .../cassandra/CassandraDomainList.java | 2 +- .../cassandra/CassandraDomainListModule.java | 2 +- .../cassandra/tables/CassandraDomainsTable.java | 26 ++++++++++++++++++++ .../james/tables/CassandraDomainsTable.java | 26 -------------------- 4 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f657ad70/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java index 233868e..6114453 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java @@ -34,7 +34,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.tables.CassandraDomainsTable; +import org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; http://git-wip-us.apache.org/repos/asf/james-project/blob/f657ad70/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java index e709e27..181c5ba 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java @@ -27,7 +27,7 @@ import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; -import org.apache.james.tables.CassandraDomainsTable; +import org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/f657ad70/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/tables/CassandraDomainsTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/tables/CassandraDomainsTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/tables/CassandraDomainsTable.java new file mode 100644 index 0000000..4513467 --- /dev/null +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/tables/CassandraDomainsTable.java @@ -0,0 +1,26 @@ +/**************************************************************** + * 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. * + ****************************************************************/ + +package org.apache.james.domainlist.cassandra.tables; + +public interface CassandraDomainsTable { + String TABLE_NAME = "domains"; + + String DOMAIN = "domain"; +} http://git-wip-us.apache.org/repos/asf/james-project/blob/f657ad70/server/data/data-cassandra/src/main/java/org/apache/james/tables/CassandraDomainsTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/tables/CassandraDomainsTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/tables/CassandraDomainsTable.java deleted file mode 100644 index 2e93d91..0000000 --- a/server/data/data-cassandra/src/main/java/org/apache/james/tables/CassandraDomainsTable.java +++ /dev/null @@ -1,26 +0,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. * - ****************************************************************/ - -package org.apache.james.tables; - -public interface CassandraDomainsTable { - String TABLE_NAME = "domains"; - - String DOMAIN = "domain"; -} --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
