Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [317] maven/trunk/ogoglio
|
From: <ian...@us...> - 2007-09-01 00:22:31
|
Revision: 317
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=317&view=rev
Author: iansmith
Date: 2007-08-31 17:22:31 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
POM HACKERY: Resolved java3d dependency and version issue with this bit of settings.xml:
<activeProfiles>
<activeProfile>linux</activeProfile>
</activeProfiles>
Available profiles are linux and osx.
ogoglio project is now partially working as a master pom but it's cargo config is busted. To startup up a tomcat you need to manually remove the module lines, start the server,then put the lines back. ugh.
Modified Paths:
--------------
maven/trunk/ogoglio/pom.xml
maven/trunk/ogoglio-appdev/pom.xml
maven/trunk/ogoglio-body-editor-applet/pom.xml
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-integration-test/pom.xml
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-viewer-applet/pom.xml
Modified: maven/trunk/ogoglio/pom.xml
===================================================================
--- maven/trunk/ogoglio/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -3,20 +3,19 @@
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>ogoglio</groupId>
+ <groupId>com.ogoglio</groupId>
<artifactId>ogoglio</artifactId>
- <version>0.0.1-snapshot</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
<plugins>
- <!-- CARGO FOR STOP/START THE SERVER -->
+ <!-- CARGO INTERACTIONS WITH TOMCAT -->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>0.3-SNAPSHOT</version>
<!-- CARGO CONFIG -->
-
<configuration>
<!-- tomcat 5.5 running on the same machine...-->
<container>
@@ -28,18 +27,27 @@
<!-- tomcat configuration -->
<configuration>
+ <type>standalone</type>
<home>${ogoglio.tmp.tomcat5x}</home>
<properties>
<cargo.servlet.port>
8080
</cargo.servlet.port>
</properties>
- <!-- nothing to deploy -->
- <deployables></deployables>
</configuration>
</configuration>
</plugin>
</plugins>
</build>
+ <modules>
+ <module>../ogoglio-appdev</module>
+ <module>../ogoglio-body-editor-applet</module>
+ <module>../ogoglio-common</module>
+ <module>../ogoglio-integration-test</module>
+ <module>../ogoglio-server</module>
+ <module>../ogoglio-test-applet</module>
+ <module>../ogoglio-viewer-applet</module>
+ </modules>
+
</project>
Modified: maven/trunk/ogoglio-appdev/pom.xml
===================================================================
--- maven/trunk/ogoglio-appdev/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-appdev/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -2,12 +2,13 @@
<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">
+
+ <groupId>com.ogoglio</groupId>
<modelVersion>4.0.0</modelVersion>
- <groupId>com.ogoglio</groupId>
<artifactId>ogoglio-appdev</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
-
+ <version>0.0.1</version>
+
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
@@ -31,6 +32,14 @@
<version>1.3</version>
</dependency>
+ <!-- used by some code in the project -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- -->
<!-- OGOGLIO DEPENDENCIES-->
<!-- -->
Modified: maven/trunk/ogoglio-body-editor-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -13,13 +13,56 @@
<plugins>
</plugins>
</build>
+ <profiles>
+ <!-- LINUX -->
+ <profile>
+ <id>linux</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!-- OSX -->
+ <profile>
+ <id>osx</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
+ <!-- ogoglio -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
+
+
</project>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -9,15 +9,68 @@
<artifactId>ogoglio-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <profiles>
+ <!-- LINUX -->
+ <profile>
+ <id>linux</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core-utils</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!-- OSX -->
+ <profile>
+ <id>osx</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.3</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core-utils</artifactId>
+ <version>1.3</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.3</version>
+ <scope>supplied</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<build>
+
<resources>
<!-- FILTER RESOURCES FOR SOME CONSTANTS-->
<resource>
<targetPath>avatar</targetPath>
<directory>src/main/resources/avatar</directory>
</resource>
-
+
<resource>
<targetPath>templates</targetPath>
<directory>src/main/resources/templates</directory>
@@ -27,26 +80,14 @@
<!-- things we need to build/run -->
<dependencies>
- <!-- jav3d stuff -->
+ <!-- used by some code in the project -->
<dependency>
- <groupId>java3d</groupId>
- <artifactId>j3d-core</artifactId>
- <version>1.3</version>
- <scope>supplied</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>java3d</groupId>
- <artifactId>j3d-core-utils</artifactId>
- <version>1.3</version>
- <scope>supplied</scope>
- </dependency>
- <dependency>
- <groupId>java3d</groupId>
- <artifactId>vecmath</artifactId>
- <version>1.3</version>
- <scope>supplied</scope>
- </dependency>
-
+
<!-- rmock for testing -->
<dependency>
<groupId>com.agical.rmock</groupId>
Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-integration-test/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<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>com.ogoglio</groupId>
<artifactId>ogoglio-integration-test</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+ <version>0.0.1-SNAPSHOT</version>
<build>
- <!-- -->
- <!-- TEST RESOURCES -->
- <!-- -->
<testResources>
<testResource>
- <directory>src/test/resources</directory>
<filtering>true</filtering>
+ <directory>src/test/resources</directory>
<includes>
<include>test-config.properties</include>
<include>basic-config.properties</include>
@@ -25,49 +22,35 @@
</includes>
</testResource>
</testResources>
-
<plugins>
- <!-- COMPILER needed b/c POM packaging by default doesn't build the tests -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- </configuration>
<executions>
<execution>
<id>build integration tests</id>
+ <phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
- <phase>test-compile</phase>
</execution>
</executions>
+ <configuration />
</plugin>
-
- <!-- RESOURCES needed b/c POM packaging by default doesn't copy test resources -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <configuration>
- </configuration>
<executions>
<execution>
<id>build integration tests</id>
+ <phase>process-test-resources</phase>
<goals>
<goal>testResources</goal>
</goals>
- <phase>process-test-resources</phase>
</execution>
</executions>
+ <configuration />
</plugin>
-
- <!-- SUREFIRE WITH INTEGRATION TEST -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip><!-- this is critical to avoid running unit tests, sets default value for skip -->
- </configuration>
<executions>
<execution>
<id>over the wire tests</id>
@@ -81,23 +64,22 @@
**/SpaceDuplicatorTest.java
</exclude>
</excludes>
- <skip>false</skip><!-- don't skip integration tests -->
+ <skip>false</skip>
</configuration>
</execution>
</executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
- <!-- -->
- <!-- OGOGLIO DEPENDENCIES-->
- <!-- -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-server</artifactId>
@@ -115,6 +97,5 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
-
</project>
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -25,19 +25,50 @@
<!-- LINUX -->
<profile>
<id>linux</id>
- <activation>
- <os>
- <name>Linux</name>
- </os>
- <!-- placeholder for some config needed for linux -->
- </activation>
- <properties></properties>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</profile>
+ <!-- OSX -->
+ <profile>
+ <id>osx</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<!-- -->
<!-- BUILD -->
<!-- -->
<build>
+
+ <!-- touching templates causes rebuild -->
+ <scriptSourceDirectory>${basedir}/src/main/resources/siteTemplates</scriptSourceDirectory>
+
<!-- -->
<!-- RESOURCES -->
<!-- -->
@@ -127,7 +158,7 @@
<executions>
<execution>
<id>copy-applets</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -175,7 +206,9 @@
<configuration>
<webResources>
<resource>
- <directory>src/main/webapp/</directory>
+ <!-- this basedir is a workaround for bug -->
+ <!-- http://jira.codehaus.org/browse/MWAR-64 -->
+ <directory>${basedir}/src/main/webapp/</directory>
<filtering>true</filtering>
</resource>
</webResources>
@@ -221,11 +254,6 @@
<!-- DEPENDENCIES -->
<dependencies>
<dependency>
- <groupId>com.agical.rmock</groupId>
- <artifactId>rmock</artifactId>
- <version>2.0.0-rc-6</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
@@ -241,19 +269,11 @@
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
</dependency>
-
-
<dependency>
<groupId>com.sun</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>jaf</artifactId>
- <version>1.1</version>
- </dependency>
-
<!-- need MYSQL for tests -->
<dependency>
<groupId>mysql</groupId>
@@ -261,8 +281,14 @@
<version>5.0.5</version>
<scope>test</scope>
</dependency>
+ <!-- used by some code in the project -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
-
<!-- -->
<!-- OGOGLIO DEPENDENCIES-->
<!-- -->
Modified: maven/trunk/ogoglio-viewer-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-viewer-applet/pom.xml 2007-08-31 23:39:18 UTC (rev 316)
+++ maven/trunk/ogoglio-viewer-applet/pom.xml 2007-09-01 00:22:31 UTC (rev 317)
@@ -8,12 +8,50 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <build>
- <plugins>
- </plugins>
- </build>
+ <!-- -->
+ <!-- profiles -->
+ <!-- -->
+ <profiles>
+ <!-- LINUX -->
+ <profile>
+ <id>linux</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!-- OSX -->
+ <profile>
+ <id>osx</id>
+ <dependencies>
+ <!-- jav3d stuff -->
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
-
<dependencies>
<dependency>
<groupId>netscape</groupId>
@@ -25,16 +63,14 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
+
+ <!-- ogoglio -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>java3d</groupId>
- <artifactId>vecmath</artifactId>
- <version>1.3.1</version>
- </dependency>
+
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
