svn commit: r644928 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: SigningFetcher.java http/UrlGenerator.java spec/MessageBundle.java

[etnu]

Author: etnu
Date: Fri Apr  4 14:06:05 2008
New Revision: 644928

URL: http://svn.apache.org/viewvc?rev=644928&view=rev
Log:
Applied fixes for SHINDIG-177 & SHINDIG-166. Also modified param order for 
iframe urls to prevent a double ampersand.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java?rev=644928&r1=644927&r2=644928&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
 Fri Apr  4 14:06:05 2008
@@ -54,8 +54,8 @@
   protected static final String XOAUTH_PUBLIC_KEY
       = "xoauth_signature_publickey";
 
-  protected static final Pattern ALLOWED_PARAM_NAME = Pattern
-      .compile("[\\w_\\-]+");
+  protected static final Pattern ALLOWED_PARAM_NAME
+      = Pattern.compile("[-:\\w]+");
 
   protected final TimeSource clock = new TimeSource();
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java?rev=644928&r1=644927&r2=644928&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
 Fri Apr  4 14:06:05 2008
@@ -125,10 +125,10 @@
              .append("&");
           break;
       }
+      buf.append("synd=").append(context.getSyndicator());
       if (context.getModuleId() != 0) {
-        buf.append("mid=").append(context.getModuleId());
+        buf.append("&mid=").append(context.getModuleId());
       }
-      buf.append("&synd=").append(context.getSyndicator());
       if (context.getIgnoreCache()) {
         buf.append("&nocache=1");
       } else {

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java?rev=644928&r1=644927&r2=644928&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
 Fri Apr  4 14:06:05 2008
@@ -70,7 +70,8 @@
 
 
     NodeList nodes = doc.getElementsByTagName("msg");
-    Map<String, String> messages = new HashMap<String, 
String>(nodes.getLength(), 1);
+    Map<String, String> messages
+        = new HashMap<String, String>(nodes.getLength(), 1);
 
     for (int i = 0, j = nodes.getLength(); i < j; ++i) {
       Element msg = (Element)nodes.item(i);
@@ -79,7 +80,7 @@
         throw new SpecParserException(
             "All message bundle entries must have a name attribute.");
       }
-      messages.put(name, msg.getTextContent());
+      messages.put(name, msg.getTextContent().trim());
     }
     this.messages = Collections.unmodifiableMap(messages);
   }