svn commit: r649481 - in /incubator/shindig/trunk: config/container.js java/social-api/pom.xml javascript/samplecontainer/samplecontainer.html

[doll]

Author: doll
Date: Fri Apr 18 05:10:08 2008
New Revision: 649481

URL: http://svn.apache.org/viewvc?rev=649481&view=rev
Log:
Changed assumed socialdata path to be /social/data. This should work for the 
php version and will match up with the java version shortly. 


Modified:
    incubator/shindig/trunk/config/container.js
    incubator/shindig/trunk/java/social-api/pom.xml
    incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html

Modified: incubator/shindig/trunk/config/container.js
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=649481&r1=649480&r2=649481&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Fri Apr 18 05:10:08 2008
@@ -90,7 +90,7 @@
   "opensocial-0.7" : {
     // Path to fetch opensocial data from
     // Must be on the same domain as the gadget rendering server
-    "path" : "/gadgets/socialdata",
+    "path" : "/social/data",
     "domain" : "shindig",
     "enableCaja" : true,
     "supportedFields" : {

Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=649481&r1=649480&r2=649481&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Fri Apr 18 05:10:08 2008
@@ -50,6 +50,26 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <!-- this is relative to the pom.xml directory -->
+              <directory>../../javascript/</directory>
+              <targetPath>files</targetPath>
+              <includes>
+                <include>**/*.*</include>
+              </includes>
+            </resource>
+          </webResources>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>war</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
           <groupId>org.apache.maven.plugins </groupId>
@@ -90,6 +110,13 @@
             </goals>
           </execution>
         </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <contextPath>/social</contextPath>
+        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: 
incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html?rev=649481&r1=649480&r2=649481&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html 
(original)
+++ incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html Fri 
Apr 18 05:10:08 2008
@@ -43,7 +43,7 @@
 
 // TODO: This is gross, it needs to use the config just like the gadget js does
 var socialDataPath = document.location.protocol + "//" + document.location.host
-    + "/gadgets/socialdata";
+    + "/social/data";
 
 var gadgetUrl = baseUrl + 'examples/SocialHelloWorld.xml';
 var gadgetUrlCookie = 'sampleContainerGadgetUrl';
@@ -119,11 +119,11 @@
 function generateSecureToken() {
   // TODO: Use a less silly mechanism of mapping a gadget URL to an appid
   var appId = 0;
-  for (var i=0; i < gadgetUrl.length; i++) {
+  for (var i = 0; i < gadgetUrl.length; i++) {
     appId += gadgetUrl.charCodeAt(i);
   }
   var fields = [ownerId, viewerId, appId, "shindig", gadgetUrl, "0"];
-  for (var i=0; i < fields.length; i++) {
+  for (var i = 0; i < fields.length; i++) {
     // escape each field individually, for metachars in URL
     fields[i] = escape(fields[i]);
   }