From cc3fbc28c83687d37acbb6c48975585f99117f62 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sun, 24 Jun 2012 17:51:02 +0000
Subject: [PATCH] NIHVIVO-3772 Incorporate the most recent changes from Eric
 (2012-06-20)

---
 productMods/WEB-INF/web.xml     | 6 +-----
 themes/wilma/templates/head.ftl | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index e0840662..84c31ec5 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1380,11 +1380,7 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>GadgetController</servlet-name>
-    <url-pattern>/gadget</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>GadgetController</servlet-name>
-    <url-pattern>/gadget/sandbox</url-pattern>
+    <url-pattern>/orng/*</url-pattern>
   </servlet-mapping>
 
     
diff --git a/themes/wilma/templates/head.ftl b/themes/wilma/templates/head.ftl
index d53d2541..181af24b 100644
--- a/themes/wilma/templates/head.ftl
+++ b/themes/wilma/templates/head.ftl
@@ -13,7 +13,7 @@
         ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}			
         ${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>',
                           '<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>',
-                          '<script type="text/javascript" src="${urls.base}/js/openSocial/shindig.js"></script>')}
+                          '<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
     </#if>	
 </#if>