Author: lindner
Date: Fri May 1 00:21:03 2009
New Revision: 770496
URL: http://svn.apache.org/viewvc?rev=770496&view=rev
Log:
revert some changes to fix the broken build
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js
incubator/shindig/trunk/pom.xml
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js?rev=770496&r1=770495&r2=770496&view=diff
==============================================================================
---
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js
(original)
+++
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontext.js
Fri May 1 00:21:03 2009
@@ -182,12 +182,20 @@
return {
/**
- * Returns a map of existing data.
+ * Returns a map of existing data. This is used externally by both the
+ * opensocial-data and opensocial-templates feature, hence is
+ * not hidden, despite not being part of the spec.
* @return {Object} A map of current data sets.
* TODO: Add to the spec API?
*/
getData : function() {
- return dataSets;
+ var data = {};
+ for (var key in dataSets) {
+ if (dataSets.hasOwnProperty(key)) {
+ data[key] = dataSets[key];
+ }
+ }
+ return data;
},
/**
@@ -255,3 +263,4 @@
opensocial.data.getDataContext = function() {
return opensocial.data.DataContext;
};
+
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=770496&r1=770495&r2=770496&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Fri May 1 00:21:03 2009
@@ -581,7 +581,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.1</version>
<configuration>
<targetJdk>1.5</targetJdk>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
@@ -1349,7 +1349,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.5</version>
+ <version>2.1</version>
<!--
htmlunit depends on an out of date rev of commons-io, which ends
up causing classpath problems in generated war files.
