Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [312] maven/trunk/ogoglio
|
From: <ian...@us...> - 2007-08-31 20:56:19
|
Revision: 312
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=312&view=rev
Author: iansmith
Date: 2007-08-31 13:56:20 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Added support in common for 1.5.1 java3d on linux.
Removed dead code in applet poms.
Added a script in ogoglio to run appletTestWindow
Modified Paths:
--------------
maven/trunk/ogoglio-body-editor-applet/pom.xml
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-integration-test/pom.xml
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-viewer-applet/pom.xml
Added Paths:
-----------
maven/trunk/ogoglio/src/main/resources/scripts/
maven/trunk/ogoglio/src/main/resources/scripts/testApplet.sh
Removed Paths:
-------------
maven/trunk/ogoglio-body-editor-applet/src/assemble/
maven/trunk/ogoglio-viewer-applet/src/assemble/
Added: maven/trunk/ogoglio/src/main/resources/scripts/testApplet.sh
===================================================================
--- maven/trunk/ogoglio/src/main/resources/scripts/testApplet.sh (rev 0)
+++ maven/trunk/ogoglio/src/main/resources/scripts/testApplet.sh 2007-08-31 20:56:20 UTC (rev 312)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# assumes you are in the dir with this script
+# assumes everything is built in other directories
+
+INT_TEST=../../../../../ogoglio-integration-test/target/test-classes
+COMMON=../../../../../ogoglio-common/target/ogoglio-common-0.0.1-SNAPSHOT.jar
+LIVEC=~/.m2/repository/netscape/liveConnect/1.0/liveConnect-1.0.jar
+APPLET=../../../../../ogoglio-viewer-applet/target/ogoglio-viewer-applet-0.0.1-SNAPSHOT.jar
+
+SPACE=2
+
+ls -l $INT_TEST/*
+
+java -DAppletTestWindow.space=$SPACE -classpath $INT_TEST\:$COMMON\:$LIVEC\:$APPLET com.ogoglio.client.test.AppletTestWindow
Property changes on: maven/trunk/ogoglio/src/main/resources/scripts/testApplet.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: maven/trunk/ogoglio-body-editor-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-body-editor-applet/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
@@ -11,27 +11,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
- src/assemble/common-code.xml
- </descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase><!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal><!--tricky, this "attaches" this to a goal -->
- </goals>
- </execution>
- </executions>
-
- </plugin>
</plugins>
</build>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
@@ -31,19 +31,19 @@
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core</artifactId>
- <version>1.3</version>
+ <version>[1.3],[1.5.1]</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core-utils</artifactId>
- <version>1.3</version>
+ <version>[1.3],[1.5.1]</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>vecmath</artifactId>
- <version>1.3</version>
+ <version>[1.3],[1.5.1]</version>
<scope>supplied</scope>
</dependency>
Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-integration-test/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
@@ -88,6 +88,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -113,7 +114,7 @@
<artifactId>ogoglio-viewer-applet</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
-
</dependencies>
+
</project>
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java 2007-08-31 20:56:20 UTC (rev 312)
@@ -30,6 +30,7 @@
import com.ogoglio.client.WebAPIAuthenticator;
import com.ogoglio.client.WebAPIClientWire;
import com.ogoglio.client.WebAPIDescriptor;
+import com.ogoglio.util.PropStorage;
import com.ogoglio.viewer.applet.ViewerApplet;
public class AppletTestWindow extends Frame {
@@ -61,14 +62,18 @@
HashMap parameters1 = new HashMap();
try {
- WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)), BootstrapInfo.getBootstrapUsername(), BootstrapInfo.getBootstrapUserPW());
+ PropStorage ps=new PropStorage();
+ ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS);
+ WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)),
+ ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"),
+ ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
parameters1.put("loginCookie", authenticator.getAuthCookie());
} catch (Exception e) {
e.printStackTrace();
}
//parameters1.put("loginCookie", "guestApplet_Test_Window2");
- parameters1.put("spaceID", "" + 4);
+ parameters1.put("spaceID", "" + System.getProperty("AppletTestWindow.space"));
parameters1.put("serviceURI", serviceURI);
//parameters1.put("x", "0");
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-server/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
@@ -104,7 +104,7 @@
<artifactId>dev-plugins</artifactId>
<executions>
<execution>
- <phase>generate-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>buildHtml</goal>
</goals>
@@ -133,7 +133,7 @@
</goals>
<configuration>
<outputDirectory>
- ${project.build.directory}/ogoglio-server-0.0.1
+ ${project.build.directory}/${pom.artifactId}-${version}
</outputDirectory>
<overwriteIfNewer>true</overwriteIfNewer>
<stripVersion>true</stripVersion>
Modified: maven/trunk/ogoglio-viewer-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-viewer-applet/pom.xml 2007-08-31 19:43:28 UTC (rev 311)
+++ maven/trunk/ogoglio-viewer-applet/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
@@ -10,28 +10,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
- src/assemble/common-code.xml
- </descriptor>
- </descriptors>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase><!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal><!--tricky, this "attaches" this to normal assembly -->
- </goals>
- </execution>
- </executions>
-
- </plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
