You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2012/02/21 09:27:58 UTC
svn commit: r1291651 - in
/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension: ./
rave-vanilla-extension-portal/ rave-vanilla-extension-portal/src/
rave-vanilla-extension-portal/src/main/
rave-vanilla-extension-portal/src/main/assembly/ rave...
Author: jasha
Date: Tue Feb 21 08:27:57 2012
New Revision: 1291651
URL: http://svn.apache.org/viewvc?rev=1291651&view=rev
Log:
RAVE-474 Move Rave-portal overlay to submodule, add module for Rave-Shindig overlay
Added:
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/distbin.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.bat
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.sh
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/model/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/model/NewCustomUser.java
- copied unchanged from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/model/NewCustomUser.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/applicationContext-security.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/tags/custom_css.tag
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/web.xml
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/web.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/custom.css
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/css/custom.css
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
- copied unchanged from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/log4j.xml
- copied, changed from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/resources/log4j.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/web.xml
Removed:
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/model/NewCustomUser.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/applicationContext-security.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/tags/custom_css.tag
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/web.xml
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/css/custom.css
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/login.jsp
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/resources/log4j.xml
Modified:
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
Modified: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml?rev=1291651&r1=1291650&r2=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml Tue Feb 21 08:27:57 2012
@@ -16,8 +16,6 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id: pom.xml 1152919 2011-08-01 20:19:57Z jasha $
-->
<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"
@@ -28,7 +26,11 @@
<artifactId>rave-vanilla-extension</artifactId>
<name>Apache Rave :: rave-vanilla-extension</name>
<description>Apache Rave Project Sandbox</description>
- <packaging>war</packaging>
+ <modules>
+ <module>rave-vanilla-extension-portal</module>
+ <module>rave-vanilla-extension-shindig</module>
+ </modules>
+ <packaging>pom</packaging>
<version>0.9-SNAPSHOT</version>
<properties>
<apache.rave.version>0.9-incubating-SNAPSHOT</apache.rave.version>
@@ -43,13 +45,7 @@
<commons-lang.version>2.6</commons-lang.version>
<junit.version>4.7</junit.version>
<easymock.version>3.0</easymock.version>
- <cargo.version>1.1.0</cargo.version>
- <!-- if you want a remote debugging on a different a address
- override on command line with -Dcargo.debug.addres=xxxx -->
- <cargo.debug.address>8000</cargo.debug.address>
- <!-- if you want to start remote debugging session suspended
- override on command line with -Dcargo.debug.suspend=y -->
- <cargo.debug.suspend>n</cargo.debug.suspend>
+
<javaagent/>
<!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin configuration with
$mvn filesync:generate -Dmaven.filesync.override=true -->
@@ -73,133 +69,19 @@
</repository>
</repositories>
- <dependencies>
-
- <!-- servlet-api, jsp-api and el-api api must be scope provided -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>${el-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Exclude commons-logging by adding it as a provided dependency -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- fore junit dependency on scope test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${org.springframework.version}</version>
- <scope>test</scope>
- </dependency>
-
-
- <!-- Ensure/enforce proper version for commons-lang, not relying on transitive dependencies -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal-dependencies</artifactId>
- <type>pom</type>
- <version>${apache.rave.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal-resources</artifactId>
- <type>war</type>
- <version>${apache.rave.version}</version>
- </dependency>
-
- <!-- Default database -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${com.h2database.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-shindig</artifactId>
- <type>war</type>
- <version>${apache.rave.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-demo-gadgets</artifactId>
- <type>war</type>
- <version>${apache.rave.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- log4j logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
<profiles>
<profile>
<id>dist</id>
<build>
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>${cargo.version}</version>
+ <artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
- <id>dist-cargo-package</id>
- <phase>install</phase>
+ <phase>validate</phase>
<goals>
- <goal>configure</goal>
- <goal>package</goal>
+ <goal>clean</goal>
</goals>
</execution>
</executions>
@@ -247,97 +129,70 @@
<plugins>
<plugin>
- <groupId>com.googlecode.mavenfilesync</groupId>
- <artifactId>maven-filesync-plugin</artifactId>
- <configuration>
- <mappings>
- <mapping>
- <sourceFolder>src/main/webapp</sourceFolder>
- <destinationFolder>@target/tomcat6x/webapps/portal</destinationFolder>
- </mapping>
- <mapping>
- <sourceFolder>src/main/resources</sourceFolder>
- <destinationFolder>@target/tomcat6x/webapps/portal/WEB-INF/classes</destinationFolder>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
<configuration>
- <overlays>
- <overlay>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal-resources</artifactId>
- <!-- Example exclusions for files we overrides
- This isn't technically required (as we overlay) but made explicit this way
- -->
- <excludes>
- <exclude>WEB-INF/applicationContext-security.xml</exclude>
- <exclude>WEB-INF/xml</exclude>
- <exclude>login.jsp</exclude>
- </excludes>
- </overlay>
- </overlays>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.github.searls</groupId>
+ <artifactId>jasmine-maven-plugin</artifactId>
+ <versionRange>[1.0.2-beta-2,)</versionRange>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <versionRange>[1.2,)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.googlecode.mavenfilesync</groupId>
+ <artifactId>maven-filesync-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.github.searls</groupId>
+ <artifactId>jasmine-maven-plugin</artifactId>
+ <versionRange>[1.0.2-beta-2,)</versionRange>
+ <goals>
+ <goal>resources</goal>
+ <goal>generateManualRunner</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <extensions>true</extensions>
- <version>${cargo.version}</version>
- <configuration>
- <wait>true</wait>
- <configuration>
- <properties>
- <cargo.jvmargs>
- <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent}]]>
- </cargo.jvmargs>
- <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
- </properties>
- <home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-shindig</artifactId>
- <type>war</type>
- <properties>
- <context>/ROOT</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-demo-gadgets</artifactId>
- <type>war</type>
- <properties>
- <context>/demogadgets</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-vanilla-extension</artifactId>
- <type>war</type>
- <properties>
- <context>/portal</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- <container>
- <containerId>tomcat6x</containerId>
- <timeout>180000</timeout>
- <zipUrlInstaller>
- <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
- <url>http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz</url>
- </zipUrlInstaller>
- <systemProperties>
- <shindig.host>localhost</shindig.host>
- </systemProperties>
- </container>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml Tue Feb 21 08:27:57 2012
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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">
+ <parent>
+ <artifactId>rave-vanilla-extension</artifactId>
+ <groupId>org.apache.rave</groupId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>rave-vanilla-extension-portal</artifactId>
+ <name>Apache Rave :: rave-vanilla-extension-portal</name>
+ <description>Apache Rave Project Custom Portal</description>
+
+ <packaging>war</packaging>
+
+ <properties>
+ <cargo.version>1.1.0</cargo.version>
+ <!-- if you want a remote debugging on a different a address
+override on command line with -Dcargo.debug.addres=xxxx -->
+ <cargo.debug.address>8000</cargo.debug.address>
+ <!-- if you want to start remote debugging session suspended
+override on command line with -Dcargo.debug.suspend=y -->
+ <cargo.debug.suspend>n</cargo.debug.suspend>
+ <cargo.args />
+ </properties>
+
+ <dependencies>
+
+ <!-- servlet-api, jsp-api and el-api api must be scope provided -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${el-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Exclude commons-logging by adding it as a provided dependency -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- fore junit dependency on scope test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${org.springframework.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- Ensure/enforce proper version for commons-lang, not relying on transitive dependencies -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-dependencies</artifactId>
+ <type>pom</type>
+ <version>${apache.rave.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-resources</artifactId>
+ <type>war</type>
+ <version>${apache.rave.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-vanilla-extension-shindig</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <version>${apache.rave.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <!-- Default database -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${com.h2database.version}</version>
+ </dependency>
+
+ <!-- log4j logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <finalName>rave-vanilla-extension-portal</finalName>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.mavenfilesync</groupId>
+ <artifactId>maven-filesync-plugin</artifactId>
+ <configuration>
+ <mappings>
+ <mapping>
+ <sourceFolder>src/main/webapp</sourceFolder>
+ <destinationFolder>@target/tomcat6x/webapps/portal</destinationFolder>
+ </mapping>
+ <mapping>
+ <sourceFolder>src/main/resources</sourceFolder>
+ <destinationFolder>@target/tomcat6x/webapps/portal/WEB-INF/classes</destinationFolder>
+ </mapping>
+ </mappings>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-resources</artifactId>
+ <!-- Example exclusions for files we overrides
+ This isn't technically required (as we overlay) but made explicit this way
+ -->
+ <excludes>
+ <exclude>WEB-INF/applicationContext-security.xml</exclude>
+ <exclude>WEB-INF/xml</exclude>
+ <exclude>login.jsp</exclude>
+ </excludes>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>${cargo.version}</version>
+ <configuration>
+ <wait>true</wait>
+ <configuration>
+ <properties>
+ <cargo.jvmargs>
+ <![CDATA[-Dh2.bindAddress="localhost" -Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent} ${cargo.args}]]>
+ </cargo.jvmargs>
+ <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
+ </properties>
+ <home>${project.build.directory}/tomcat6x</home>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-vanilla-extension-shindig</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/ROOT</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <!-- I tried giving this name gagdets and it did not work. -->
+ <properties>
+ <context>/demogadgets</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-vanilla-extension-portal</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ <container>
+ <containerId>tomcat6x</containerId>
+ <timeout>180000</timeout>
+ <zipUrlInstaller>
+ <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
+ <url>
+ http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+ </url>
+ </zipUrlInstaller>
+ <systemProperties>
+ <net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
+ <!-- Documentation: http://incubator.apache.org/rave/documentation/host-configuration.html -->
+ <!--
+ <portal.override.properties>/path/to/custom.portal.properties</portal.override.properties>
+ <rave-shindig.override.properties>/path/to/custom.shindig.properties</rave-shindig.override.properties>
+ <shindig.host>localhost</shindig.host>
+ <shindig.port>8080</shindig.port>
+ <shindig.contextroot />
+ -->
+ </systemProperties>
+ </container>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>${cargo.version}</version>
+ <executions>
+ <execution>
+ <id>dist-cargo-package</id>
+ <phase>install</phase>
+ <goals>
+ <goal>configure</goal>
+ <goal>package</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <!-- Do not attach the resulting artifact(s) to the project (e.g. do not deploy) -->
+ <attach>false</attach>
+ <!-- Override finalName -->
+ <finalName>rave-${project.version}</finalName>
+ <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-449 -->
+ <archiverConfig>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <defaultDirectoryMode>0755</defaultDirectoryMode>
+ </archiverConfig>
+ </configuration>
+ <executions>
+ <execution>
+ <id>dist-assembly</id>
+ <phase>install</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-rave-vanilla-extension-${project.version}</finalName>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/assembly/distbin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+</project>
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/distbin.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/distbin.xml?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/distbin.xml (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/assembly/distbin.xml Tue Feb 21 08:27:57 2012
@@ -0,0 +1,83 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ $Id: distbin.xml 1136930 2011-06-17 16:45:00Z mpierce $
+-->
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <directory>${project.build.directory}/package</directory>
+ <excludes>
+ <!-- exclude Tomcat packaged LICENSE, NOTICE RELEASE-NOTES and RUNNING.txt files
+ which we provide of our own -->
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>.cargo</exclude>
+ <!-- exclude Tomcat shell scripts as these should have their execution bit be set (see below) -->
+ <exclude>bin/*.sh</exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <!-- Fix/ensure unix execution bit is set (again) for Tomcat shell scripts -->
+ <fileMode>0755</fileMode>
+ <directory>${project.build.directory}/package/bin</directory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <fileMode>0644</fileMode>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>CHANGELOG</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/dist</directory>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/dist/bin</directory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.bat
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.bat?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.bat (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.bat Tue Feb 21 08:27:57 2012
@@ -0,0 +1,16 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+set JAVA_OPTS=%JAVA_OPTS% -Xmx512m -XX:MaxPermSize=128m
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.sh
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.sh?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.sh (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/bin/setenv.sh Tue Feb 21 08:27:57 2012
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export JAVA_OPTS="$JAVA_OPTS -Xmx512m -XX:MaxPermSize=128m"
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java Tue Feb 21 08:27:57 2012
@@ -94,4 +94,4 @@ public class CustomUserService extends D
}
}
-}
\ No newline at end of file
+}
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/applicationContext-security.xml)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/applicationContext-security.xml&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/applicationContext-security.xml (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml Tue Feb 21 08:27:57 2012
@@ -62,6 +62,7 @@
user-service-ref="customUserService">
<security:password-encoder ref="passwordEncoder" />
</security:authentication-provider>
+ <!-- No LDAP authentication in this extension -->
</security:authentication-manager>
<!-- enable the spring security annotations -->
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/tags/custom_css.tag)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/tags/custom_css.tag&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/tags/custom_css.tag (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag Tue Feb 21 08:27:57 2012
@@ -1,3 +1,22 @@
<%@ tag language="java" pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ --%>
+
<link rel="stylesheet" href="<c:url value="/css/custom.css" />" />
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/web.xml (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/web.xml?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/web.xml&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/web.xml&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/web.xml Tue Feb 21 08:27:57 2012
@@ -21,7 +21,6 @@
-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
id="Shindig"
version="2.5">
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/custom.css (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/css/custom.css)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/custom.css?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/custom.css&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/css/custom.css&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/css/custom.css (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/custom.css Tue Feb 21 08:27:57 2012
@@ -1,19 +1,21 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
body{
height:100%;
Copied: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/log4j.xml (from r1291648, incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/log4j.xml?p2=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/log4j.xml&p1=incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/resources/log4j.xml&r1=1291648&r2=1291651&rev=1291651&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/test/resources/log4j.xml (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/resources/log4j.xml Tue Feb 21 08:27:57 2012
@@ -46,4 +46,4 @@
<appender-ref ref="console" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml Tue Feb 21 08:27:57 2012
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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">
+ <parent>
+ <artifactId>rave-vanilla-extension</artifactId>
+ <groupId>org.apache.rave</groupId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>rave-vanilla-extension-shindig</artifactId>
+ <name>Apache Rave :: rave-vanilla-extension-shindig</name>
+ <description>Apache Rave Project Custom Shindig</description>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <type>war</type>
+ <version>${apache.rave.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>rave-vanilla-extension-shindig</finalName>
+ <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.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <!-- Example exclusions for files we overrides
+ This isn't technically required (as we overlay) but made explicit this way
+ -->
+ <excludes>
+ <exclude>WEB-INF/web.xml</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-vanilla-extension-portal/target/tomcat6x/webapps/ROOT</destinationFolder>
+ </mapping>
+ <mapping>
+ <sourceFolder>src/main/resources</sourceFolder>
+ <destinationFolder>@../rave-vanilla-extension-portal/target/tomcat6x/webapps/ROOT/WEB-INF/classes</destinationFolder>
+ </mapping>
+ </mappings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/web.xml?rev=1291651&view=auto
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/src/main/webapp/WEB-INF/web.xml Tue Feb 21 08:27:57 2012
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ Exact copy of rave-shindig/src/main/webapp/WEB-INF/web.xml
+ Maven cannot compile a war without a web.xml
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="Shindig"
+ version="2.5">
+ <display-name>Shindig</display-name>
+
+ <!-- Spring context configuration -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ classpath:rave-shindig-applicationContext.xml
+ classpath:rave-shindig-dataContext.xml
+ classpath:modules-context.xml
+ </param-value>
+ </context-param>
+
+ <!--
+ Syntax: <key>=<value> separated by a newline
+
+ system.properties specifies the environmental variables that will be set to the JVM System Properties at server startup time.
+ Alternatively, you may add these values in your app server (ex: Tomcat) as
+ VM arguments like this: -Dshindig.host="my.production.shindig.server.com".
+
+ Here are a few properties that can be set for Shindig:
+ shindig.host: the server name that Shindig is deployed and running on
+ shindig.port: the port number of shindig.host server
+
+ Make sure you escape all HTML values for the web.xml to be parsed correctly.
+ -->
+ <context-param>
+ <param-name>system.properties</param-name>
+ <param-value>
+ <![CDATA[
+ shindig.host=
+ shindig.port=
+ aKey=/shindig/gadgets/proxy?container=default&url=
+ ]]>
+ </param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>hostFilter</filter-name>
+ <filter-class>org.apache.shindig.common.servlet.HostFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>hostFilter</filter-name>
+ <url-pattern>/gadgets/ifr</url-pattern>
+ <url-pattern>/gadgets/js/*</url-pattern>
+ <url-pattern>/gadgets/proxy/*</url-pattern>
+ <url-pattern>/gadgets/concat</url-pattern>
+ <url-pattern>/gadgets/makeRequest</url-pattern>
+ <url-pattern>/rpc/*</url-pattern>
+ <url-pattern>/rest/*</url-pattern>
+ </filter-mapping>
+
+ <filter>
+ <filter-name>ShiroFilter</filter-name>
+ <filter-class>org.apache.shiro.web.servlet.IniShiroFilter</filter-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>
+ <![CDATA[
+ # The ShiroFilter configuration is very powerful and flexible, while still remaining succinct.
+ # Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
+ #
+ # http://www.jsecurity.org/api/org/jsecurity/web/servlet/JSecurityFilter.html
+ [main]
+ shindigSampleRealm = org.apache.shindig.sample.shiro.SampleShiroRealm
+ securityManager.realm = $shindigSampleRealm
+ authc.loginUrl = /login.jsp
+
+ [urls]
+ # The /login.jsp is not restricted to authenticated users (otherwise no one could log in!), but
+ # the 'authc' filter must still be specified for it so it can process that url's
+ # login submissions. It is 'smart' enough to allow those requests through as specified by the
+ # shiro.loginUrl above.
+ /login.jsp = authc
+
+ /oauth/authorize/** = authc
+ /oauth2/authorize/** = authc
+ ]]>
+ </param-value>
+ </init-param>
+ </filter>
+
+ <filter>
+ <filter-name>authFilter</filter-name>
+ <filter-class>org.apache.shindig.auth.AuthenticationServletFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>etagFilter</filter-name>
+ <filter-class>org.apache.shindig.gadgets.servlet.ETagFilter</filter-class>
+ </filter>
+
+
+ <filter-mapping>
+ <filter-name>ShiroFilter</filter-name>
+ <url-pattern>/oauth/authorize</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>ShiroFilter</filter-name>
+ <url-pattern>/oauth2/authorize</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>ShiroFilter</filter-name>
+ <url-pattern>*.jsp</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>authFilter</filter-name>
+ <url-pattern>/social/*</url-pattern>
+ <url-pattern>/gadgets/ifr</url-pattern>
+ <url-pattern>/gadgets/makeRequest</url-pattern>
+ <url-pattern>/gadgets/api/rpc/*</url-pattern>
+ <url-pattern>/gadgets/api/rest/*</url-pattern>
+ <url-pattern>/rpc/*</url-pattern>
+ <url-pattern>/rest/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>etagFilter</filter-name>
+ <url-pattern>*</url-pattern>
+ </filter-mapping>
+
+ <!--
+ <listener>
+ <listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class>
+ </listener>
+ -->
+
+ <!-- Initialize Spring LAST -->
+ <listener>
+ <listener-class>org.apache.rave.inject.GuiceBindingSpringContextLoaderListener</listener-class>
+ </listener>
+
+ <!-- Render a Gadget -->
+ <servlet>
+ <servlet-name>xml-to-html</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.GadgetRenderingServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>accel</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.HtmlAccelServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- Proxy -->
+ <servlet>
+ <servlet-name>proxy</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.ProxyServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- makeRequest -->
+ <servlet>
+ <servlet-name>makeRequest</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.MakeRequestServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- Concat -->
+ <servlet>
+ <servlet-name>concat</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.ConcatProxyServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- OAuth callback -->
+ <servlet>
+ <servlet-name>oauthCallback</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.OAuthCallbackServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- OAuth2 callback -->
+ <servlet>
+ <servlet-name>oauth2callback</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.OAuth2CallbackServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- Metadata RPC -->
+ <servlet>
+ <servlet-name>metadata</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.RpcServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- javascript serving -->
+ <servlet>
+ <servlet-name>js</servlet-name>
+ <servlet-class>org.apache.shindig.gadgets.servlet.JsServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>restapiServlet</servlet-name>
+ <servlet-class>
+ org.apache.shindig.protocol.DataServiceServlet
+ </servlet-class>
+ <init-param>
+ <param-name>handlers</param-name>
+ <param-value>org.apache.shindig.handlers</param-value>
+ </init-param>
+ </servlet>
+
+ <!-- Serve social RPC api -->
+ <servlet>
+ <servlet-name>jsonRpcServlet</servlet-name>
+ <servlet-class>
+ org.apache.shindig.protocol.JsonRpcServlet
+ </servlet-class>
+ <init-param>
+ <param-name>handlers</param-name>
+ <param-value>org.apache.shindig.handlers</param-value>
+ </init-param>
+ </servlet>
+
+ <!-- Serve sample OAuth apis -->
+ <servlet>
+ <servlet-name>sampleOAuth</servlet-name>
+ <servlet-class>
+ org.apache.shindig.social.sample.oauth.SampleOAuthServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- Serve OAuth 2 APIs -->
+ <servlet>
+ <servlet-name>OAuth2Servlet</servlet-name>
+ <servlet-class>
+ org.apache.shindig.social.core.oauth2.OAuth2Servlet
+ </servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>rpcSwf</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.servlet.RpcSwfServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>js</servlet-name>
+ <url-pattern>/gadgets/js/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>proxy</servlet-name>
+ <url-pattern>/gadgets/proxy/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>makeRequest</servlet-name>
+ <url-pattern>/gadgets/makeRequest</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>jsonRpcServlet</servlet-name>
+ <url-pattern>/rpc/*</url-pattern>
+ <url-pattern>/gadgets/api/rpc/*</url-pattern>
+ <url-pattern>/social/rpc/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>restapiServlet</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
+ <url-pattern>/gadgets/api/rest/*</url-pattern>
+ <url-pattern>/social/rest/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>concat</servlet-name>
+ <url-pattern>/gadgets/concat</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>oauthCallback</servlet-name>
+ <url-pattern>/gadgets/oauthcallback</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>oauth2callback</servlet-name>
+ <url-pattern>/gadgets/oauth2callback</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>xml-to-html</servlet-name>
+ <url-pattern>/gadgets/ifr</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>accel</servlet-name>
+ <url-pattern>/gadgets/accel</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>metadata</servlet-name>
+ <url-pattern>/gadgets/metadata</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>sampleOAuth</servlet-name>
+ <url-pattern>/oauth/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>OAuth2Servlet</servlet-name>
+ <url-pattern>/oauth2/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>rpcSwf</servlet-name>
+ <url-pattern>/xpc*</url-pattern>
+ </servlet-mapping>
+</web-app>