Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [339] maven/trunk
|
From: <ian...@us...> - 2007-09-02 20:29:37
|
Revision: 339
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=339&view=rev
Author: iansmith
Date: 2007-09-02 13:29:33 -0700 (Sun, 02 Sep 2007)
Log Message:
-----------
Converted ogoglio to use a master pom arrangement.
Modified Paths:
--------------
maven/trunk/dev-plugins/pom.xml
maven/trunk/dev-plugins/src/main/java/com/transmutable/plugin/StaticVelocitySitePlugin.java
maven/trunk/ogoglio/pom.xml
maven/trunk/ogoglio-appdev/pom.xml
maven/trunk/ogoglio-body-editor-applet/pom.xml
maven/trunk/ogoglio-common/.classpath
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-integration-test/pom.xml
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-test-applet/pom.xml
maven/trunk/ogoglio-viewer-applet/pom.xml
Property Changed:
----------------
maven/trunk/ogoglio/
Modified: maven/trunk/dev-plugins/pom.xml
===================================================================
--- maven/trunk/dev-plugins/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/dev-plugins/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -1,36 +1,44 @@
-<?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>dev-plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip><!-- this is critical to avoid running unit tests -->
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
+<?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>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- </dependencies>
-
-</project>
-
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
+ <artifactId>dev-plugins</artifactId>
+ <packaging>maven-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip><!-- this is critical to avoid running unit tests -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: maven/trunk/dev-plugins/src/main/java/com/transmutable/plugin/StaticVelocitySitePlugin.java
===================================================================
--- maven/trunk/dev-plugins/src/main/java/com/transmutable/plugin/StaticVelocitySitePlugin.java 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/dev-plugins/src/main/java/com/transmutable/plugin/StaticVelocitySitePlugin.java 2007-09-02 20:29:33 UTC (rev 339)
@@ -30,7 +30,14 @@
private File targetDirectory;
public void execute() throws MojoExecutionException {
-
+ if (templateDirectory==null) {
+ getLog().warn("No velocity templates configured!");
+ return;
+ } else if ((!templateDirectory.exists()) || (!templateDirectory.canRead())) {
+ getLog().warn("Can't find any velocity templates to compile!");
+ return;
+ }
+
if (targetDirectory.exists()==false) {
if (targetDirectory.mkdir()==false) {
getLog().error("Unable to create target directory:"+targetDirectory.getName());
Property changes on: maven/trunk/ogoglio
___________________________________________________________________
Name: svn:ignore
- target
+ target
tomcat5x.out
Modified: maven/trunk/ogoglio/pom.xml
===================================================================
--- maven/trunk/ogoglio/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -8,46 +8,135 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <profiles>
+ <profile>
+ <id>boot-server</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <!-- CARGO INTERACTIONS WITH TOMCAT FOR BOOTING SERVER ONLY -->
+ <configuration>
+ <!-- tomcat 5.5 running on the same machine...-->
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${cargo.tomcat5x.home}</home>
+ <log>${basedir}/tomcat5x.log</log>
+ <output>${basedir}/tomcat5x.out</output>
+ </container>
+ <!-- tomcat configuration -->
+ <configuration>
+ <type>standalone</type>
+ <home>${ogoglio.tmp.tomcat5x}</home>
+ <properties>
+ <cargo.servlet.port>
+ 8080
+ </cargo.servlet.port>
+ </properties>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>all</id>
+ <modules>
+ <module>../ogoglio-appdev</module>
+ <module>../ogoglio-body-editor-applet</module>
+ <module>../ogoglio-common</module>
+ <module>../ogoglio-test-applet</module>
+ <module>../ogoglio-viewer-applet</module>
+ <module>../ogoglio-server</module>
+ <module>../ogoglio-integration-test</module>
+ <module>../dev-plugins</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>client-side</id>
+ <modules>
+ <module>../ogoglio-appdev</module>
+ <module>../ogoglio-body-editor-applet</module>
+ <module>../ogoglio-common</module>
+ <module>../ogoglio-test-applet</module>
+ <module>../ogoglio-viewer-applet</module>
+ <module>../dev-plugins</module>
+ </modules>
+ </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>
+ </profile>
+ <profile>
+ <id>integration-test</id>
+ <modules>
+ <module>../ogoglio-integration-test</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>local-disk</id>
+ <uniqueVersion>false</uniqueVersion>
+ <name>local disk</name>
+ <url>${my.local.repo}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<build>
<plugins>
- <!-- CARGO INTERACTIONS WITH TOMCAT -->
+ <!-- solves the problem with java3d not being able to link due to isolated classloader -->
<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3-SNAPSHOT</version>
- <!-- CARGO CONFIG -->
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- tomcat 5.5 running on the same machine...-->
- <container>
- <containerId>tomcat5x</containerId>
- <home>${cargo.tomcat5x.home}</home>
- <log>${project.build.directory}/tomcat5x.log</log>
- <output>${project.build.directory}/tomcat5x.out</output>
- </container>
-
- <!-- tomcat configuration -->
- <configuration>
- <type>standalone</type>
- <home>${ogoglio.tmp.tomcat5x}</home>
- <properties>
- <cargo.servlet.port>
- 8080
- </cargo.servlet.port>
- </properties>
- </configuration>
+ <childDelegation>true</childDelegation>
</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-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-appdev/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -2,12 +2,16 @@
<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>
- <modelVersion>4.0.0</modelVersion>
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-appdev</artifactId>
- <packaging>jar</packaging>
- <version>0.0.1</version>
<dependencies>
<dependency>
Modified: maven/trunk/ogoglio-body-editor-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -2,58 +2,17 @@
<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>
+
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-body-editor-applet</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <build>
- <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>
Modified: maven/trunk/ogoglio-common/.classpath
===================================================================
--- maven/trunk/ogoglio-common/.classpath 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-common/.classpath 2007-09-02 20:29:33 UTC (rev 339)
@@ -2,7 +2,9 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources/avatar" path="src/main/resources/avatar"/>
<classpathentry excluding="**" kind="src" output="src/main/resources/templates" path="src/main/resources/templates"/>
+ <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -5,65 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<!-- About this project -->
- <groupId>com.ogoglio</groupId>
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<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>
@@ -71,6 +21,7 @@
<directory>src/main/resources/avatar</directory>
</resource>
+ <!-- for loading indicator -->
<resource>
<targetPath>templates</targetPath>
<directory>src/main/resources/templates</directory>
Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-integration-test/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -4,10 +4,26 @@
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>
+
+ <profiles>
+ <profile>
+ <id>integration-test</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
+
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-integration-test</artifactId>
<packaging>pom</packaging>
- <version>0.0.1-SNAPSHOT</version>
+
<build>
<testResources>
<testResource>
@@ -17,6 +33,12 @@
<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>sample-art3d/*</include>
</includes>
@@ -74,6 +96,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -4,74 +4,41 @@
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>
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-server</artifactId>
<packaging>war</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <distributionManagement>
- <snapshotRepository>
- <id>local-disk</id>
- <uniqueVersion>false</uniqueVersion>
- <name>local disk</name>
- <url>${my.local.repo}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- -->
- <!-- profiles -->
- <!-- -->
+ <!-- mildly questionable: with this profile active by default, you don't get tests run -->
+ <!-- when you do 'install' in this directory... this is b/c often you don't want to destroy -->
+ <!-- the db (which the tests do) when doing server development... comment this out to get -->
+ <!-- the maven default behavior -->
<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>
+ <id>server-side</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
</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>
-
- <!-- -->
+ <scriptSourceDirectory>
+ ${basedir}/src/main/resources/siteTemplates
+ </scriptSourceDirectory>
+
+ <!-- -->
<!-- RESOURCES -->
- <!-- -->
+ <!-- -->
<resources>
<resource>
<directory>src/main/resources/hibernate</directory>
@@ -105,9 +72,9 @@
</resource>
</resources>
- <!-- -->
+ <!-- -->
<!-- TEST RESOURCES -->
- <!-- -->
+ <!-- -->
<testResources>
<testResource>
<directory>src/test/resources</directory>
@@ -123,31 +90,10 @@
</testResources>
- <!-- -->
+ <!-- -->
<!-- PLUGINS -->
- <!-- -->
+ <!-- -->
<plugins>
- <!-- our own plugin for building the static code -->
- <plugin>
- <groupId>com.ogoglio</groupId>
- <artifactId>dev-plugins</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>buildHtml</goal>
- </goals>
- <configuration>
- <templateDirectory>
- src/main/resources/siteTemplates
- </templateDirectory>
- <targetDirectory>
- target/${artifactId}-${version}
- </targetDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- DEPENDENCY PLUGIN: We need to pull in applets -->
<plugin>
@@ -206,46 +152,53 @@
<resource>
<!-- this basedir is a workaround for bug -->
<!-- http://jira.codehaus.org/browse/MWAR-64 -->
- <directory>${basedir}/src/main/webapp/</directory>
+ <directory>
+ ${basedir}/src/main/webapp/
+ </directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
- <!-- CARGO FOR DEPLOY SERVER -->
+ <!-- Our plugin config for building templates -->
<plugin>
- <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>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>dev-plugins</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<executions>
<execution>
- <id>install</id>
- <phase>integration-test</phase><!-- just must be after packaging -->
+ <phase>compile</phase>
<goals>
- <goal>deploy</goal>
+ <goal>buildHtml</goal>
</goals>
- <!-- CARGO CONFIG -->
+ <configuration>
+ <templateDirectory>
+ src/main/resources/siteTemplates
+ </templateDirectory>
+ <targetDirectory>
+ target/${artifactId}-${version}
+ </targetDirectory>
+ </configuration>
</execution>
</executions>
+
</plugin>
+ <!-- CARGO CONFIG -->
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <configuration>
+ <!-- Deployer configuration -->
+ <deployables>
+ <deployable>
+ <properties>
+ <context>${pom.artifactId}</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -287,9 +240,9 @@
<scope>compile</scope>
</dependency>
- <!-- -->
+ <!-- -->
<!-- OGOGLIO DEPENDENCIES-->
- <!-- -->
+ <!-- -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-common</artifactId>
@@ -300,9 +253,9 @@
<artifactId>ogoglio-appdev</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <!-- -->
+ <!-- -->
<!-- BOGUS DEPENDENCIES-->
- <!-- -->
+ <!-- -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-viewer-applet</artifactId>
Modified: maven/trunk/ogoglio-test-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-test-applet/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-test-applet/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -2,13 +2,16 @@
<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>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.ogoglio</groupId>
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-test-applet</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
<build>
<plugins>
@@ -16,12 +19,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip><!-- ugh no unit tests -->
+ <skip>true</skip><!-- ugh, no unit tests -->
</configuration>
</plugin>
</plugins>
</build>
-
- <dependencies></dependencies>
</project>
Modified: maven/trunk/ogoglio-viewer-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-viewer-applet/pom.xml 2007-09-02 20:04:48 UTC (rev 338)
+++ maven/trunk/ogoglio-viewer-applet/pom.xml 2007-09-02 20:29:33 UTC (rev 339)
@@ -3,55 +3,16 @@
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>
+
+ <!-- About this project -->
+ <parent>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../ogoglio</relativePath>
+ </parent>
<artifactId>ogoglio-viewer-applet</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <!-- -->
- <!-- 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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
