You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/01/29 21:45:45 UTC
svn commit: r1440114 - in /rave/trunk: ./
rave-providers/rave-opensocial-provider/rave-opensocial-core/
rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/
rave-providers/rave-opensocial-provider/rave-opensocial-se...
Author: mfranklin
Date: Tue Jan 29 20:45:44 2013
New Revision: 1440114
URL: http://svn.apache.org/viewvc?rev=1440114&view=rev
Log:
Fixed issue with security tokens (RAVE-879)
Added:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/
- copied from r1440011, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/webapp/
- copied from r1440011, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/
Removed:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/
Modified:
rave/trunk/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/ (props changed)
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/ (props changed)
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
Modified: rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1440114&r1=1440113&r2=1440114&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Tue Jan 29 20:45:44 2013
@@ -192,22 +192,12 @@
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <version>${apache.shindig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
<version>${apache.shindig.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
- <scope>test</scope>
<version>${apache.shindig.version}</version>
</dependency>
<dependency>
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml?rev=1440114&r1=1440113&r2=1440114&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml Tue Jan 29 20:45:44 2013
@@ -80,13 +80,13 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
- <type>test-jar</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <type>test-jar</type>
+ <scope>provided</scope>
</dependency>
<dependency>
Propchange: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 20:45:44 2013
@@ -0,0 +1 @@
+*.iml
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml?rev=1440114&r1=1440113&r2=1440114&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml Tue Jan 29 20:45:44 2013
@@ -50,22 +50,8 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</exclusion>
- <!--
- Shindig contains JSON files with "comments" as if they were JavaScript files.
- The JSON parser that ships with rave-core isn't as lenient as older versions and throws an exception
- on comments.
- -->
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-server</artifactId>
- <type>war</type>
- </dependency>
<!-- log4j logging -->
<dependency>
Propchange: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 20:45:44 2013
@@ -0,0 +1 @@
+*.iml
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/pom.xml?rev=1440114&r1=1440113&r2=1440114&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/pom.xml (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/pom.xml Tue Jan 29 20:45:44 2013
@@ -19,7 +19,8 @@
$Id$
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -69,7 +70,8 @@
</mapping>
<mapping>
<sourceFolder>src/main/resources</sourceFolder>
- <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT/WEB-INF/classes</destinationFolder>
+ <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT/WEB-INF/classes
+ </destinationFolder>
</mapping>
</mappings>
</configuration>
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml?rev=1440114&r1=1440113&r2=1440114&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml Tue Jan 29 20:45:44 2013
@@ -35,6 +35,7 @@
<packaging>war</packaging>
<properties>
+ <shindig.json.version>20070829</shindig.json.version>
</properties>
<dependencies>
@@ -42,11 +43,29 @@
<groupId>org.apache.rave</groupId>
<artifactId>rave-shindig-dependencies</artifactId>
<type>pom</type>
+ <exclusions>
+ <!--
+ Shindig contains JSON files with "comments" as if they were JavaScript files.
+ The JSON parser that ships with rave-core isn't as lenient as older versions and throws an exception
+ on comments.
+ -->
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-shindig-resources</artifactId>
<type>war</type>
</dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${shindig.json.version}</version>
+ </dependency>
+
</dependencies>
</project>