Author: norman
Date: Tue Sep 1 16:54:42 2009
New Revision: 810120
URL: http://svn.apache.org/viewvc?rev=810120&view=rev
Log:
Read config and use the provider for settings (LABS-428)
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
labs/hupa/client/src/main/resources/config.properties
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/ServerModul.java
Modified: labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=810120&r1=810119&r2=810120&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Tue Sep 1
16:54:42 2009
@@ -4,9 +4,8 @@
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
- <!--
+
<inherits name="com.google.gwt.i18n.I18N"/>
- -->
<inherits name='org.apache.hupa.Shared'/>
<inherits name='org.apache.hupa.Widgets'/>
Modified: labs/hupa/client/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/resources/config.properties?rev=810120&r1=810119&r2=810120&view=diff
==============================================================================
--- labs/hupa/client/src/main/resources/config.properties (original)
+++ labs/hupa/client/src/main/resources/config.properties Tue Sep 1 16:54:42
2009
@@ -10,6 +10,8 @@
# For gmail change this to [GMail]\Trash
DefaultTrashFolder=Trash
+DefaultInboxFolder=INBOX
+
# The IP or domainname of the SMTP server
SMTPServerAddress=smtp.gmail.com
Modified:
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java?rev=810120&r1=810119&r2=810120&view=diff
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
(original)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
Tue Sep 1 16:54:42 2009
@@ -21,6 +21,7 @@
import org.apache.hupa.shared.data.Settings;
+import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.name.Named;
@@ -29,6 +30,7 @@
private String sentFolder;
private String trashFolder;
+ @Inject
public DefaultUserSettingsProvider(@Named("DefaultInboxFolder") String
inboxFolder, @Named("DefaultSentFolder") String sentFolder,
@Named("DefaultTrashFolder") String trashFolder) {
this.inboxFolder = inboxFolder;
this.sentFolder = sentFolder;
Modified:
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/ServerModul.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/guice/ServerModul.java?rev=810120&r1=810119&r2=810120&view=diff
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/ServerModul.java
(original)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/ServerModul.java
Tue Sep 1 16:54:42 2009
@@ -48,6 +48,7 @@
import org.apache.hupa.server.handler.TagMessagesHandler;
import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
import org.apache.hupa.server.servlet.UploadAttachmentServlet;
+import org.apache.hupa.shared.data.Settings;
import com.google.inject.Singleton;
import com.google.inject.name.Names;
@@ -82,6 +83,7 @@
bind(FileItemRegistry.class).in(Singleton.class);
bind(IMAPStoreCache.class).to(InMemoryIMAPStoreCache.class).in(Singleton.class);
bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
+
bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class);
bind(DownloadAttachmentServlet.class).in(Singleton.class);
bind(UploadAttachmentServlet.class).in(Singleton.class);
bind(Session.class).toProvider(SessionProvider.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
