Author: norman
Date: Mon Oct 26 09:20:35 2009
New Revision: 829735
URL: http://svn.apache.org/viewvc?rev=829735&view=rev
Log:
Add the missing Avalon to guice wrapper
Added:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.xinfo
- copied unchanged from r829709,
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo
Removed:
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
Added:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java?rev=829735&view=auto
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java
(added)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java
Mon Oct 26 09:20:35 2009
@@ -0,0 +1,53 @@
+/****************************************************************
+ * 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.impl.jamesuser;
+
+import java.util.Collection;
+
+import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.impl.user.AvalonLocalUsersRepository;
+import org.guiceyfruit.jsr250.Jsr250Module;
+
+import com.google.inject.Guice;
+
+public class AvalonLocalJamesUsersRepository extends
AvalonLocalUsersRepository implements JamesUsersRepository{
+
+ public void initialize() throws Exception {
+ repos = Guice.createInjector(new Jsr250Module(), new
LocalUsersRepositoryModule()).getInstance(LocalJamesUsersRepository.class);
+ }
+
+ public void setEnableAliases(boolean enableAliases) {
+ ((LocalJamesUsersRepository) repos).setEnableAliases(enableAliases);
+ }
+
+ public void setEnableForwarding(boolean enableForwarding) {
+ ((LocalJamesUsersRepository)
repos).setEnableForwarding(enableForwarding);
+ }
+
+ public void setIgnoreCase(boolean ignoreCase) {
+ ((LocalJamesUsersRepository) repos).setIgnoreCase(ignoreCase);
+ }
+
+ public Collection<String> getMappings(String user, String domain)
+ throws ErrorMappingException {
+ return ((LocalJamesUsersRepository) repos).getMappings(user, domain);
+ }
+
+}
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java?rev=829735&r1=829734&r2=829735&view=diff
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
(original)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
Mon Oct 26 09:20:35 2009
@@ -24,6 +24,8 @@
import java.util.Collection;
+import javax.annotation.PostConstruct;
+
/**
* This is a wrapper that provide access to the "LocalUsers" repository
* but expect to find a JamesUsersRepository and return an object implementing
@@ -31,6 +33,15 @@
*/
public class LocalJamesUsersRepository extends LocalUsersRepository implements
JamesUsersRepository{
+
+
+ // REMOVE ME!!!
+ @Override
+ @PostConstruct
+ public void init() throws Exception {
+ super.init();
+ }
+
/**
* @see
org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
*/
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java?rev=829735&r1=829734&r2=829735&view=diff
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
(original)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
Mon Oct 26 09:20:35 2009
@@ -37,7 +37,7 @@
public class AvalonLocalUsersRepository implements GuiceInjected,
Initializable,Serviceable,UsersRepository{
private UsersStore usersStore;
- private LocalUsersRepository repos;
+ protected LocalUsersRepository repos;
public void initialize() throws Exception {
repos = Guice.createInjector(new Jsr250Module(), new
LocalUsersRepositoryModule()).getInstance(LocalUsersRepository.class);
@@ -47,7 +47,7 @@
usersStore = (UsersStore) manager.lookup(UsersStore.ROLE);
}
- private class LocalUsersRepositoryModule extends AbstractModule {
+ public class LocalUsersRepositoryModule extends AbstractModule {
@Override
protected void configure() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
