Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [361] maven/trunk/ogoglio-server
|
From: <ian...@us...> - 2007-09-05 03:18:05
|
Revision: 361
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=361&view=rev
Author: iansmith
Date: 2007-09-04 20:18:04 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
Patched the POM again. This time we allow this (in the server directory):
mvn -Phot-deploy war:war cargo:deploy
to allow you to bypass the tests.
Added an example space with four things in it to the populate resources.
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
Added Paths:
-----------
maven/trunk/ogoglio-server/src/main/resources/populate/space-1
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-05 01:48:14 UTC (rev 360)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-05 03:18:04 UTC (rev 361)
@@ -14,6 +14,42 @@
<artifactId>ogoglio-server</artifactId>
<packaging>war</packaging>
+
+ <profiles>
+ <profile>
+ <id>hot-deploy</id>
+ <build>
+ <plugins>
+ <!-- CARGO CONFIG:INSTALL TO RUNNING SERVER -->
+ <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>
+ </configuration>
+ <deployables>
+ <deployable>
+ <properties>
+ <context>
+ ${pom.artifactId}
+ </context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<!-- -->
<!-- BUILD -->
<!-- -->
@@ -158,8 +194,20 @@
<!-- Our plugin config for building templates -->
<plugin>
<groupId>com.ogoglio</groupId>
- <artifactId>dev-plugins</artifactId>
+ <artifactId>og-plugin</artifactId>
<version>0.0.1-SNAPSHOT</version>
+
+ <!-- these are for the populate -->
+ <configuration>
+ <serviceURI>${ogoglio.baseURL}</serviceURI>
+ <username>${ogoglio.bootstrapUser}</username>
+ <password>${ogoglio.bootstrapUserPW}</password>
+ <baseDir>src/main/resources/populate</baseDir>
+ <goalPrefix>og</goalPrefix>
+ </configuration>
+
+
+ <!-- bound to compile for running templates -->
<executions>
<execution>
<phase>compile</phase>
@@ -199,11 +247,11 @@
<version>3.0.1</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <!-- version, scope, optional inherited but overwritable -->
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <!-- version, scope, optional inherited but overwritable -->
+ </dependency>
<dependency>
<groupId>com.sun</groupId>
Added: maven/trunk/ogoglio-server/src/main/resources/populate/space-1
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/populate/space-1 (rev 0)
+++ maven/trunk/ogoglio-server/src/main/resources/populate/space-1 2007-09-05 03:18:04 UTC (rev 361)
@@ -0,0 +1,201 @@
+<space ownerusername="library" sealevel="0.0" simid="1"
+ displayname="Tech Office Space" maxguests="0" displaysea="false"
+ spaceid="1" published="false">
+ <thing templateid="42" rz="0.0" ry="0.0" rx="0.0" rw="1.0"
+ scalez="1.0" displayname="TV" scaley="1.0" templateowner="library"
+ scalex="1.0" possessionid="2" thingid="2" z="10.0" y="0.0" x="0.0"
+ ownerusername="library">
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.005" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Tube.001_Tube.002" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.001" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.002_Mesh" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.003" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Tube_Tube.001" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Sphere_Sphere.001" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.002" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.004" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ </thing>
+ <thing templateid="28" rz="0.0" ry="0.0" rx="0.0" rw="1.0"
+ scalez="1.0" displayname="WhiteBoard" scaley="1.0"
+ templateowner="library" scalex="1.0" possessionid="3" thingid="4"
+ z="-10.0" y="0.0" x="0.0" ownerusername="library">
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.003" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube" scaley="1.0" scalex="1.0" z="0.0" y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.002" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.004" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.001" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <page rz="-0.0" ry="1.0" width="4.0" pageid="1" rx="0.0"
+ rw="0.0" scalez="1.0" scaley="1.0" scalex="1.0"
+ contenttype="text/plain" z="0.1" y="2.0" x="0.0" height="2.0" />
+ </thing>
+ <thing templateid="21" rz="0.0" ry="0.0" rx="0.0" rw="1.0"
+ scalez="1.0" displayname="memex" scaley="1.0" templateowner="library"
+ scalex="1.0" possessionid="1" thingid="1" z="0.0" y="0.0" x="-10.0"
+ ownerusername="library">
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.008_Black" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.001_Cube.002" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.003" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.010" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.005_Cube.001" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.008" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube" scaley="1.0" scalex="1.0" z="0.0" y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.004" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.009" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.004_Cube.005" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.007" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.005" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.003_Cube.004" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.001" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.012_Cube.010" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.002_Cube.003" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.011_Cube.006" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.006" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.010_Black.002" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.009_Black.001" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cylinder.002" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.007_Metal" scaley="1.0" scalex="1.0" z="0.0" y="0.0"
+ x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Cube.006_Cube.007" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ </thing>
+ <thing templateid="25" rz="0.0" ry="0.0" rx="0.0" rw="1.0"
+ scalez="1.0" displayname="OfficeDesk" scaley="1.0"
+ templateowner="library" scalex="1.0" possessionid="4" thingid="3"
+ z="0.0" y="0.0" x="10.0" ownerusername="library">
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="drawer2_07_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="ChamferBox_02_-_Defau" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="feet_02_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="drawer3_02_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Object07_02_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="long_drawe_01_-_Defau" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="drawer4_02_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="Object07_03_-_Default" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ <shape rz="0.0" ry="0.0" rx="0.0" rw="1.0" scalez="1.0"
+ shapename="large_draw_02_-_Defau" scaley="1.0" scalex="1.0" z="0.0"
+ y="0.0" x="0.0" />
+ </thing>
+ <template ownerusername="library" templateid="28"
+ displayname="WhiteBoard">
+ <scriptfile
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ <geometry levelofdetail="0"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ <supportfile filename="WhiteBoard.mtl"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ </template>
+ <template ownerusername="library" templateid="42"
+ displayname="TV">
+ <scriptfile
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:23 PM PDT" />
+ <geometry levelofdetail="0"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:23 PM PDT" />
+ <supportfile filename="TV.mtl"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ </template>
+ <template ownerusername="library" templateid="25"
+ displayname="OfficeDesk">
+ <supportfile filename="OfficeDesk.mtl"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ <geometry levelofdetail="0"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:24 PM PDT" />
+ </template>
+ <template ownerusername="library" templateid="21"
+ displayname="memex">
+ <geometry levelofdetail="0"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:23 PM PDT" />
+ <supportfile filename="memex.mtl"
+ lastmodifiedUTC="Tuesday, September 4, 2007 7:01:23 PM PDT" />
+ </template>
+</space>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
