[Ogoglio-commits] SF.net SVN: ogoglio: [705] maven/trunk

[<ian...@us...>]

Revision: 705
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=705&view=rev
Author:   iansmith
Date:     2008-02-01 15:48:38 -0800 (Fri, 01 Feb 2008)

Log Message:
-----------
Added some chicanery so that our openGL settings don't hose an EC2 instance.

Pom changes so we can debug with log4j (sigh) in ogoglio integration tests.

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/pom.xml
    maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
    maven/trunk/ogoglio-integration-test/pom.xml
    maven/trunk/ogoglio-server/pom.xml

Modified: maven/trunk/ogoglio-appdev/pom.xml
===================================================================
--- maven/trunk/ogoglio-appdev/pom.xml	2008-01-31 23:07:09 UTC (rev 704)
+++ maven/trunk/ogoglio-appdev/pom.xml	2008-02-01 23:48:38 UTC (rev 705)
@@ -15,7 +15,7 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>com.sun</groupId>
+			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
 			<version>1.4</version>
 			<scope>provided</scope>

Modified: maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2008-01-31 23:07:09 UTC (rev 704)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2008-02-01 23:48:38 UTC (rev 705)
@@ -382,13 +382,13 @@
             setLayout(new BorderLayout());
 
             universe = new J3DUniverse();
-            canvas = new J3DCanvas(J3DRenderer.getGraphicsConfiguration(), false);
+            canvas = new J3DCanvas(J3DRenderer.getGraphicsConfiguration(false), false);
             canvas.addMouseWheelListener(this);
             camera = new J3DCamera();
             camera.setCanvas(canvas);
             add(canvas, BorderLayout.CENTER);
 
-            offscreenCanvas = new J3DCanvas(J3DRenderer.getGraphicsConfiguration(), true);
+            offscreenCanvas = new J3DCanvas(J3DRenderer.getGraphicsConfiguration(false), true);
             camera.getView().addCanvas3D(offscreenCanvas);
 
             setupUniverse();

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java	2008-01-31 23:07:09 UTC (rev 704)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java	2008-02-01 23:48:38 UTC (rev 705)
@@ -128,7 +128,7 @@
         setCapabilities(sceneRoot);
         setCapabilities(usersGroup);
         setCapabilities(worldGroup);
-        GraphicsConfiguration graphicsConfig = getGraphicsConfiguration();
+        GraphicsConfiguration graphicsConfig = getGraphicsConfiguration(this.offScreen);
         if (graphicsConfig == null) {
             throw new IllegalStateException("Cannot create a 3D graphics configuration.");
         }
@@ -747,13 +747,15 @@
         return renderable;
     }
 
-    public static GraphicsConfiguration getGraphicsConfiguration() {
+    public static GraphicsConfiguration getGraphicsConfiguration(boolean offscreen) {
         GraphicsConfigTemplate3D configTemplate = new GraphicsConfigTemplate3D();
         configTemplate.setSceneAntialiasing(GraphicsConfigTemplate.PREFERRED);
         configTemplate.setDoubleBuffer(GraphicsConfigTemplate.PREFERRED);
-        configTemplate.setBlueSize(8);
-        configTemplate.setRedSize(8);
-        configTemplate.setGreenSize(8);
+        if (!offscreen) { //it appears that these lines hose up an EC2 instance running j3d
+            configTemplate.setBlueSize(8);
+            configTemplate.setRedSize(8);
+            configTemplate.setGreenSize(8);
+        }
         GraphicsConfiguration config = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getBestConfiguration(configTemplate);
         if (config != null) {
             return config;

Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml	2008-01-31 23:07:09 UTC (rev 704)
+++ maven/trunk/ogoglio-integration-test/pom.xml	2008-02-01 23:48:38 UTC (rev 705)
@@ -16,6 +16,14 @@
 	<packaging>jar</packaging>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources/log4j</directory>
+				<includes>
+					<include>log4j.properties</include>
+				</includes>
+			</resource>
+		</resources>
 		<testResources>
 			<testResource>
 				<filtering>true</filtering>

Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml	2008-01-31 23:07:09 UTC (rev 704)
+++ maven/trunk/ogoglio-server/pom.xml	2008-02-01 23:48:38 UTC (rev 705)
@@ -295,7 +295,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.sun</groupId>
+			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
 			<version>1.4</version>
 			<scope>provided</scope>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.