Author: dongxu
Date: Thu Sep 12 05:05:13 2013
New Revision: 1522442
URL: http://svn.apache.org/r1522442
Log:
Disable InImapUserPreferencesStorage
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522442&r1=1522441&r2=1522442&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
Thu Sep 12 05:05:13 2013
@@ -48,6 +48,7 @@ import org.apache.hupa.server.guice.prov
import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
import org.apache.hupa.server.guice.providers.LogProvider;
import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
+import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
import org.apache.hupa.server.service.CheckSessionService;
import org.apache.hupa.server.service.CheckSessionServiceImpl;
@@ -511,12 +512,17 @@ public class GuiceServerModule extends A
bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
bind(Session.class).toProvider(JavaMailSessionProvider.class);
<<<<<<< HEAD
+<<<<<<< HEAD
// bind(HttpSession.class).toProvider(HttpSessionProvider.class);
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
bind(Properties.class).toInstance(properties);
=======
>>>>>>> forward and reply message to use RF
bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
+=======
+//
bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
+
bind(UserPreferencesStorage.class).to(InSessionUserPreferencesStorage.class);
+>>>>>>> Disable InImapUserPreferencesStorage
bind(Properties.class).toInstance(properties);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
