[Ogoglio-commits] SF.net SVN: ogoglio: [307] maven/trunk/ogoglio-server/pom.xml

[<ian...@us...>]

Revision: 307
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=307&view=rev
Author:   iansmith
Date:     2007-08-31 09:31:18 -0700 (Fri, 31 Aug 2007)

Log Message:
-----------
Fixed cargo config problem with delpoy.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/pom.xml

Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml	2007-08-31 15:31:42 UTC (rev 306)
+++ maven/trunk/ogoglio-server/pom.xml	2007-08-31 16:31:18 UTC (rev 307)
@@ -17,7 +17,7 @@
 			<url>${my.local.repo}</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
+
 	<!--  -->
 	<!-- profiles -->
 	<!--  -->
@@ -119,7 +119,7 @@
 					</execution>
 				</executions>
 			</plugin>
-		
+
 			<!--  DEPENDENCY PLUGIN: We need to pull in applets -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -186,30 +186,32 @@
 				<groupId>org.codehaus.cargo</groupId>
 				<artifactId>cargo-maven2-plugin</artifactId>
 				<version>0.3-SNAPSHOT</version>
+				<configuration>
+					<container>
+						<containerId>tomcat5x</containerId>
+					</container>
+					<!-- Configuration to use with the container -->
+					<configuration>
+						<type>existing</type>
+						<home>${ogoglio.tmp.tomcat5x}</home>
+						<!-- Deployer configuration -->
+						<deployables>
+							<deployable>
+								<properties>
+									<context>${pom.artifactId}</context>
+								</properties>
+							</deployable>
+						</deployables>
+					</configuration>
+				</configuration>
 				<executions>
 					<execution>
 						<id>install</id>
-						<phase>integration-test</phase>  <!-- just must be after packaging -->
-						<goals><goal>deploy</goal></goals>
+						<phase>integration-test</phase><!-- just must be after packaging -->
+						<goals>
+							<goal>deploy</goal>
+						</goals>
 						<!--  CARGO CONFIG -->
-						<configuration>
-							<container>
-								<containerId>tomcat5x</containerId>
-							</container>
-							<!-- Configuration to use with the container -->
-							<configuration>
-								<type>existing</type>
-								<home>${ogoglio.tmp.tomcat5x}</home>
-								<!-- Deployer configuration -->
-								<deployables>
-									<deployable>
-										<properties>
-				               				<context>${pom.artifactId}</context>
-               							</properties>
-									</deployable>
-								</deployables>
-							</configuration>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.