[Ogoglio-commits] SF.net SVN: ogoglio: [340] maven/trunk/ogoglio

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

Revision: 340
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=340&view=rev
Author:   iansmith
Date:     2007-09-02 16:21:36 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
POM munging. Small changes to make things more symmetric.

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

Modified: maven/trunk/ogoglio/pom.xml
===================================================================
--- maven/trunk/ogoglio/pom.xml	2007-09-02 20:29:33 UTC (rev 339)
+++ maven/trunk/ogoglio/pom.xml	2007-09-02 23:21:36 UTC (rev 340)
@@ -67,45 +67,6 @@
 		</profile>
 		<profile>
 			<id>server-side</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.cargo</groupId>
-						<artifactId>cargo-maven2-plugin</artifactId>
-						<version>0.3-SNAPSHOT</version>
-						<executions>
-							<execution>
-								<id>server-side</id>
-								<inherited>true</inherited>
-								<phase>install</phase>
-								<goals>
-									<goal>deploy</goal>
-								</goals>
-								<configuration>
-									<container>
-										<containerId>
-											tomcat5x
-										</containerId>
-									</container>
-									<!-- Configuration to use with the container -->
-									<configuration>
-										<type>existing</type>
-										<home>
-											${ogoglio.tmp.tomcat5x}
-										</home>
-									</configuration>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<skip>true</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 			<modules>
 				<module>../ogoglio-server</module>
 			</modules>
@@ -127,16 +88,19 @@
 		</snapshotRepository>
 	</distributionManagement>
 
+
 	<build>
-		<plugins>
-			<!-- solves the problem with java3d not being able to link due to isolated classloader -->
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<childDelegation>true</childDelegation>
-				</configuration>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!-- solves the problem with java3d not being able to link due to isolated classloader -->
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<configuration>
+						<childDelegation>true</childDelegation>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>
 

Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml	2007-09-02 20:29:33 UTC (rev 339)
+++ maven/trunk/ogoglio-server/pom.xml	2007-09-02 23:21:36 UTC (rev 340)
@@ -83,10 +83,17 @@
 					<include>test-config.properties</include>
 					<include>basic-config.properties</include>
 					<include>bootstrap.properties</include>
+				</includes>
+			</testResource>
+			<testResource>
+				<filtering>false</filtering>
+				<directory>src/test/resources</directory>
+				<includes>
 					<include>mail/*</include>
 					<include>templates/*</include>
 				</includes>
 			</testResource>
+
 		</testResources>
 
 
@@ -181,22 +188,47 @@
 						</configuration>
 					</execution>
 				</executions>
-
 			</plugin>
-			<!--  CARGO CONFIG -->
+			<!--  CARGO CONFIG:INSTALL TO RUNNING SERVER -->
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>
 				<artifactId>cargo-maven2-plugin</artifactId>
 				<version>0.3-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<id>server-side</id>
+						<inherited>true</inherited>
+						<phase>install</phase>
+						<goals>
+							<goal>deploy</goal>
+						</goals>
+						<configuration>
+							<container>
+								<containerId>tomcat5x</containerId>
+							</container>
+							<!-- Configuration to use with the container -->
+							<configuration>
+								<type>existing</type>
+								<home>${ogoglio.tmp.tomcat5x}</home>
+							</configuration>
+							<deployables>
+								<deployable>
+									<properties>
+										<context>
+											${pom.artifactId}
+										</context>
+									</properties>
+								</deployable>
+							</deployables>
+
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<!-- Deployer configuration -->
-					<deployables>
-						<deployable>
-							<properties>
-								<context>${pom.artifactId}</context>
-							</properties>
-						</deployable>
-					</deployables>
+					<skip>true</skip>
 				</configuration>
 			</plugin>
 		</plugins>


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