Menu
▾
▴
ogoglio-commits
|
From: <ian...@us...> - 2007-08-31 16:31:20
|
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.
|
|
From: <tre...@us...> - 2007-08-31 16:41:58
|
Revision: 309
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=309&view=rev
Author: trevorolio
Date: 2007-08-31 09:41:56 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Tweaked the server pom to correctly bind the html generation to the code-generation build phase.
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-08-31 16:41:11 UTC (rev 308)
+++ maven/trunk/ogoglio-server/pom.xml 2007-08-31 16:41:56 UTC (rev 309)
@@ -104,7 +104,7 @@
<artifactId>dev-plugins</artifactId>
<executions>
<execution>
- <phase>prepare-package</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>buildHtml</goal>
</goals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-03 22:14:08
|
Revision: 351
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=351&view=rev
Author: iansmith
Date: 2007-09-03 15:13:54 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
more pom hacking
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-03 22:13:29 UTC (rev 350)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-03 22:13:54 UTC (rev 351)
@@ -14,19 +14,6 @@
<artifactId>ogoglio-server</artifactId>
<packaging>war</packaging>
- <!-- 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>
- <profile>
- <id>server-side</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- </profiles>
-
<!-- -->
<!-- BUILD -->
<!-- -->
@@ -189,48 +176,6 @@
</execution>
</executions>
</plugin>
- <!-- 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>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-05 22:32:44
|
Revision: 370
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=370&view=rev
Author: trevorolio
Date: 2007-09-05 15:32:42 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
hot-deploy
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-05 20:41:18 UTC (rev 369)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-05 22:32:42 UTC (rev 370)
@@ -14,7 +14,6 @@
<artifactId>ogoglio-server</artifactId>
<packaging>war</packaging>
-
<profiles>
<profile>
<id>hot-deploy</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-11-01 17:27:04
|
Revision: 552
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=552&view=rev
Author: trevorolio
Date: 2007-11-01 10:27:05 -0700 (Thu, 01 Nov 2007)
Log Message:
-----------
Added a separate guest body, in this case a simplified Mike with a matte black texture.
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-11-01 17:27:02 UTC (rev 551)
+++ maven/trunk/ogoglio-server/pom.xml 2007-11-01 17:27:05 UTC (rev 552)
@@ -144,6 +144,12 @@
<artifactItem>
<groupId>com.ogoglio.body</groupId>
<artifactId>
+ ogoglio-body-guest
+ </artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ogoglio.body</groupId>
+ <artifactId>
ogoglio-body-andrea
</artifactId>
</artifactItem>
@@ -348,6 +354,12 @@
</dependency>
<dependency>
<groupId>com.ogoglio.body</groupId>
+ <artifactId>ogoglio-body-guest</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ogoglio.body</groupId>
<artifactId>ogoglio-body-andrea</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>runtime</scope>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-11-13 17:30:30
|
Revision: 575
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=575&view=rev
Author: trevorolio
Date: 2007-11-13 09:30:34 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Removed log4j dependencies from the poms.
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-11-13 00:44:33 UTC (rev 574)
+++ maven/trunk/ogoglio-server/pom.xml 2007-11-13 17:30:34 UTC (rev 575)
@@ -41,12 +41,6 @@
</includes>
</resource>
<resource>
- <directory>src/main/resources/log4j</directory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- </resource>
- <resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
@@ -76,7 +70,6 @@
<filtering>false</filtering>
<directory>src/test/resources</directory>
<includes>
- <include>log4j.properties</include>
<include>mail/*</include>
<include>templates/*</include>
</includes>
@@ -290,12 +283,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <!-- version, scope, optional inherited but overwritable -->
- </dependency>
-
- <dependency>
<groupId>com.sun</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
