You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2011/08/25 20:53:15 UTC
svn commit: r1161694 - in /incubator/rave/sandbox/science-gateways: ./
rave-gateway-extensions/
rave-gateway-extensions/src/main/java/org/apache/rave/security/util/
rave-gateway-extensions/src/main/java/org/apache/rave/security/utils/
rave-merger/
Author: mpierce
Date: Thu Aug 25 18:53:15 2011
New Revision: 1161694
URL: http://svn.apache.org/viewvc?rev=1161694&view=rev
Log:
(RAVE-213) Simplifying the gateway sandbox compilation process.
Added:
incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/security/util/
- copied from r1161675, incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/security/utils/
Removed:
incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/security/utils/
incubator/rave/sandbox/science-gateways/rave-merger/
incubator/rave/sandbox/science-gateways/svn_ext.txt
Modified:
incubator/rave/sandbox/science-gateways/pom.xml
incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml
Modified: incubator/rave/sandbox/science-gateways/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/pom.xml?rev=1161694&r1=1161693&r2=1161694&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/pom.xml Thu Aug 25 18:53:15 2011
@@ -37,6 +37,34 @@
</scm>
<properties>
+ <apache.shindig.version>3.0.0-beta2</apache.shindig.version>
+ <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+ <jstl.version>1.2</jstl.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>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
+ <log4j.version>1.2.16</log4j.version>
+ <junit.version>4.7</junit.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <!-- Don't update to commons-validator 1.3.1, it misses a dependency -->
+ <commons-validator.version>1.3.0</commons-validator.version>
+ <icu4j.version>4.6.1</icu4j.version>
+ <easymock.version>3.0</easymock.version>
+ <com.h2database.version>1.3.154</com.h2database.version>
+ <openjpa.version>2.1.1</openjpa.version>
+ <org.openid4java.version>0.9.6</org.openid4java.version>
+ <jersey-server.version>1.6</jersey-server.version>
+ <jersey-spring.version>1.0</jersey-spring.version>
+ <guice.version>3.0</guice.version>
+
+ <!-- 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>
+
+ <!-- default empty javaagent
+ if needed you can specify it on the command line with -Djavaagent="..." -->
+ <javaagent />
</properties>
<repositories>
@@ -55,6 +83,219 @@
</repository>
</repositories>
+ <!-- Global management of all dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server</artifactId>
+ <version>${apache.shindig.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <version>${apache.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${apache.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${apache.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ <scope>test</scope>
+ <version>${apache.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-persist</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jstl-impl</artifactId>
+ <version>${jstl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${com.h2database.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-spring</artifactId>
+ <version>${jersey-spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey-server.version}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <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>
+
+ <!-- Language and localization -->
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>${icu4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+
+ <!-- Validation -->
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>${commons-validator.version}</version>
+ </dependency>
+
+ <!-- Rave artifacts -->
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</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>
+ </dependency>
+
+ <!-- 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>
+ </dependencies>
+ </dependencyManagement>
<build>
<defaultGoal>install</defaultGoal>
@@ -96,8 +337,6 @@
</build>
<modules>
- <module>rave</module>
- <module>rave-gateway-extensions</module>
- <module>rave-merger</module>
+ <module>rave-gateway-extensions</module>
</modules>
</project>
Modified: incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml?rev=1161694&r1=1161693&r2=1161694&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml Thu Aug 25 18:53:15 2011
@@ -22,14 +22,7 @@
<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>
-
- <parent>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-project</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- <relativePath>../rave/</relativePath>
- </parent>
-
+
<groupId>org.apache.rave</groupId>
<artifactId>rave-gateway-extensions</artifactId>
<name>Apache Rave :: rave-sandbox-extensions</name>
@@ -37,6 +30,13 @@
<packaging>war</packaging>
<version>SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-sandbox</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
<repositories>
<repository>
<id>gateway.repo</id>
@@ -71,6 +71,7 @@
<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 -->
@@ -79,7 +80,6 @@
<artifactId>rave-portal</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -379,98 +379,99 @@
</executions>
</plugin>
</plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <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>
- <descriptor>src/merge.xml</descriptor>
- <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-portal</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>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <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>
+ <descriptor>src/merge.xml</descriptor>
+ <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-gateway-extensions</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