Author: lindner
Date: Thu May 13 23:01:42 2010
New Revision: 944047
URL: http://svn.apache.org/viewvc?rev=944047&view=rev
Log:
Move 'org.apache.shindig.serviceExpirationDurationMinutes' to shindig.properties
Modified:
shindig/trunk/UPGRADING
shindig/trunk/java/common/conf/shindig.properties
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
Modified: shindig/trunk/UPGRADING
URL:
http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=944047&r1=944046&r2=944047&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Thu May 13 23:01:42 2010
@@ -23,6 +23,7 @@ Too many to mention. Check the top-leve
* servlet-api is upgraded to 2.5
+
== Java Interface Changes ==
* AbstractContainerConfig
@@ -65,6 +66,10 @@ is easy, just use the following syntax:
Multibinder.newSetBinder(binder(), Object.class,
Names.named("org.apache.shindig.handlers"))
.addBinding().toInstance(MyHandler.class);
+The long value annotated with the name
"org.apache.shindig.serviceExpirationDurationMinutes" has
+been moved to shindig/common/conf/shindig.properties. Guice 2.0 can inject
Long values from Strings
+automatically.
+
== PHP Changes ==
TBD
Modified: shindig/trunk/java/common/conf/shindig.properties
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/conf/shindig.properties?rev=944047&r1=944046&r2=944047&view=diff
==============================================================================
--- shindig/trunk/java/common/conf/shindig.properties (original)
+++ shindig/trunk/java/common/conf/shindig.properties Thu May 13 23:01:42 2010
@@ -128,3 +128,6 @@ shindig.api.disallow-unknown-content-typ
# fashion, ie. by the class itself or tightly controlled code.
shindig.uri.proxy.use-strict-parsing=false
shindig.uri.concat.use-strict-parsing=false
+
+
+org.apache.shindig.serviceExpirationDurationMinutes=60
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=944047&r1=944046&r2=944047&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
Thu May 13 23:01:42 2010
@@ -75,8 +75,6 @@ public class SocialApiGuiceModule extend
for (Class handler : getHandlers()) {
handlerBinder.addBinding().toInstance(handler);
}
-
-
bind(Long.class).annotatedWith(Names.named("org.apache.shindig.serviceExpirationDurationMinutes")).toInstance(60L);
}
/**
