rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpie...@apache.org
Subject svn commit: r1173689 - in /incubator/rave/sandbox/science-gateways: pom.xml rave-gateway-extensions/pom.xml rave-gateway-extensions/src/main/resources/log4j.properties
Date Wed, 21 Sep 2011 14:50:05 GMT
Author: mpierce
Date: Wed Sep 21 14:50:05 2011
New Revision: 1173689

URL: http://svn.apache.org/viewvc?rev=1173689&view=rev
Log:
(Rave-276) Sandbox updated to work with project reorganization (Rave-171)

Modified:
    incubator/rave/sandbox/science-gateways/pom.xml
    incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml
    incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/resources/log4j.properties

Modified: incubator/rave/sandbox/science-gateways/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/pom.xml?rev=1173689&r1=1173688&r2=1173689&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/pom.xml Wed Sep 21 14:50:05 2011
@@ -37,34 +37,41 @@
     </scm>
 
     <properties>
+		<!--These are vanilla properties -->
+		  <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>
+		  <!-- 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 -->
+		  <maven.filesync.override>false</maven.filesync.override>
+		  
+		  <!-- These are extension properties for this project -->
         <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>
@@ -89,9 +96,51 @@
            <dependency>
                 <groupId>org.apache.rave</groupId>
                 <artifactId>rave-commons</artifactId>
