http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java b/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java deleted file mode 100644 index 4ea5aa7..0000000 --- a/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java +++ /dev/null @@ -1,38 +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.modules.data; - -import com.google.inject.AbstractModule; -import com.google.inject.Scopes; -import com.google.inject.multibindings.Multibinder; -import org.apache.james.backends.cassandra.components.CassandraModule; -import org.apache.james.sieve.cassandra.CassandraSieveRepository; -import org.apache.james.sieverepository.api.SieveRepository; - -public class CassandraSieveRepositoryModule extends AbstractModule { - - @Override - public void configure() { - bind(CassandraSieveRepository.class).in(Scopes.SINGLETON); - bind(SieveRepository.class).to(CassandraSieveRepository.class); - Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class); - cassandraDataDefinitions.addBinding().to(org.apache.james.sieve.cassandra.CassandraSieveRepositoryModule.class); - } - -}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/cassandra-guice/src/test/resources/usersrepository.xml ---------------------------------------------------------------------- diff --git a/server/container/cassandra-guice/src/test/resources/usersrepository.xml b/server/container/cassandra-guice/src/test/resources/usersrepository.xml deleted file mode 100644 index 85046b3..0000000 --- a/server/container/cassandra-guice/src/test/resources/usersrepository.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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. - --> - -<usersrepository name="LocalUsers"> - <algorithm>MD5</algorithm> - <enableVirtualHosting>true</enableVirtualHosting> -</usersrepository> - http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml index bdbc437..6b94f9a 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml +++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml @@ -20,7 +20,6 @@ <!-- Read-Only LDAP based UsersRepository --> <usersrepository name="LocalUsers" - class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389" principal="cn=admin,dc=james,dc=org" credentials="mysecretpassword" http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/domainlist.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/sample-configuration/domainlist.xml b/server/container/guice/memory-guice/sample-configuration/domainlist.xml index 8d00118..3dc58d2 100644 --- a/server/container/guice/memory-guice/sample-configuration/domainlist.xml +++ b/server/container/guice/memory-guice/sample-configuration/domainlist.xml @@ -18,7 +18,7 @@ under the License. --> -<domainlist class="org.apache.james.domainlist.jpa.JPADomainList"> +<domainlist> <domainnames> <domainname>james.apache.org</domainname> </domainnames> http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/quota.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/sample-configuration/quota.xml b/server/container/guice/memory-guice/sample-configuration/quota.xml deleted file mode 100644 index 70162e0..0000000 --- a/server/container/guice/memory-guice/sample-configuration/quota.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?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. - --> - -<!-- - This template file can be used as example for James Server configuration - DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS ---> - -<!-- See http://james.apache.org/server/3/config.html for usage --> - -<!-- - This configuration file allows you to customize the way quota are handled on this server. - You need to rename it in quota.xml so that it gets interpreted by James on startup. - - The different configuration options are detailed here. - - Read RFC-2087 for full details. ---> - -<quota> - <quotaRootResolver> - <provider>default</provider> - </quotaRootResolver> - <currentQuotaManager> - <provider>cassandra</provider> - </currentQuotaManager> - <maxQuotaManager> - <provider>cassandra</provider> - </maxQuotaManager> - <quotaManager> - <provider>store</provider> - </quotaManager> - <updates> - <provider>event</provider> - </updates> -</quota> http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml index 7e7f586..5553a40 100644 --- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml +++ b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml @@ -19,7 +19,7 @@ --> <!-- The default table for storing James' RecipientRewriteTable mappings. --> -<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> +<recipientrewritetable> <recursiveMapping>true</recursiveMapping> <mappingLimit>10</mappingLimit> <mapping>some@domain=some</mapping> http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/usersrepository.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml index fc76107..cc55c5e 100644 --- a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml +++ b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml @@ -18,7 +18,7 @@ under the License. --> -<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository"> +<usersrepository name="LocalUsers"> <destination URL="file://users/"/> <algorithm>MD5</algorithm> <enableVirtualHosting>true</enableVirtualHosting> http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/mailet/integration-testing/src/test/resources/domainlist.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/resources/domainlist.xml b/server/mailet/integration-testing/src/test/resources/domainlist.xml index e2797bb..d9040c0 100644 --- a/server/mailet/integration-testing/src/test/resources/domainlist.xml +++ b/server/mailet/integration-testing/src/test/resources/domainlist.xml @@ -20,7 +20,7 @@ <!-- See http://james.apache.org/server/3/config.html for usage --> -<domainlist class="org.apache.james.domainlist.jpa.JPADomainList"> +<domainlist> <autodetect>true</autodetect> <autodetectIP>true</autodetectIP> <defaultDomain>localhost</defaultDomain> http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml b/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml deleted file mode 100644 index 2d19a80..0000000 --- a/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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. - --> - -<mailrepositorystore> - <mailrepositories> - <mailrepository class="org.apache.james.mailrepository.None"> - <protocols> - <protocol>file</protocol> - </protocols> - <config FIFO="false" CACHEKEYS="true"/> - </mailrepository> - </mailrepositories> -</mailrepositorystore> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org