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/28 23:06:16 UTC
svn commit: r1439665 - in /rave/trunk: ./
rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/
rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/
rave-providers/rave-openso...
Author: mfranklin
Date: Mon Jan 28 22:06:15 2013
New Revision: 1439665
URL: http://svn.apache.org/viewvc?rev=1439665&view=rev
Log:
moved shindig resources from rave-shindig to rave-shindig-resources RAVE-525
Added:
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/resources/initial_data.sql
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/initial_data.sql
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/modules-context.xml
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-applicationContext.xml
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-dataContext.xml
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave.shindig.properties
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/security_token_encryption_key.txt
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/security_token_encryption_key.txt
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/default/
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/default/container.js
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/web.xml
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/web.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/index.jsp
- copied, changed from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/index.jsp
Removed:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/initial_data.sql
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/security_token_encryption_key.txt
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/web.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/index.jsp
Modified:
rave/trunk/pom.xml
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=1439665&r1=1439664&r2=1439665&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Mon Jan 28 22:06:15 2013
@@ -497,6 +497,18 @@
</dependency>
<dependency>
<groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig-dependencies</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig-resources</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
<artifactId>rave-portal</artifactId>
<version>${project.version}</version>
<type>war</type>
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=1439665&r1=1439664&r2=1439665&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 Mon Jan 28 22:06:15 2013
@@ -42,4 +42,75 @@
</dependency>
</dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.mavenfilesync</groupId>
+ <artifactId>maven-filesync-plugin</artifactId>
+ <configuration>
+ <mappings>
+ <mapping>
+ <sourceFolder>src/main/webapp</sourceFolder>
+ <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT</destinationFolder>
+ </mapping>
+ <mapping>
+ <sourceFolder>src/main/resources</sourceFolder>
+ <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT/WEB-INF/classes</destinationFolder>
+ </mapping>
+ </mappings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>jpa</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>mongodb</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-mongodb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/initial_data.sql (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/initial_data.sql)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/initial_data.sql?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/initial_data.sql&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/initial_data.sql&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/modules-context.xml (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/modules-context.xml?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/modules-context.xml&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-applicationContext.xml (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-applicationContext.xml?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-applicationContext.xml&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-dataContext.xml (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-dataContext.xml?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave-shindig-dataContext.xml&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave.shindig.properties (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave.shindig.properties?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/rave.shindig.properties&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/security_token_encryption_key.txt (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/security_token_encryption_key.txt)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/security_token_encryption_key.txt?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/resources/security_token_encryption_key.txt&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/security_token_encryption_key.txt&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/default/container.js (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/default/container.js?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/classes/containers/default/container.js&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/web.xml (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/web.xml?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/WEB-INF/web.xml&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/WEB-INF/web.xml&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/index.jsp (from r1439664, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/index.jsp?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/webapp/index.jsp&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/webapp/index.jsp&r1=1439664&r2=1439665&rev=1439665&view=diff
==============================================================================
(empty)
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=1439665&r1=1439664&r2=1439665&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 Mon Jan 28 22:06:15 2013
@@ -40,135 +40,13 @@
<dependencies>
<dependency>
<groupId>org.apache.rave</groupId>
- <artifactId>rave-opensocial-core</artifactId>
- <exclusions>
- <!-- Shindig common adds jsp & el jars to the war that cause conflicts in Tomcat -->
- <exclusion>
- <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>
+ <artifactId>rave-shindig-dependencies</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-server</artifactId>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig-resources</artifactId>
<type>war</type>
</dependency>
-
- <!-- log4j logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <overlays>
- <overlay>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-server</artifactId>
- <excludes>
- <exclude>WEB-INF/lib/commons-logging-*.jar</exclude>
- <exclude>WEB-INF/lib/slf4j-*.jar</exclude>
- <exclude>WEB-INF/lib/commons-codec-*.jar</exclude>
- <exclude>WEB-INF/lib/httpclient-*.jar</exclude>
- <exclude>WEB-INF/lib/httpcore-*.jar</exclude>
- <exclude>WEB-INF/lib/icu4j-*.jar</exclude>
- </excludes>
- </overlay>
- </overlays>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.googlecode.mavenfilesync</groupId>
- <artifactId>maven-filesync-plugin</artifactId>
- <configuration>
- <mappings>
- <mapping>
- <sourceFolder>src/main/webapp</sourceFolder>
- <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT</destinationFolder>
- </mapping>
- <mapping>
- <sourceFolder>src/main/resources</sourceFolder>
- <destinationFolder>@../rave-portal/target/tomcat6x/webapps/ROOT/WEB-INF/classes</destinationFolder>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <profiles>
- <profile>
- <id>jpa</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-jpa</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>mongodb</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-mongodb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
</project>