Author: lindner
Date: Mon May 19 15:42:16 2008
New Revision: 658012
URL: http://svn.apache.org/viewvc?rev=658012&view=rev
Log:
Implement SHINDIG-281, updating the directory structure for 0.8
Added:
incubator/shindig/trunk/features/opensocial-current/
incubator/shindig/trunk/features/opensocial-current/batchrequest.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/batchrequest.js
incubator/shindig/trunk/features/opensocial-current/batchrequesttest.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/batchrequesttest.js
incubator/shindig/trunk/features/opensocial-current/feature.xml
- copied, changed from r657953,
incubator/shindig/trunk/features/opensocial-0.7/feature.xml
incubator/shindig/trunk/features/opensocial-current/jsonactivity.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/jsonactivity.js
incubator/shindig/trunk/features/opensocial-current/jsonactivitytest.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/jsonactivitytest.js
incubator/shindig/trunk/features/opensocial-current/jsoncontainer.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/jsoncontainer.js
incubator/shindig/trunk/features/opensocial-current/jsonperson.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/jsonperson.js
incubator/shindig/trunk/features/opensocial-current/restfulcontainer.js
- copied unchanged from r657953,
incubator/shindig/trunk/features/opensocial-0.7/restfulcontainer.js
Removed:
incubator/shindig/trunk/features/opensocial-0.7/batchrequest.js
incubator/shindig/trunk/features/opensocial-0.7/batchrequesttest.js
incubator/shindig/trunk/features/opensocial-0.7/jsonactivity.js
incubator/shindig/trunk/features/opensocial-0.7/jsonactivitytest.js
incubator/shindig/trunk/features/opensocial-0.7/jsoncontainer.js
incubator/shindig/trunk/features/opensocial-0.7/jsonperson.js
incubator/shindig/trunk/features/opensocial-0.7/restfulcontainer.js
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/features.txt
incubator/shindig/trunk/features/opensocial-0.7/feature.xml
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/social-api/README
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Mon May 19 15:42:16 2008
@@ -93,7 +93,7 @@
"ANCHOR_COLOR": ""
}
},
- "opensocial-0.7" : {
+ "opensocial-0.8" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
"path" : "/social/data",
Modified: incubator/shindig/trunk/features/features.txt
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/features.txt?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/features/features.txt (original)
+++ incubator/shindig/trunk/features/features.txt Mon May 19 15:42:16 2008
@@ -8,6 +8,7 @@
features/minimessage/feature.xml
features/opensocial-0.6/feature.xml
features/opensocial-0.7/feature.xml
+features/opensocial-current/feature.xml
features/opensocial-reference/feature.xml
features/rpc/feature.xml
features/setprefs/feature.xml
Modified: incubator/shindig/trunk/features/opensocial-0.7/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-0.7/feature.xml?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-0.7/feature.xml (original)
+++ incubator/shindig/trunk/features/opensocial-0.7/feature.xml Mon May 19
15:42:16 2008
@@ -19,50 +19,8 @@
-->
<feature>
<name>opensocial-0.7</name>
- <dependency>opensocial-reference</dependency>
- <dependency>caja</dependency>
+ <dependency>opensocial-0.8</dependency>
<gadget>
- <script src="jsonperson.js"></script>
- <script src="jsonactivity.js"></script>
- <script src="jsoncontainer.js"></script>
- <script src="batchrequest.js"></script>
- <script src="restfulcontainer.js"></script>
- <script>
- var requiredConfig = {
- "path": gadgets.config.NonEmptyStringValidator,
- "domain": gadgets.config.NonEmptyStringValidator,
- "enableCaja": gadgets.config.BooleanValidator,
- "supportedFields": gadgets.config.ExistsValidator,
- "useRestful": gadgets.config.BooleanValidator
- };
-
- gadgets.config.register("opensocial-0.7", requiredConfig,
- function(config) {
- var configParams = config["opensocial-0.7"];
-
- ShindigContainer = function() {
- JsonContainer.call(this, configParams.path,
- configParams.domain, configParams.supportedFields);
- };
- ShindigContainer.inherits(JsonContainer);
-
- RestfulShindigContainer = function() {
- RestfulContainer.call(this, configParams.path,
- configParams.domain, configParams.supportedFields);
- };
- RestfulShindigContainer.inherits(RestfulContainer);
-
- if (configParams.useRestful) {
- opensocial.Container.setContainer(new RestfulShindigContainer());
- } else {
- opensocial.Container.setContainer(new ShindigContainer());
- }
-
- if (configParams.enableCaja) {
- opensocial.Container.get().enableCaja();
- }
- });
-
- </script>
+ <script src="opensocial7to8.js"/>
</gadget>
</feature>
Copied: incubator/shindig/trunk/features/opensocial-current/feature.xml (from
r657953, incubator/shindig/trunk/features/opensocial-0.7/feature.xml)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/feature.xml?p2=incubator/shindig/trunk/features/opensocial-current/feature.xml&p1=incubator/shindig/trunk/features/opensocial-0.7/feature.xml&r1=657953&r2=658012&rev=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-0.7/feature.xml (original)
+++ incubator/shindig/trunk/features/opensocial-current/feature.xml Mon May 19
15:42:16 2008
@@ -18,7 +18,7 @@
under the License.
-->
<feature>
- <name>opensocial-0.7</name>
+ <name>opensocial-0.8</name>
<dependency>opensocial-reference</dependency>
<dependency>caja</dependency>
<gadget>
@@ -36,9 +36,9 @@
"useRestful": gadgets.config.BooleanValidator
};
- gadgets.config.register("opensocial-0.7", requiredConfig,
+ gadgets.config.register("opensocial-0.8", requiredConfig,
function(config) {
- var configParams = config["opensocial-0.7"];
+ var configParams = config["opensocial-0.8"];
ShindigContainer = function() {
JsonContainer.call(this, configParams.path,
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Mon May 19 15:42:16 2008
@@ -105,10 +105,10 @@
<source>opensocial-reference/phone.js</source>
<source>opensocial-reference/responseitem.js</source>
<source>opensocial-reference/url.js</source>
- <source>opensocial-0.7/batchrequest.js</source>
- <source>opensocial-0.7/jsonactivity.js</source>
- <source>opensocial-0.7/jsonperson.js</source>
- <source>opensocial-0.7/jsoncontainer.js</source>
+ <source>opensocial-current/batchrequest.js</source>
+ <source>opensocial-current/jsonactivity.js</source>
+ <source>opensocial-current/jsonperson.js</source>
+ <source>opensocial-current/jsoncontainer.js</source>
</sources>
<testSourceDirectory>${basedir}</testSourceDirectory>
<testSuites>
@@ -117,7 +117,7 @@
<type>TESTCASES</type>
<includes>
<include>opensocial-reference/*test.js</include>
- <include>opensocial-0.7/*test.js</include>
+ <include>opensocial-current/*test.js</include>
</includes>
</testSuite>
</testSuites>
Modified: incubator/shindig/trunk/java/social-api/README
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/README?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/README (original)
+++ incubator/shindig/trunk/java/social-api/README Mon May 19 15:42:16 2008
@@ -121,7 +121,7 @@
The default Shindig setup receives its requests from
-features/opensocial-0.7/jsoncontainer. If you use this javascript class your
+features/opensocial-0.8/jsoncontainer. If you use this javascript class your
json format will always match the server exactly. This wire format is always
subject to change as it is solely for the purpose of communicating between the
Shindig javascript and the Shindig java classes. Shindig will always be
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
Mon May 19 15:42:16 2008
@@ -121,6 +121,35 @@
}
/**
+ * public java.lang.Enum for opensocial.Enum.NetworkPresence
+ */
+ public enum NetworkPresence implements EnumKey {
+ ONLINE("ONLINE", "Online"),
+ OFFLINE("OFFLINE", "Offline"),
+ AWAY("AWAY", "Away"),
+ CHAT("CHAT", "Chat"),
+ DND("DND", "Do Not Disturb"),
+ XA("XA", "Extended Away");
+
+ private final String jsonString;
+ private final String displayValue;
+
+ private NetworkPresence(String jsonString, String displayValue) {
+ this.jsonString = jsonString;
+ this.displayValue = displayValue;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+
+ public String getDisplayValue() {
+ return displayValue;
+ }
+ }
+
+ /**
* Constructs a Enum object.
* @param key EnumKey The key to use
* @param displayValue String The display value
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Mon May 19 15:42:16 2008
@@ -81,7 +81,8 @@
TURN_OFFS("turnOffs"),
TURN_ONS("turnOns"),
TV_SHOWS("tvShows"),
- URLS("urls");
+ URLS("urls"),
+ NETWORKPRESENCE("networkPresence");
private final String jsonString;
@@ -149,6 +150,7 @@
private List<String> turnOns;
private List<String> tvShows;
private List<Url> urls;
+ private Enum<Enum.NetworkPresence> networkPresence;
// Note: Not in the opensocial js person object directly
private boolean isOwner = false;
@@ -591,6 +593,14 @@
this.urls = urls;
}
+ public Enum<Enum.NetworkPresence> getNetworkPresence() {
+ return networkPresence;
+ }
+
+ public void setNetworkPresence(Enum<Enum.NetworkPresence> networkPresence) {
+ this.networkPresence = networkPresence;
+ }
+
public boolean getIsOwner() {
return isOwner;
}
Modified:
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml?rev=658012&r1=658011&r2=658012&view=diff
==============================================================================
---
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
(original)
+++
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
Mon May 19 15:42:16 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Module>
<ModulePrefs title="Social Hello World">
- <Require feature="opensocial-0.7"></Require>
+ <Require feature="opensocial-0.8"></Require>
<Require feature="dynamic-height"></Require>
</ModulePrefs>
<Content type="html">
