svn commit: r1334232 - in /shindig/trunk: content/samplecontainer/examples/templates/ java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/

[hsaputra]

Author: hsaputra
Date: Fri May  4 22:15:04 2012
New Revision: 1334232

URL: http://svn.apache.org/viewvc?rev=1334232&view=rev
Log:
Reuse existing string constants.

Modified:
    
shindig/trunk/content/samplecontainer/examples/templates/RelativeTemplateLibrary.xml
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java

Modified: 
shindig/trunk/content/samplecontainer/examples/templates/RelativeTemplateLibrary.xml
URL: 
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/templates/RelativeTemplateLibrary.xml?rev=1334232&r1=1334231&r2=1334232&view=diff
==============================================================================
--- 
shindig/trunk/content/samplecontainer/examples/templates/RelativeTemplateLibrary.xml
 (original)
+++ 
shindig/trunk/content/samplecontainer/examples/templates/RelativeTemplateLibrary.xml
 Fri May  4 22:15:04 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java?rev=1334232&r1=1334231&r2=1334232&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
 Fri May  4 22:15:04 2012
@@ -23,10 +23,12 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.Lists;
+
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.Gadget;
 import org.apache.shindig.gadgets.admin.GadgetAdminStore;
 import org.apache.shindig.gadgets.features.FeatureRegistry;
+import org.apache.shindig.gadgets.rewrite.TemplateRewriter;
 import org.apache.shindig.gadgets.spec.Feature;
 
 import com.google.common.collect.Maps;
@@ -41,8 +43,6 @@ import com.google.inject.Singleton;
  */
 @Singleton
 public class CoreUtilConfigContributor implements ConfigContributor {
-  private static final String TEMPLATES_FEATURE_NAME = "opensocial-templates";
-  private static final String REQUIRE_LIBRARY_PARAM = "requireLibrary";
 
   private final FeatureRegistry registry;
   private final GadgetAdminStore gadgetAdminStore;
@@ -73,8 +73,8 @@ public class CoreUtilConfigContributor i
       for (String paramName : feature.getParams().keySet()) {
         Collection<String> paramValues = feature.getParams().get(paramName);
         // Resolve the template URL to convert relative URL to absolute URL 
relative to gadget URL.
-        if (TEMPLATES_FEATURE_NAME.equals(feature.getName())
-            && REQUIRE_LIBRARY_PARAM.equals(paramName)) {
+        if (TemplateRewriter.TEMPLATES_FEATURE_NAME.equals(feature.getName())
+            && TemplateRewriter.REQUIRE_LIBRARY_PARAM.equals(paramName)) {
           if (paramValues.size() == 1) {
             Uri paramUri = Uri.parse(paramValues.iterator().next().trim());
             paramUri = gadget.getContext().getUrl().resolve(paramUri);

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=1334232&r1=1334231&r2=1334232&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
 Fri May  4 22:15:04 2012
@@ -78,12 +78,12 @@ public class TemplateRewriter implements
   public static final String TEMPLATES_FEATURE_NAME = "opensocial-templates";
   public static final String OSML_FEATURE_NAME = "osml";
 
+  /** Specifies what template libraries to load */
+  public static final String REQUIRE_LIBRARY_PARAM = "requireLibrary";
+
   /** Set to true to block auto-processing of templates */
   static final String DISABLE_AUTO_PROCESSING_PARAM = "disableAutoProcessing";
 
-  /** Specifies what template libraries to load */
-  static final String REQUIRE_LIBRARY_PARAM = "requireLibrary";
-
   /** Enable client support? **/
   static final String CLIENT_SUPPORT_PARAM = "client";