-               <version>${project.version}</version>
+               <version>${apache.rave.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>
+				
+				<!-- 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>
+
+            <!-- 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>
+
+            <dependency>
                 <groupId>org.apache.shindig</groupId>
                 <artifactId>shindig-server</artifactId>
                 <version>${apache.shindig.version}</version>
@@ -260,43 +309,9 @@
                 <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>
-
+			 </dependencies>
+		  </dependencyManagement>
+		  
   <build>
     <defaultGoal>install</defaultGoal>
 

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=1173689&r1=1173688&r2=1173689&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml Wed Sep 21 14:50:05
2011
@@ -22,105 +22,115 @@
 <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-gateway-extensions</artifactId>
   <name>Apache Rave :: rave-sandbox-extensions</name>
   <description>Apache Rave Project Sandbox</description>
   <packaging>war</packaging>
   <version>SNAPSHOT</version>
-
+  
   <parent>
-    <groupId>org.apache.rave</groupId>
-    <artifactId>rave-sandbox</artifactId>
-    <version>SNAPSHOT</version>
-    <relativePath>..</relativePath>
+	 <groupId>org.apache.rave</groupId>
+	 <artifactId>rave-sandbox</artifactId>
+	 <version>SNAPSHOT</version>
+	 <relativePath>..</relativePath>
   </parent>
-
+  
   <repositories>
     <repository>
-      <id>gateway.repo</id>
-      <name>OGCE Gateways Libraries</name>
-      <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
-    </repository>
+		<id>gateway.repo</id>
+		<name>OGCE Gateways Libraries</name>
+		<url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
+	 </repository>
   </repositories>
-
+  
   <properties>
 	 <scope.sharedlib></scope.sharedlib>
-	 <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>
-
-         <main.basedir>${project.parent.basedir}</main.basedir>
-         <!-- Change this to point to the community credential -->
-         <communityCertLocation>/tmp/x509up_u501</communityCertLocation>
-
+	 <main.basedir>${project.parent.basedir}</main.basedir>
+	 <!-- Change this to point to the community credential -->
+	 <communityCertLocation>/tmp/x509up_u501</communityCertLocation>
+	 <xml.security.version>1.3.0</xml.security.version>
+	 <gridshib.version>0_5_0</gridshib.version>
+	 <globus.opensaml.version>1.1</globus.opensaml.version>
+	 
 	 <!-- Change this to the appropriate group. -->
 	 <attribute.ismember.value>group://ogce.org/ogce</attribute.ismember.value>
-
-         <!-- This must match the cargo path used. -->
-         <catalina.home>${basedir}/target/tomcat6x</catalina.home>
+	 
+	 <!-- This must match the cargo path used. -->
+	 <catalina.home>${basedir}/target/tomcat6x</catalina.home>
   </properties>
-
+  
   <dependencies>
-	 <!-- ================================================== -->
-	 <!-- These are mininal required dependencies for any extension -->
-	 <!-- ================================================== -->
-	 <dependency>
-		<groupId>org.apache.rave</groupId>
-		<artifactId>rave-commons</artifactId>
-		<version>0.4-incubating-SNAPSHOT</version>
-	 </dependency>
-	 <dependency>
-		<groupId>org.apache.rave</groupId>
-		<artifactId>rave-portal</artifactId>
-		<version>0.4-incubating-SNAPSHOT</version>
-		<type>jar</type>
-		<scope>provided</scope>
-	 </dependency>
-	 <dependency>
-		<groupId>org.apache.rave</groupId>
-		<artifactId>rave-portal</artifactId>
-		<version>0.4-incubating-SNAPSHOT</version>
-		<type>war</type>
-	 </dependency>
-	 <dependency>
-		<groupId>org.apache.rave</groupId>
-		<artifactId>rave-shindig</artifactId>
-		<type>war</type>
-		<version>0.4-incubating-SNAPSHOT</version>
-		<scope>provided</scope>
-	 </dependency>
+	 <!-- These are Rave dependencies -->
+    <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-shindig</artifactId>
+      <type>war</type>
+      <version>${apache.rave.version}</version>
+      <scope>provided</scope>
+    </dependency>
+     <!-- Default Rave database -->
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${com.h2database.version}</version>
+    </dependency>
 
-	 <!-- ================================================== -->
-	 <!-- Gridshib 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>
+
+	 <!-- These are GridShib dependencies -->
     <dependency>
       <groupId>xml-security</groupId>
       <artifactId>xmlsec</artifactId>
-      <version>1.3.0</version>
+      <version>${xml.security.version}</version>
       <scope>compile</scope>
       <type>jar</type>
     </dependency>
-
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
 		<artifactId>gridshib-saml-tools</artifactId>
-      <version>0_5_0</version>
+      <version>${gridshib.version}</version>
 	 </dependency>
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
 		<artifactId>gridshib-common</artifactId>
-      <version>0_5_0</version>
+      <version>${gridshib.version}</version>
 	 </dependency>
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
 		<artifactId>globus-opensaml</artifactId>
-		<version>1.1</version>
+		<version>${globus.opensaml.version}</version>
 	 </dependency>
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
@@ -130,7 +140,7 @@
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
 		<artifactId>opensaml</artifactId>
-		<version>1.1</version>
+		<version>${globus.opensaml.version}</version>
 	 </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -138,9 +148,7 @@
       <version>1.2.13</version>
     </dependency>
 
-	 <!-- ================================================== -->
 	 <!-- These are needed for Grid authentication -->
-	 <!-- ================================================== -->
     <dependency>
       <groupId>cog-jglobus</groupId>
       <artifactId>cog-jglobus</artifactId>
@@ -188,148 +196,14 @@
       <scope>provided</scope>
     </dependency>  
 
-<!--
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.3</version>
-      <type>jar</type>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.1</version>
-      <type>jar</type>
-      <scope>${scope.sharedlib}</scope>
-    </dependency> 
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-      <scope>${scope.sharedlib}</scope>
-    </dependency>
--->
-
-	 <!-- ================================================== -->	 
-	 <!-- Spring -->
-	 <!-- ================================================== -->
-<!--	 
-	 <dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-webmvc</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-jdbc</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-orm</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-web</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-config</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-openid</artifactId>
-		<version>${org.springframework.version}</version>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-oxm</artifactId>
-		<version>${org.springframework.version}</version>
-	 </dependency>
-
-
-	 <dependency>
-		<groupId>org.openid4java</groupId>
-		<artifactId>openid4java-consumer</artifactId>
-		<version>${org.openid4java.version}</version>
-		<type>pom</type>
-	 </dependency>
--->
-	 
-	 <!-- Jackson JSON Mapper -->
-	 <dependency>
-		<groupId>org.codehaus.jackson</groupId>
-		<artifactId>jackson-mapper-asl</artifactId>
-		<version>1.8.1</version>
-	 </dependency>
-	 
 	 <!-- JSON Support -->
 	 <dependency>
 		<groupId>org.json</groupId>
 		<artifactId>json</artifactId>
 		<version>20090211</version>
 	 </dependency>
-	 
-	  <!-- Callback-REST -->
-	 <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey-server.version}</version>
-            </dependency>
-	 
-	 <!--Persistence-->
-<!--
-	 <dependency>
-		<groupId>org.apache.openjpa</groupId>
-		<artifactId>openjpa</artifactId>
-	 </dependency>
-	 
-	 <dependency>
-		<groupId>com.h2database</groupId>
-		<artifactId>h2</artifactId>
-	 </dependency>
--->
-	 
-	 <!-- JSTL -->
-<!--
-	 <dependency>
-		<groupId>org.glassfish.web</groupId>
-		<artifactId>jstl-impl</artifactId>
-	 </dependency>
--->
-	 
-	 <!-- ================================================== -->
+
 	 <!-- Logging -->
