You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2011/09/21 12:49:06 UTC
svn commit: r1173568 - in
/incubator/rave/sandbox/rave-extensions/rave-vanilla-extension: ./ pom.xml
src/main/webapp/META-INF/
Author: ate
Date: Wed Sep 21 10:49:06 2011
New Revision: 1173568
URL: http://svn.apache.org/viewvc?rev=1173568&view=rev
Log:
RAVE-171: align rave-vanilla-extension with Rave project restructuring
See: https://issues.apache.org/jira/browse/RAVE-171
Removed:
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/src/main/webapp/META-INF/
Modified:
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/ (props changed)
incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
Propchange: incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 21 10:49:06 2011
@@ -0,0 +1,7 @@
+.project
+
+target
+
+.settings
+
+.classpath
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=1173568&r1=1173567&r2=1173568&view=diff
==============================================================================
--- incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml (original)
+++ incubator/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml Wed Sep 21 10:49:06 2011
@@ -19,175 +19,260 @@
$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">
-
+<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"
+>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rave</groupId>
<artifactId>rave-vanilla-extension</artifactId>
- <name>Apache Rave :: rave-vanilla-extension</name>
+ <name>Apache Rave :: rave-vanilla-extension</name>
<description>Apache Rave Project Sandbox</description>
<packaging>war</packaging>
<version>SNAPSHOT</version>
<properties>
- <scope.sharedlib>compile</scope.sharedlib>
- <cargo.version>1.1.0</cargo.version>
+ <apache.rave.version>0.4-incubating-SNAPSHOT</apache.rave.version>
+ <com.h2database.version>1.3.154</com.h2database.version>
+ <javax.servlet.version>2.5</javax.servlet.version>
+ <jsp-api.version>2.1</jsp-api.version>
+ <el-api.version>1.0</el-api.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <junit.version>4.7</junit.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>
+ <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 />
+ <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 -->
+ <maven.filesync.override>false</maven.filesync.override>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-commons</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- </dependency>
-
- <!--The rave-portal.jar is needed for compilation -->
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
-
- <!-- The rave-portal.war dependency is needed for running with cargo -->
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-shindig</artifactId>
- <type>war</type>
- <version>0.3-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- <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>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <defaultGoal>install</defaultGoal>
+ <!-- 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>
+
+ <!-- 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>
+
+ </dependencies>
+
+ <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>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
<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>com.github.searls</groupId>
- <artifactId>jasmine-maven-plugin</artifactId>
- <version>1.0.2-beta-2</version>
- <executions>
- <execution>
- <goals>
- <goal>generateManualRunner</goal>
- <goal>resources</goal>
- <goal>testResources</goal>
- <goal>test</goal>
- </goals>
- <configuration>
- <jsSrcDir>${project.basedir}/src/main/webapp/script/</jsSrcDir>
- <debug>true</debug>
- </configuration>
- </execution>
- </executions>
- </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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>com.googlecode.mavenfilesync</groupId>
+ <artifactId>maven-filesync-plugin</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <override>${maven.filesync.override}</override>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <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>
+ <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-vanilla-extension</artifactId>
- <type>war</type>
- <properties>
- <context>/portal</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- <container>
- <containerId>tomcat6x</containerId>
- <timeout>180000</timeout>
- <zipUrlInstaller>
- <url>
- http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
+ </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-vanilla-extension</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ <container>
+ <containerId>tomcat6x</containerId>
+ <timeout>180000</timeout>
+ <zipUrlInstaller>
+ <url>
+ http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
</url>
- </zipUrlInstaller>
- <systemProperties>
- <shindig.host>localhost</shindig.host>
- </systemProperties>
- </container>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
\ No newline at end of file
+ </zipUrlInstaller>
+ <systemProperties>
+ <shindig.host>localhost</shindig.host>
+ </systemProperties>
+ </container>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file