You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/05/07 12:50:24 UTC
svn commit: r654067 - in /incubator/shindig/trunk: features/ features/rpc/
java/gadgets/ java/server/ java/social-api/
java/social-api/src/main/java/org/apache/shindig/social/opensocial/
javascript/ javascript/container/ javascript/samplecontainer/exam...
Author: doll
Date: Wed May 7 03:50:20 2008
New Revision: 654067
URL: http://svn.apache.org/viewvc?rev=654067&view=rev
Log:
Fixed the non php and non java/gadgets whitespace issues.
Modified:
incubator/shindig/trunk/features/README
incubator/shindig/trunk/features/rpc/rpc.js
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
incubator/shindig/trunk/javascript/README
incubator/shindig/trunk/javascript/container/sample2.html
incubator/shindig/trunk/javascript/container/sample3.html
incubator/shindig/trunk/javascript/container/sample4.html
incubator/shindig/trunk/javascript/container/sample5.html
incubator/shindig/trunk/javascript/container/sample6.html
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml
incubator/shindig/trunk/site/index.html
Modified: incubator/shindig/trunk/features/README
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/README?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/features/README (original)
+++ incubator/shindig/trunk/features/README Wed May 7 03:50:20 2008
@@ -1,4 +1,6 @@
-You can automatically include new features into your shindig server by adding them to this directory. Features should exist in a self-contained directory with the following structure:
+You can automatically include new features into your shindig server by adding
+them to this directory. Features should exist in a self-contained directory
+with the following structure:
features
|_your-feature-name
@@ -6,25 +8,33 @@
|_code-to-run-inside-gadget.js
|_code-to-run-inside-container.js
-The structure of feature.xml is as follows: TODO: link to xml schema for feature.xml
+The structure of feature.xml is as follows:
+TODO: link to xml schema for feature.xml
+
<?xml version="1.0"?>
<feature>
<name>your-feature-name (required)</name>
<dependency>any dependency you have (optional, may have multiple)</dependency>
<gadget> (optional)
- <script src="code-to-run-inside-gadget.js"/> (optional, may have multiple, may use web resources as well but we strongly encourage bundling your javascript with the xml)
+ <script src="code-to-run-inside-gadget.js"/> (optional, may have multiple,
+ may use web resources as well but we strongly encourage bundling your
+ javascript with the xml)
</gadget>
<container> (optional)
<script src="code-to-run-inside-container.js"> (same as for <gadget>)
</container>
</feature>
-Please always make sure that all files you provide are encoded as utf8.
+Please always make sure that all files you provide are encoded as utf8.
-When adding new features, your javascript should conform to shindig javascript coding conventions. This means that you should not be producing new globals and your feature should be compatible with Caja.
+When adding new features, your javascript should conform to shindig javascript
+coding conventions. This means that you should not be producing new globals and
+your feature should be compatible with Caja.
-When committing a new feature, you should update the features.txt file by running the following script in a unix-like environment:
+When committing a new feature, you should update the features.txt file by
+running the following script in a unix-like environment:
ls -R1a features/**/*.xml > features/features.txt
-TODO: Instructions for regenerating features.txt for other operating system environments.
+TODO: Instructions for regenerating features.txt for other operating system
+environments.
Modified: incubator/shindig/trunk/features/rpc/rpc.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/rpc/rpc.js?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/features/rpc/rpc.js (original)
+++ incubator/shindig/trunk/features/rpc/rpc.js Wed May 7 03:50:20 2008
@@ -144,24 +144,24 @@
for (var i = iframePool.length - 1; i >=0; --i) {
var ifr = iframePool[i];
try {
- if (ifr && (ifr.recyclable || ifr.readyState === 'complete')) {
- ifr.parentNode.removeChild(ifr);
- if (window.ActiveXObject) {
- // For MSIE, delete any iframes that are no longer being used. MSIE
- // cannot reuse the IFRAME because a navigational click sound will
- // be triggered when we set the SRC attribute.
- // Other browsers scan the pool for a free iframe to reuse.
- iframePool[i] = ifr = null;
- iframePool.splice(i, 1);
- } else {
- ifr.recyclable = false;
- iframe = ifr;
- break;
- }
- }
+ if (ifr && (ifr.recyclable || ifr.readyState === 'complete')) {
+ ifr.parentNode.removeChild(ifr);
+ if (window.ActiveXObject) {
+ // For MSIE, delete any iframes that are no longer being used. MSIE
+ // cannot reuse the IFRAME because a navigational click sound will
+ // be triggered when we set the SRC attribute.
+ // Other browsers scan the pool for a free iframe to reuse.
+ iframePool[i] = ifr = null;
+ iframePool.splice(i, 1);
+ } else {
+ ifr.recyclable = false;
+ iframe = ifr;
+ break;
+ }
+ }
} catch (e) {
- // Ignore; IE7 throws an exception when trying to read readyState and
- // readyState isn't set.
+ // Ignore; IE7 throws an exception when trying to read readyState and
+ // readyState isn't set.
}
}
// Create IFrame if necessary
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed May 7 03:50:20 2008
@@ -202,11 +202,11 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
-
- <!--
+
+ <!--
external dependencies
where the depedency version is defined in dependency Management,
- there is no need for the version, and it should not be put in
+ there is no need for the version, and it should not be put in
so we have a single place to change the version
-->
<dependency>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Wed May 7 03:50:20 2008
@@ -19,7 +19,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-parent</artifactId>
@@ -32,7 +32,7 @@
<name>Apache Shindig Gadget Server</name>
<description>Default server war containing both the Gadget Server and the Social-Api server.</description>
-
+
<scm>
<connection> scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/java/server</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/server</developerConnection>
@@ -42,7 +42,7 @@
<properties>
<runType>full</runType>
</properties>
-
+
<build>
<plugins>
<plugin>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Wed May 7 03:50:20 2008
@@ -44,7 +44,7 @@
<resource>
<directory>conf</directory>
</resource>
- </resources>
+ </resources>
</build>
<dependencies>
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java Wed May 7 03:50:20 2008
@@ -51,7 +51,7 @@
*
* @param id The id of the user to activity belongs to
* @param activityId The id of the activity
- * @param token A valid GadgetToken
+ * @param token A valid GadgetToken
* @return a reponse item with the matching activity
*/
public ResponseItem<Activity> getActivity(String id, String activityId,
Modified: incubator/shindig/trunk/javascript/README
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/README?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/README (original)
+++ incubator/shindig/trunk/javascript/README Wed May 7 03:50:20 2008
@@ -38,18 +38,18 @@
var gadget = gadgets.container.createGadget(
{specUrl: "http://foo.com/spec.xml"});
- Check "gadgets.js" for other options to be set in createGadget. If you are
- debugging your own gadgets you can consider to use specVersion to get a more
- optimal use of the cache. Alternatively, gadgets.container.setNoCache(1)
+ Check "gadgets.js" for other options to be set in createGadget. If you are
+ debugging your own gadgets you can consider to use specVersion to get a more
+ optimal use of the cache. Alternatively, gadgets.container.setNoCache(1)
ii) Add it to the container. Example:
gadgets.container.addGadget(gadget);
- If your setup is too complicated, you can need to tell each Gadget
- where its server is. Example
+ If your setup is too complicated, you can need to tell each Gadget
+ where its server is. Example
- gadget.setServerBase("http://yourserver:yourport/gadgets/");
+ gadget.setServerBase("http://yourserver:yourport/gadgets/");
iii) Ensure the Gadget's chrome ID is defined. This is the ID of the
elements in which the Gadget is rendered. The way these are specified
Modified: incubator/shindig/trunk/javascript/container/sample2.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample2.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample2.html (original)
+++ incubator/shindig/trunk/javascript/container/sample2.html Wed May 7 03:50:20 2008
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="gadgets.css">
<script type="text/javascript" src="../../js/rpc.js?c=1&debug=1"></script>
<script type="text/javascript" src="cookies.js"></script>
-<script type="text/javascript" src="util.js"></script>
+<script type="text/javascript" src="util.js"></script>
<script type="text/javascript" src="gadgets.js"></script>
<script type="text/javascript" src="cookiebaseduserprefstore.js"></script>
<script type="text/javascript">
Modified: incubator/shindig/trunk/javascript/container/sample3.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample3.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample3.html (original)
+++ incubator/shindig/trunk/javascript/container/sample3.html Wed May 7 03:50:20 2008
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="gadgets.css">
<script type="text/javascript" src="../../js/rpc.js?c=1&debug=1"></script>
<script type="text/javascript" src="cookies.js"></script>
-<script type="text/javascript" src="util.js"></script>
+<script type="text/javascript" src="util.js"></script>
<script type="text/javascript" src="gadgets.js"></script>
<script type="text/javascript" src="cookiebaseduserprefstore.js"></script>
<script type="text/javascript">
Modified: incubator/shindig/trunk/javascript/container/sample4.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample4.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample4.html (original)
+++ incubator/shindig/trunk/javascript/container/sample4.html Wed May 7 03:50:20 2008
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="gadgets.css">
<script type="text/javascript" src="../../js/rpc.js?c=1&debug=1"></script>
<script type="text/javascript" src="cookies.js"></script>
-<script type="text/javascript" src="util.js"></script>
+<script type="text/javascript" src="util.js"></script>
<script type="text/javascript" src="gadgets.js"></script>
<script type="text/javascript" src="cookiebaseduserprefstore.js"></script>
<script type="text/javascript">
Modified: incubator/shindig/trunk/javascript/container/sample5.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample5.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample5.html (original)
+++ incubator/shindig/trunk/javascript/container/sample5.html Wed May 7 03:50:20 2008
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="gadgets.css">
<script type="text/javascript" src="../../js/rpc.js?c=1&debug=1"></script>
<script type="text/javascript" src="cookies.js"></script>
-<script type="text/javascript" src="util.js"></script>
+<script type="text/javascript" src="util.js"></script>
<script type="text/javascript" src="gadgets.js"></script>
<script type="text/javascript" src="cookiebaseduserprefstore.js"></script>
<script type="text/javascript">
Modified: incubator/shindig/trunk/javascript/container/sample6.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample6.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample6.html (original)
+++ incubator/shindig/trunk/javascript/container/sample6.html Wed May 7 03:50:20 2008
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="gadgets.css">
<script type="text/javascript" src="../../js/rpc.js?c=1&debug=1"></script>
<script type="text/javascript" src="cookies.js"></script>
-<script type="text/javascript" src="util.js"></script>
+<script type="text/javascript" src="util.js"></script>
<script type="text/javascript" src="gadgets.js"></script>
<script type="text/javascript" src="cookiebaseduserprefstore.js"></script>
<script type="text/javascript">
Modified: incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml Wed May 7 03:50:20 2008
@@ -73,7 +73,7 @@
if (count == 0) {
//continue;
}
-
+
html += '<div class="person">';
html += '<div class="bubble c' + count % numberOfStyles + '">' + hellos[count % hellos.length];
html += '<div class="name">' + allPeople[i].getDisplayName() + ' (' + count + ') ' + allPeople[i].getField(opensocial.Person.Field.GENDER).getDisplayValue();
@@ -107,11 +107,11 @@
var opts = {};
opts[opensocial.DataRequest.PeopleRequestFields.FIRST] = 0;
opts[opensocial.DataRequest.PeopleRequestFields.MAX] = 40;
- opts[opensocial.DataRequest.PeopleRequestFields.PROFILE_DETAILS] =
- [opensocial.Person.Field.AGE,
- opensocial.Person.Field.NAME,
- opensocial.Person.Field.GENDER,
- opensocial.Person.Field.PROFILE_URL,
+ opts[opensocial.DataRequest.PeopleRequestFields.PROFILE_DETAILS] =
+ [opensocial.Person.Field.AGE,
+ opensocial.Person.Field.NAME,
+ opensocial.Person.Field.GENDER,
+ opensocial.Person.Field.PROFILE_URL,
opensocial.Person.Field.THUMBNAIL_URL,
opensocial.Person.Field.STATUS];
opts[opensocial.DataRequest.PeopleRequestFields.SORT_ORDER] = opensocial.DataRequest.SortOrder.NAME;
Modified: incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml Wed May 7 03:50:20 2008
@@ -48,7 +48,7 @@
</div>
<div id="waiting" style="display: none">
- Please click
+ Please click
<a onclick="javascript:fetchData()">I've approved access</a>
once you've approved access to your data.
</div>
Modified: incubator/shindig/trunk/site/index.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/site/index.html?rev=654067&r1=654066&r2=654067&view=diff
==============================================================================
--- incubator/shindig/trunk/site/index.html (original)
+++ incubator/shindig/trunk/site/index.html Wed May 7 03:50:20 2008
@@ -279,9 +279,9 @@
</li><li> Right-click the project, select <code>Maven : Enable Dependency Management</code>
</li><li> Right-click the project, select <code>Maven : Update Source Folders</code>
</li><li> Optionally, if you would like to be able to browse or step into the code of your dependent
- jars when debugging, you need the source jars. Right-click the project, select
- <code>Maven : Download Sources</code> and Eclipse will automatically know about
- these sources when debugging. You can browse them under <code>Maven Dependencies</code> in your project.
+ jars when debugging, you need the source jars. Right-click the project, select
+ <code>Maven : Download Sources</code> and Eclipse will automatically know about
+ these sources when debugging. You can browse them under <code>Maven Dependencies</code> in your project.
</li>
</li></ol>
</li></ul>