Author: lindner
Date: Tue Aug 12 06:49:32 2008
New Revision: 685148

URL: http://svn.apache.org/viewvc?rev=685148&view=rev
Log:
SHINDIG-481 - namespace Guice usages because some implementers will want to 
interface with generic properties storage mechanisms

Modified:
    
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java
    incubator/shindig/trunk/java/gadgets/conf/gadgets.properties
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
    
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java

Modified: 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java
 (original)
+++ 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java
 Tue Aug 12 06:49:32 2008
@@ -310,7 +310,7 @@
    * @throws ContainerConfigException
    */
   @Inject
-  public ContainerConfig(@Named("containers.default") String containers)
+  public ContainerConfig(@Named("shindig.containers.default") String 
containers)
       throws ContainerConfigException {
     config = new HashMap<String, JSONObject>();
     if (containers != null) {

Modified: incubator/shindig/trunk/java/gadgets/conf/gadgets.properties
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/conf/gadgets.properties?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/conf/gadgets.properties (original)
+++ incubator/shindig/trunk/java/gadgets/conf/gadgets.properties Tue Aug 12 
06:49:32 2008
@@ -1,22 +1,22 @@
-features.default=res://features/features.txt
-containers.default=res://containers/default/container.js
-blacklist.file=
-urls.iframe.prefix=/gadgets/ifr?
-urls.js.prefix=/gadgets/js/
-signing.key-name=
-signing.key-file=
-locked-domain.enabled=false
-locked-domain.embed-host=127.0.0.1:8080
-content-rewrite.include-urls=.*
-content-rewrite.exclude-urls=
-content-rewrite.include-tags=link,script,embed,img,style
-content-rewrite.expires=86400
-cache.capacity=10000
-gadget-spec.cache.capacity=0
-message-bundle.cache.capacity=0
-gadget-spec.cache.minTTL=300000
-gadget-spec.cache.maxTTL=600000
-message-bundle.cache.minTTL=300000
-message-bundle.cache.maxTTL=600000
-http.cache.defaultTtl=3600000
-http.cache.negativeCacheTtl=30000
+shindig.features.default=res://features/features.txt
+shindig.containers.default=res://containers/default/container.js
+shindig.blacklist.file=
+shindig.urls.iframe.prefix=/gadgets/ifr?
+shindig.urls.js.prefix=/gadgets/js/
+shindig.signing.key-name=
+shindig.signing.key-file=
+shindig.locked-domain.enabled=false
+shindig.locked-domain.embed-host=127.0.0.1:8080
+shindig.content-rewrite.include-urls=.*
+shindig.content-rewrite.exclude-urls=
+shindig.content-rewrite.include-tags=link,script,embed,img,style
+shindig.content-rewrite.expires=86400
+shindig.cache.capacity=10000
+shindig.gadget-spec.cache.capacity=0
+shindig.message-bundle.cache.capacity=0
+shindig.gadget-spec.cache.minTTL=300000
+shindig.gadget-spec.cache.maxTTL=600000
+shindig.message-bundle.cache.minTTL=300000
+shindig.message-bundle.cache.maxTTL=600000
+shindig.http.cache.defaultTtl=3600000
+shindig.http.cache.negativeCacheTtl=30000

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
 Tue Aug 12 06:49:32 2008
@@ -82,7 +82,7 @@
   }
 
   @Inject
-  public BasicGadgetBlacklist(@Named("blacklist.file") String file)
+  public BasicGadgetBlacklist(@Named("shindig.blacklist.file") String file)
       throws IOException {
     this(new File(file));
   }

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
 Tue Aug 12 06:49:32 2008
@@ -168,9 +168,9 @@
   public BasicGadgetSpecFactory(HttpFetcher fetcher,
                                 ContentRewriter rewriter,
                                 Executor executor,
-                                @Named("gadget-spec.cache.capacity")int 
gadgetSpecCacheCapacity,
-                                @Named("gadget-spec.cache.minTTL")long minTtl,
-                                @Named("gadget-spec.cache.maxTTL")long maxTtl) 
{
+                                
@Named("shindig.gadget-spec.cache.capacity")int gadgetSpecCacheCapacity,
+                                @Named("shindig.gadget-spec.cache.minTTL")long 
minTtl,
+                                @Named("shindig.gadget-spec.cache.maxTTL")long 
maxTtl) {
     this.fetcher = fetcher;
     this.rewriter = rewriter;
     this.executor = executor;

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 Tue Aug 12 06:49:32 2008
@@ -120,9 +120,9 @@
 
   @Inject
   public BasicMessageBundleFactory(HttpFetcher fetcher,
-                                   @Named("message-bundle.cache.capacity")int 
capacity,
-                                   @Named("message-bundle.cache.minTTL")long 
minTtl,
-                                   @Named("message-bundle.cache.maxTTL")long 
maxTtl) {
+                                   
@Named("shindig.message-bundle.cache.capacity")int capacity,
+                                   
@Named("shindig.message-bundle.cache.minTTL")long minTtl,
+                                   
@Named("shindig.message-bundle.cache.maxTTL")long maxTtl) {
     this.fetcher = fetcher;
     this.cache = new LruCache<URI, TimeoutPair>(capacity);
     this.minTtl = minTtl;

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
 Tue Aug 12 06:49:32 2008
@@ -62,7 +62,7 @@
    * @throws GadgetException
    */
   @Inject
-  public GadgetFeatureRegistry(@Named("features.default") String featureFiles,
+  public GadgetFeatureRegistry(@Named("shindig.features.default") String 
featureFiles,
       HttpFetcher httpFetcher) throws GadgetException {
     features = new HashMap<String, GadgetFeature>();
     core = new HashMap<String, GadgetFeature>();

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
 Tue Aug 12 06:49:32 2008
@@ -69,8 +69,8 @@
   @Inject
   public HashLockedDomainService(
       ContainerConfig config,
-      @Named("locked-domain.embed-host")String embedHost,
-      @Named("locked-domain.enabled")boolean enabled) {
+      @Named("shindig.locked-domain.embed-host")String embedHost,
+      @Named("shindig.locked-domain.enabled")boolean enabled) {
     this.config = config;
     this.embedHost = embedHost;
     this.enabled = enabled;

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
 Tue Aug 12 06:49:32 2008
@@ -73,8 +73,8 @@
    */
   @Inject
   public SigningFetcherFactory(HttpCache cache,
-                               @Named("signing.key-name") String keyName,
-                               @Named("signing.key-file") String keyFile) {
+                               @Named("shindig.signing.key-name") String 
keyName,
+                               @Named("shindig.signing.key-file") String 
keyFile) {
     this.cache = cache;
     if (keyName == null || keyName.length() == 0) {
       this.keyName = null;

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
 Tue Aug 12 06:49:32 2008
@@ -46,7 +46,7 @@
   }
 
   @Inject
-  public BasicHttpCache(@Named("cache.capacity") int capacity) {
+  public BasicHttpCache(@Named("shindig.cache.capacity") int capacity) {
     cache = LruCache.create(capacity);
   }
 }

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 Tue Aug 12 06:49:32 2008
@@ -103,11 +103,11 @@
   private HttpResponse rewritten;
 
   @Inject
-  @Named("http.cache.negativeCacheTtl")
+  @Named("shindig.http.cache.negativeCacheTtl")
   private static long negativeCacheTtl = NEGATIVE_CACHE_TTL;
 
   @Inject
-  @Named("http.cache.defaultTtl")
+  @Named("shindig.http.cache.defaultTtl")
   private static long defaultTtl = DEFAULT_TTL;
 
   // Holds character sets for fast conversion

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
 Tue Aug 12 06:49:32 2008
@@ -60,10 +60,10 @@
   @Inject
   public DefaultContentRewriter(
       GadgetSpecFactory specFactory,
-      @Named("content-rewrite.include-urls")String includeUrls,
-      @Named("content-rewrite.exclude-urls")String excludeUrls,
-      @Named("content-rewrite.expires")String expires,
-      @Named("content-rewrite.include-tags")String includeTags) {
+      @Named("shindig.content-rewrite.include-urls")String includeUrls,
+      @Named("shindig.content-rewrite.exclude-urls")String excludeUrls,
+      @Named("shindig.content-rewrite.expires")String expires,
+      @Named("shindig.content-rewrite.include-tags")String includeTags) {
     this.specFactory = specFactory;
     this.includeUrls = includeUrls;
     this.excludeUrls = excludeUrls;

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
 Tue Aug 12 06:49:32 2008
@@ -157,8 +157,8 @@
   }
 
   @Inject
-  public UrlGenerator(@Named("urls.iframe.prefix") String iframePrefix,
-                      @Named("urls.js.prefix") String jsPrefix,
+  public UrlGenerator(@Named("shindig.urls.iframe.prefix") String iframePrefix,
+                      @Named("shindig.urls.js.prefix") String jsPrefix,
                       GadgetFeatureRegistry registry,
                       ContainerConfig containerConfig) {
     this.iframePrefix = iframePrefix;

Modified: 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
 (original)
+++ 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
 Tue Aug 12 06:49:32 2008
@@ -33,13 +33,13 @@
 public class EndToEndModule extends AbstractModule {
 
   protected void configure() {
-    bind(String.class).annotatedWith(Names.named("canonical.json.db"))
+    bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
         .toInstance("sampledata/canonicaldb.json");
     
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
         .to(DataServiceServletFetcher.class);
-    bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.xml"))
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml"))
         .to(BeanXmlConverter.class);
-    bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.json"))
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json"))
         .to(BeanJsonConverter.class);
 
     bind(Boolean.class)

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
 Tue Aug 12 06:49:32 2008
@@ -43,16 +43,16 @@
     
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
         .to(DataServiceServletFetcher.class);
 
-    bind(String.class).annotatedWith(Names.named("canonical.json.db"))
+    bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
         .toInstance("sampledata/canonicaldb.json");
 
     bind(Boolean.class)
         
.annotatedWith(Names.named(AnonymousAuthenticationHandler.ALLOW_UNAUTHENTICATED))
         .toInstance(Boolean.TRUE);
 
-    
bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.xml")).to(
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(
         BeanXmlConverter.class);
-    
bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.json")).to(
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
         BeanJsonConverter.class);
   }
 }

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
 Tue Aug 12 06:49:32 2008
@@ -71,8 +71,8 @@
   }
 
   @Inject
-  public void setBeanConverters(@Named("bean.converter.json") BeanConverter 
jsonConverter,
-    @Named("bean.converter.xml")  BeanConverter xmlConverter) {
+  public void setBeanConverters(@Named("shindig.bean.converter.json") 
BeanConverter jsonConverter,
+    @Named("shindig.bean.converter.xml")  BeanConverter xmlConverter) {
     this.jsonConverter = jsonConverter;
     this.xmlConverter = xmlConverter;
   }

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
 Tue Aug 12 06:49:32 2008
@@ -98,8 +98,8 @@
   private static final String FRIEND_LINK_TABLE = "friendLinks";
 
   @Inject
-  public JsonDbOpensocialService(@Named("canonical.json.db")String 
jsonLocation,
-      @Named("bean.converter.json") BeanConverter converter) throws Exception {
+  public JsonDbOpensocialService(@Named("shindig.canonical.json.db")String 
jsonLocation,
+      @Named("shindig.bean.converter.json") BeanConverter converter) throws 
Exception {
     String content = 
IOUtils.toString(ResourceLoader.openResource(jsonLocation), "UTF-8");
     this.db = new JSONObject(content);
     this.converter = converter;

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=685148&r1=685147&r2=685148&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 Tue Aug 12 06:49:32 2008
@@ -37,12 +37,12 @@
     
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
         .to(DataServiceServletFetcher.class);
 
-    bind(String.class).annotatedWith(Names.named("canonical.json.db"))
+    bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
         .toInstance("sampledata/canonicaldb.json");
     
-    
bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.xml")).to(
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(
         BeanXmlConverter.class);
-    
bind(BeanConverter.class).annotatedWith(Names.named("bean.converter.json")).to(
+    
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
         BeanJsonConverter.class);
 
   }


Reply via email to