-	 <!-- ================================================== -->
 	 <dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-api</artifactId>
@@ -342,23 +216,6 @@
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-log4j12</artifactId>
 	 </dependency>
-<!--
-	 <dependency>
-		<groupId>log4j</groupId>
-		<artifactId>log4j</artifactId>
-	 </dependency>
--->
-	 
-<!--
-	 <dependency>
-		<groupId>com.ibm.icu</groupId>
-		<artifactId>icu4j</artifactId>
-	 </dependency>
-	 <dependency>
-		<groupId>commons-lang</groupId>
-		<artifactId>commons-lang</artifactId>
-	 </dependency>
--->
 	 
 	 <!-- Test -->
 	 <dependency>
@@ -373,148 +230,142 @@
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-test</artifactId>
 	 </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>
-      
-      <plugins>
-
-      <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-war-plugin</artifactId>
-           <version>2.1.1</version>
-           <configuration>
-           <webResources>
-              <resource>
-                <directory>${basedir}/src/main/resources</directory>
-                <targetPath>WEB-INF/classes</targetPath>
-                <filtering>true</filtering>
-	         <includes>
-			<include>*.properties</include>
-		 </includes>
-              </resource>
-              <resource>
-                <directory>${basedir}/src/main/resources/org/globus/gridshib/resource</directory>
-                <targetPath>WEB-INF/classes/org/globus/gridshib/resource</targetPath>
-                <filtering>true</filtering>
-              </resource>
-            </webResources>
-            </configuration>
-        </plugin>
-
-	<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>
+  </dependencies>
+  
+  <profiles>
+	 <!-- This profile is used to make a final distribution -->
+	 <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>
+	 <!-- Note plugins inherit pluginManagement settings from the parent POM -->
+	 <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
+						 You can also use this to specify files you plan to omit, such as log4j config
+						 files.
+              -->
+              <excludes>
+					 <exclude>WEB-INF/applicationContext-security.xml</exclude>
+					 <exclude>WEB-INF/classes/log4j.xmlM</exclude>
+              </excludes>
+            </overlay>
+          </overlays>			 
+			 <webResources>
+				<resource>
+				  <directory>${basedir}/src/main/resources</directory>
+				  <targetPath>WEB-INF/classes</targetPath>
+				  <filtering>true</filtering>
+				  <includes>
+					 <include>*.properties</include>
+				  </includes>
+				</resource>
+				<resource>
+				  <directory>${basedir}/src/main/resources/org/globus/gridshib/resource</directory>
+				  <targetPath>WEB-INF/classes/org/globus/gridshib/resource</targetPath>
+				  <filtering>true</filtering>
+				</resource>
+			 </webResources>
+		  </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-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>
+		</plugin>
+	 </plugins>
+  </build>
+</project>

Modified: incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/resources/log4j.properties?rev=1173689&r1=1173688&r2=1173689&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/resources/log4j.properties
(original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/resources/log4j.properties
Wed Sep 21 14:50:05 2011
@@ -10,6 +10,7 @@
 #####################################################################
 # Default log level is INFO.
 # Change to DEBUG here or on the command line.
+#log4j.rootLogger=INFO, R, A1
 log4j.rootLogger=INFO, R, A1
 
 #####################################################################



Mime
View raw message