Thread: [Ogoglio-commits] SF.net SVN: ogoglio: [203] spaces/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 203
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=203&view=rev
Author:   trevorolio
Date:     2007-06-29 16:23:02 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
Dropped S3 specific code since using S3 directly is a Bad Idea, learned painfully during this morning's outage.

Added WebStore and MediaServlet to replace S3.  Together these allow multiple instances to use a single file store fronted by a simple servlet.
Added an ogoglio/mediaDirectory environment parameter to servlet.xml to indicate when the MediaServlet should serve (not a good idea unless firewalled).

Set more threads to daemon and cleaned up more Java3D state on renderer shutdown in hopes of alleviating cross space teleport leaks.
Safari seems happier when shutting down the viewer applet, but it's unclear that this will help in production.
Despite this, the sims still keep Tomcat alive past context cleanup.

Moved test account and template creation into the ClientTests instead of inflicting it on all installations.

Modified Paths:
--------------
    spaces/trunk/.classpath
    spaces/trunk/build.xml
    spaces/trunk/docs/server.xml
    spaces/trunk/src/com/ogoglio/client/ClientTests.java
    spaces/trunk/src/com/ogoglio/client/SpaceDuplicatorTests.java
    spaces/trunk/src/com/ogoglio/client/WebAPIClient.java
    spaces/trunk/src/com/ogoglio/media/FileStore.java
    spaces/trunk/src/com/ogoglio/media/MediaService.java
    spaces/trunk/src/com/ogoglio/media/MediaStore.java
    spaces/trunk/src/com/ogoglio/message/NetworkChannelServer.java
    spaces/trunk/src/com/ogoglio/message/SenderQueue.java
    spaces/trunk/src/com/ogoglio/persist/AccountPersistTasks.java
    spaces/trunk/src/com/ogoglio/persist/PersistTests.java
    spaces/trunk/src/com/ogoglio/persist/ServiceInitializationPersistTasks.java
    spaces/trunk/src/com/ogoglio/sim/Sim.java
    spaces/trunk/src/com/ogoglio/sim/SpaceSimulator.java
    spaces/trunk/src/com/ogoglio/sim/script/ScriptHTTPRequest.java
    spaces/trunk/src/com/ogoglio/sim/site/SimServlet.java
    spaces/trunk/src/com/ogoglio/site/AbstractResourceServlet.java
    spaces/trunk/src/com/ogoglio/site/AccountServlet.java
    spaces/trunk/src/com/ogoglio/site/AuthenticatedSiteResource.java
    spaces/trunk/src/com/ogoglio/site/MessageProxy.java
    spaces/trunk/src/com/ogoglio/site/SiteInfo.java
    spaces/trunk/src/com/ogoglio/site/SiteResource.java
    spaces/trunk/src/com/ogoglio/viewer/j3d/J3DRenderer.java
    spaces/trunk/src/com/ogoglio/viewer/j3d/PhysicsBehavior.java
    spaces/trunk/src/hibernate.cfg.xml
    spaces/trunk/war/WEB-INF/web.xml

Added Paths:
-----------
    spaces/trunk/src/com/ogoglio/media/WebStore.java
    spaces/trunk/src/com/ogoglio/media/site/
    spaces/trunk/src/com/ogoglio/media/site/MediaServlet.java

Removed Paths:
-------------
    spaces/trunk/src/com/ogoglio/media/MediaTests.java
    spaces/trunk/src/com/ogoglio/media/S3Store.java
    spaces/trunk/src/com/ogoglio/persist/TestPersistTasks.java
    spaces/trunk/src/com/ogoglio/util/S3Utils.java
    spaces/trunk/war/WEB-INF/lib/jets3t-0.5.0.jar

Modified: spaces/trunk/.classpath
===================================================================

--- spaces/trunk/.classpath	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/.classpath	2007-06-29 23:23:02 UTC (rev 203)
@@ -4,7 +4,7 @@
 	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet-api.jar"/>
 	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/>
 	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jsp-api.jar"/>
-	<classpathentry kind="src" output="work" path="work"/>
+	<classpathentry output="work" kind="src" path="work"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/junit.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/mysql-connector-java-3.1.11-bin.jar"/>
@@ -26,7 +26,6 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/js.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-httpclient-3.0.1.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jets3t-0.5.0.jar"/>
 	<classpathentry kind="var" path="BROWSER_PLUGIN"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>

Modified: spaces/trunk/build.xml
===================================================================
--- spaces/trunk/build.xml	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/build.xml	2007-06-29 23:23:02 UTC (rev 203)
@@ -2,7 +2,7 @@
 <project default="war" basedir=".">
     <property name="source" value="src" />
     <property name="dest" value="war/WEB-INF/classes" />
-    <property name="tomcatHome" value="/usr/share/tomcat5/" />
+    <property name="tomcatHome" value="../../tomcat/" />
     <property name="webLibDir" value="./war/WEB-INF/lib/" />
     <property name="warName" value="ogoglio.war" />
     

Modified: spaces/trunk/docs/server.xml
===================================================================
--- spaces/trunk/docs/server.xml	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/docs/server.xml	2007-06-29 23:23:02 UTC (rev 203)
@@ -16,22 +16,24 @@
 	<Context path="/og" reloadable="false" docBase="/Users/trevor/Code/EclipseWorkspace/spaces/war" workDir="/Users/trevor/Code/EclipseWorkspace/spaces/work" >
 		<Logger className="org.apache.catalina.logger.SystemOutLogger" verbosity="4" timestamp="true"/>
 
-		<!-- THIS DEFINES THE DATABASE USED BY THE OGOGLIO SERVLETS -->
+		<!-- THIS DEFINES THE DATABASE USED BY THE OGOGLIO SERVLETS, SET THE HSQL PATH OR ANOTHER JDBC URL (e.g. MySQL) -->
                 <Resource name="jdbc/space" scope="Shareable" type="javax.sql.DataSource" factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory" url="jdbc:hsqldb:/Users/trevor/Code/EclipseWorkspace/spaces/db/ogoglio" driverClassName="org.hsqldb.jdbcDriver" username="sa" password="" maxIdle="5" maxActive="50" />
 
 		<!-- THE FOLLOWING VARIABLES ARE READ IN com.ogoglio.site.AbstractResourceServet.init -->
 
-		<!-- CHANGE THIS TO POINT TO THE DIRECTORY WHERE YOU WANT THE MODELS, TEXTURES, SCRIPTS, and XML FILES TO BE STORED --> 
+		<!-- CHANGE THIS TO POINT TO THE URL OF THE SERVER OR DIRECTORY WHERE YOU WANT THE MODELS, TEXTURES, SCRIPTS, and XML FILES TO BE STORED --> 
+		<!-- IF YOU ARE RUNNING EVERYTHING ON ONE MACHINE, USE A FILE URL LIKE file:///home/username/mediaDir -->
+		<!-- IF YOU ARE RUNNING A REMOTE MEDIA SERVICE, USE A URL LIKE http://example.com:8080/og/media/ -->
                 <Environment name="ogoglio/mediaURL" value="file:///Users/trevor/Code/EclipseWorkspace/spaces/working/media" type="java.lang.String"/>
 
-		<!-- OR, IF YOU HAVE AN AMAZON S3 ACCOUNT, YOU CAN USE THAT _INSTEAD_OF_ THE MEDIA URL ABOVE-->
-		<!-- <Environment name="ogoglio/mediaURL" value="s3://YOUR_AWS_ACCESS_KEY:YOUR_AWS_SECRET_KEY@EXISTING_BUCKET_NAME" type="java.lang.String"/> -->
-
 		<!-- CHANGE THIS TO BE THE PUBLIC URL FOR YOUR SERVICE: http://YOUR_DOMAIN/og/ -->
-                <Environment name="ogoglio/baseURL" value="http://127.0.0.1:8080/og/" type="java.lang.String"/>
+                <Environment name="ogoglio/baseURL" value="http://example.com:8080/og/" type="java.lang.String"/>
 
 		<!-- CHANGE THIS TO TRUE IF YOUR SIMS RUN ON SEPARATE MACHINES (UNSAFE UNLESS THE SIMS HAVE FIREWALLS WHICH REFUSE CONNECTIONS FROM ALL BUT KNOWN WEB APPS) -->
 		<Environment name="ogoglio/simsAllowRemoteAccess" value="false" type="java.lang.String" />
+
+                <!-- IF THIS CONFIG IS FOR A MEDIA SERVER, UNCOMMENT THESE, SET THE FULL PATH TO YOUR MEDIA DIR -->
+                <!-- <Environment name="ogoglio/mediaDirectory" value="/Users/trevor/Code/EclipseWorkspace/spaces/working/media" type="java.lang.String"/>
 	</Context>
 
       </Host>

Modified: spaces/trunk/src/com/ogoglio/client/ClientTests.java
===================================================================
--- spaces/trunk/src/com/ogoglio/client/ClientTests.java	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/src/com/ogoglio/client/ClientTests.java	2007-06-29 23:23:02 UTC (rev 203)
@@ -13,6 +13,7 @@
  limitations under the License. */
 package com.ogoglio.client;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -34,7 +35,6 @@
 import com.ogoglio.client.model.User;
 import com.ogoglio.persist.AccountRecord;
 import com.ogoglio.persist.ServiceInitializationPersistTasks;
-import com.ogoglio.persist.TestPersistTasks;
 import com.ogoglio.util.StreamUtils;
 import com.ogoglio.xml.AccountDocument;
 import com.ogoglio.xml.AuthDocument;
@@ -51,12 +51,20 @@
 
 public class ClientTests extends TestCase {
 
+    public static final String PASSWORD1 = "1234";
+
+    public static final String USERNAME1 = "susan";
+
+    public static final String USERNAME2 = "tina";
+
+    public static final String COOKIE1 = "tr5w95nxracntj";
+
+    public static final String COOKIE2 = "trMoonUnitZappa";
+
     URI linkURI1 = null;
 
     URI serviceURI1 = null;
 
-    private String ownerUsername1;
-
     private String spaceName1;
 
     private long spaceID1;
@@ -65,7 +73,6 @@
 
     public void setUp() {
         try {
-            ownerUsername1 = "susan";
             spaceID1 = 1;
             spaceName1 = "Angry Young Space";
             serviceURI1 = new URI("http://127.0.0.1:8080/og/");
@@ -83,29 +90,36 @@
 
     public void testWebAdmin() {
         try {
-            String basicAuthCookie = WebAPIClient.authenticate(serviceURI1, TestPersistTasks.USERNAME1, TestPersistTasks.PASSWORD1);
+            String adminAuthCookie = WebAPIClient.authenticate(serviceURI1, ServiceInitializationPersistTasks.LIBRARY_USERNAME, ServiceInitializationPersistTasks.DEFAULT_LIBRARY_PASSWORD);
+            assertNotNull("got null auth cookie", adminAuthCookie);
+            
+            try {
+                WebAPIClient.createAccount(serviceURI1, adminAuthCookie, USERNAME1, AccountRecord.ACCOUNT_LEVEL_ADVANCED, "Susan", "Examplar", "http://example.com/susan/", "su...@ex...", PASSWORD1);
+                WebAPIClient.createAccount(serviceURI1, adminAuthCookie, USERNAME2, AccountRecord.ACCOUNT_LEVEL_ADVANCED, "Tina", "Examplar", "http://example.com/tina/", "ti...@ex...", PASSWORD1);
+            } catch (IOException e) {
+                //may already exist
+            }
+
+            String basicAuthCookie = WebAPIClient.authenticate(serviceURI1, USERNAME1, PASSWORD1);
             assertNotNull("got null auth cookie", basicAuthCookie);
             try {
                 String failedUsername = "Bogosity" + System.currentTimeMillis();
                 AccountDocument doc = WebAPIClient.createAccount(serviceURI1, basicAuthCookie, failedUsername, AccountRecord.ACCOUNT_LEVEL_BASIC, "Shouldnt", "Exist", null, failedUsername + "@example.com", "1234");
-                if(doc != null) {
+                if (doc != null) {
                     fail();
                 }
             } catch (Exception e) {
                 //this should happen, because basic accounts can't create new accounts
             }
 
-            String adminAuthCookie = WebAPIClient.authenticate(serviceURI1, ServiceInitializationPersistTasks.LIBRARY_USERNAME, ServiceInitializationPersistTasks.DEFAULT_LIBRARY_PASSWORD);
-            assertNotNull("got null auth cookie", adminAuthCookie);
-
             String username = "testuser" + Math.abs(new Random().nextLong());
             WebAPIClient.createAccount(serviceURI1, adminAuthCookie, username, AccountRecord.ACCOUNT_LEVEL_BASIC, "Test", "Sims", null, username + "@example.com", "1234");
-            
+
             AccountDocument accountDoc = WebAPIClient.getAccountDocument(serviceURI1, adminAuthCookie, username);
             assertNotNull(accountDoc);
             assertEquals("Test", accountDoc.getFirstName());
             assertEquals("Sims", accountDoc.getLastName());
-            
+
             Date frozenDate = new Date(System.currentTimeMillis() + 1000000);
             accountDoc.setFrozenUntil(frozenDate);
             accountDoc.setAccountLevel(AccountRecord.ACCOUNT_LEVEL_ADMIN);
@@ -131,7 +145,7 @@
         SpaceClient guestSpaceClient1 = null;
 
         try {
-            String authCookie1 = WebAPIClient.authenticate(serviceURI1, TestPersistTasks.USERNAME1, TestPersistTasks.PASSWORD1);
+            String authCookie1 = WebAPIClient.authenticate(serviceURI1, USERNAME1, PASSWORD1);
             assertNotNull("got null auth cookie", authCookie1);
 
             SpaceDocument spaceDoc1 = WebAPIClient.createSpace(serviceURI1, authCookie1);
@@ -159,11 +173,11 @@
 
             AuthDocument authDoc = webClient1.getAuthDocument(true);
             assertNotNull(authDoc);
-            assertEquals(TestPersistTasks.USERNAME1, authDoc.getUsername());
+            assertEquals(USERNAME1, authDoc.getUsername());
 
             AccountDocument ownerDoc = webClient1.getAccountDocument(authDoc.getUsername());
             assertNotNull(ownerDoc);
-            assertEquals(TestPersistTasks.USERNAME1, ownerDoc.getUsername());
+            assertEquals(USERNAME1, ownerDoc.getUsername());
 
             String key1 = "ogoglio.key.1";
             String value1 = "This is a very fine value which is < 1";
@@ -208,14 +222,14 @@
             assertNotNull(membershipDocs);
             assertEquals(0, membershipDocs.length);
 
-            webClient1.addSpaceMember(TestPersistTasks.USERNAME2, SpaceMemberDocument.MEMBER);
+            webClient1.addSpaceMember(USERNAME2, SpaceMemberDocument.MEMBER);
             membershipDocs = webClient1.getSpaceMemberDocuments();
             assertNotNull(membershipDocs);
             assertEquals(1, membershipDocs.length);
-            assertEquals(TestPersistTasks.USERNAME2, membershipDocs[0].getMemberUsername());
+            assertEquals(USERNAME2, membershipDocs[0].getMemberUsername());
             assertEquals(SpaceMemberDocument.MEMBER, membershipDocs[0].getRole());
 
-            String authCookie2 = WebAPIClient.authenticate(serviceURI1, TestPersistTasks.USERNAME2, TestPersistTasks.PASSWORD1);
+            String authCookie2 = WebAPIClient.authenticate(serviceURI1, USERNAME2, PASSWORD1);
             assertNotNull("got null auth cookie", authCookie1);
             WebAPIClient webClient2 = new WebAPIClient(spaceURI1, serviceURI1, authCookie2);
             membershipDocs = webClient2.getUsersSpaceMemberships();
@@ -224,9 +238,9 @@
             assertEquals(webClient2.getAuthDocument(true).getUsername(), membershipDocs[0].getMemberUsername());
             SpaceMemberDocument[] spaceMemberDocs = webClient1.getSpaceMemberDocuments();
             assertFalse("member doc length = " + spaceMemberDocs.length, spaceMemberDocs.length == 0);
-            assertEquals(spaceMemberDocs[0].getMemberUsername(), TestPersistTasks.USERNAME2);
+            assertEquals(spaceMemberDocs[0].getMemberUsername(), USERNAME2);
 
-            webClient1.removeSpaceMember(TestPersistTasks.USERNAME2);
+            webClient1.removeSpaceMember(USERNAME2);
             membershipDocs = webClient2.getUsersSpaceMemberships();
             assertEquals(0, membershipDocs.length);
 
@@ -237,7 +251,7 @@
             TemplateDocument newTemplateDoc = webClient1.createTemplate(templateName);
             assertEquals(templateName, newTemplateDoc.getDisplayName());
 
-            templateName = "Cold Blue Shirt";
+            templateName = "Test Cube";
             newTemplateDoc.setDisplayName(templateName);
             newTemplateDoc = webClient1.updateTemplate(newTemplateDoc);
             assertEquals(templateName, newTemplateDoc.getDisplayName());
@@ -248,25 +262,24 @@
             webClient1.updateTemplateScript(newTemplateDoc.getTemplateID(), null);
             assertEquals(null, webClient1.getTemplateScript(newTemplateDoc.getTemplateID()));
 
-            PossessionDocument[] possDocs = webClient1.getPossessionDocuments(TestPersistTasks.USERNAME1);
+            URI templateURI = webClient1.getTemplateURI(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID());
+            FileInputStream objData = new FileInputStream("src/com/ogoglio/persist/resources/TestCube.obj");
+            webClient1.putGeometryStream(templateURI, objData, 0);
+            FileInputStream mtlData = new FileInputStream("src/com/ogoglio/persist/resources/TestCube.mtl");
+            webClient1.putGeometryStream(templateURI, mtlData, "TestCube.mtl");
+            FileInputStream textureData = new FileInputStream("src/com/ogoglio/persist/resources/TestCube.gif");
+            webClient1.putGeometryStream(templateURI, textureData, "TestCube.gif");
+            String cubeScript = StreamUtils.readInput(new FileInputStream("src/com/ogoglio/persist/resources/TestCube.js"));
+            webClient1.updateTemplateScript(newTemplateDoc.getTemplateID(), cubeScript);
+            
+            PossessionDocument[] possDocs = webClient1.getPossessionDocuments(USERNAME1);
             int numPossessions = possDocs.length;
 
-            TemplateDocument[] templateDocs = webClient1.getTemplateDocuments(ServiceInitializationPersistTasks.LIBRARY_USERNAME);
-            assertTrue(templateDocs.length > 0);
-            assertEquals(templateDocs[0].getOwnerUsername(), ServiceInitializationPersistTasks.LIBRARY_USERNAME);
-
-            TemplateDocument templateDoc = webClient1.getTemplateDocument(ServiceInitializationPersistTasks.LIBRARY_USERNAME, templateDocs[0].getTemplateID());
-            assertNotNull(templateDoc);
-            assertEquals(templateDocs[0].getTemplateID(), templateDoc.getTemplateID());
-
-            webClient1.createPossession(templateDocs[0].getTemplateID());
-            possDocs = webClient1.getPossessionDocuments(TestPersistTasks.USERNAME1);
+            webClient1.createPossession(newTemplateDoc.getTemplateID());
+            possDocs = webClient1.getPossessionDocuments(USERNAME1);
             assertEquals(numPossessions + 1, possDocs.length);
 
-            ThingDocument[] thingDocs = webClient1.getThingDocuments();
-            if (thingDocs.length > 0) {
-                System.out.println("Already have a " + thingDocs[0].getDisplayName());
-            }
+            ThingDocument[] thingDocs = webClient1.getThingDocuments();           
             assertEquals(0, thingDocs.length);
             PossessionDocument possDoc = webClient1.addPossessionToSpace(possDocs[numPossessions].getPossessionID(), spaceDocument.getSpaceID());
             assertNotNull(possDoc);
@@ -283,7 +296,7 @@
 
             ShapeDocument[] shapeDocs = thingDocs[0].getShapeDocuments();
             assertEquals(1, shapeDocs.length);
-            assertEquals("Grid_Grid_Green", shapeDocs[0].getShapeName());
+            assertEquals("Cube", shapeDocs[0].getShapeName());
 
             PageDocument[] pages = webClient1.getPageDocuments(thingDocs[0].getThingID());
             assertEquals(0, pages.length);
@@ -314,9 +327,10 @@
             pages = webClient1.getPageDocuments(thingDocs[0].getThingID());
             assertEquals(0, pages.length);
 
+            TemplateDocument[] templateDocs = webClient1.getTemplateDocuments(USERNAME1);
             DoorDocument[] doorDocs = webClient1.getDoorDocuments();
             assertEquals(0, doorDocs.length);
-            DoorDocument doorDoc = webClient1.createDoor(spaceDocument.getSpaceID(), 2, ServiceInitializationPersistTasks.LIBRARY_USERNAME, "Test Door", linkURI1, new Transform3D());
+            DoorDocument doorDoc = webClient1.createDoor(spaceDocument.getSpaceID(), templateDocs[templateDocs.length - 1].getTemplateID(), USERNAME1, "Test Door", linkURI1, new Transform3D());
             assertNotNull(doorDoc);
             assertFalse(doorDoc.getDoorID() == -1);
             assertEquals(linkURI1, doorDoc.getLink());
@@ -338,18 +352,18 @@
             }
             userDocs = webClient1.getUserDocuments();
             assertEquals(1, userDocs.length);
-            assertEquals(TestPersistTasks.USERNAME1, userDocs[0].getUsername());
+            assertEquals(USERNAME1, userDocs[0].getUsername());
             spaceClient1.cleanup();
 
-            InputStream stream = webClient1.getGeometryStream(webClient1.getTemplateURI(ServiceInitializationPersistTasks.LIBRARY_USERNAME, 1), 0);
+            InputStream stream = webClient1.getGeometryStream(webClient1.getTemplateURI(USERNAME1, templateDocs[templateDocs.length - 1].getTemplateID()), 0);
             assertNotNull(stream);
             consume(stream);
 
-            stream = webClient1.getGeometryStream(webClient1.getTemplateURI(ServiceInitializationPersistTasks.LIBRARY_USERNAME, 1), "defaultLand.mtl");
+            stream = webClient1.getGeometryStream(webClient1.getTemplateURI(USERNAME1, templateDocs[templateDocs.length - 1].getTemplateID()), "TestCube.mtl");
             assertNotNull(stream);
             consume(stream);
 
-            authCookie1 = WebAPIClient.authenticate(serviceURI1, TestPersistTasks.USERNAME1, TestPersistTasks.PASSWORD1);
+            authCookie1 = WebAPIClient.authenticate(serviceURI1, USERNAME1, PASSWORD1);
             assertNotNull("got null auth cookie", authCookie1);
 
             TestSpaceClientListener listener = new TestSpaceClientListener();
@@ -369,7 +383,7 @@
             assertEquals(0, thingDocs.length);
 
             webClient1.deletePossession(possDoc.getPossessionID());
-            possDocs = webClient1.getPossessionDocuments(TestPersistTasks.USERNAME1);
+            possDocs = webClient1.getPossessionDocuments(USERNAME1);
             assertEquals(numPossessions, possDocs.length);
 
             String guestCookie1 = WebAPIClient.requestGuestCookie(serviceURI1);

Modified: spaces/trunk/src/com/ogoglio/client/SpaceDuplicatorTests.java
===================================================================
--- spaces/trunk/src/com/ogoglio/client/SpaceDuplicatorTests.java	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/src/com/ogoglio/client/SpaceDuplicatorTests.java	2007-06-29 23:23:02 UTC (rev 203)
@@ -8,7 +8,6 @@
 
 import junit.framework.TestCase;
 
-import com.ogoglio.persist.TestPersistTasks;
 import com.ogoglio.xml.DoorDocument;
 import com.ogoglio.xml.PositionedDocument;
 import com.ogoglio.xml.SpaceDocument;
@@ -27,18 +26,23 @@
     WebAPIClient client2 = null;
 
     String testSettingKey = "test.setting.key";
+
     String testSettingValue = "A Value for the Test Setting";
-    
+
+    String authCookie = null;
+
     public void setUp() {
         try {
             spaceURI1 = new URI("http://127.0.0.1:8080/og/space/1/");
             spaceURI2 = new URI("http://127.0.0.1:8080/og/space/2/");
             serviceURI1 = new URI("http://127.0.0.1:8080/og/");
 
-            client1 = new WebAPIClient(spaceURI1, serviceURI1, TestPersistTasks.COOKIE1);
+            authCookie = WebAPIClient.authenticate(serviceURI1, ClientTests.USERNAME1, ClientTests.PASSWORD1);
+            assertNotNull(authCookie);
+            client1 = new WebAPIClient(spaceURI1, serviceURI1, authCookie);
             client1.putSetting(testSettingKey, testSettingValue);
-            
-            client2 = new WebAPIClient(spaceURI2, serviceURI1, TestPersistTasks.COOKIE1);
+
+            client2 = new WebAPIClient(spaceURI2, serviceURI1, authCookie);
         } catch (Throwable e) {
             e.printStackTrace();
             fail(e.getMessage());
@@ -54,12 +58,12 @@
             ThingDocument[] originalThingDocs = client1.getThingDocuments();
             DoorDocument[] originalDoorDocs = client1.getDoorDocuments();
             Map originalSettings = client1.getSettings();
-            
+
             //TODO settings transfer
-            
-            SpaceDuplicator duplicator = new SpaceDuplicator(spaceURI1, serviceURI1, TestPersistTasks.USERNAME1, TestPersistTasks.COOKIE1);
+
+            SpaceDuplicator duplicator = new SpaceDuplicator(spaceURI1, serviceURI1, ClientTests.USERNAME1, authCookie);
             duplicator.duplicateSpace(spaceURI2, true);
-            
+
             SpaceDocument newSpaceDoc = client2.getSpaceDocument(false);
             assertEquals(originalSpaceDoc.getDisplaySea(), newSpaceDoc.getDisplaySea());
             assertEquals(originalSpaceDoc.getSeaLevel(), newSpaceDoc.getSeaLevel(), 0.001);
@@ -67,7 +71,7 @@
             assertEquals(originalSpaceDoc.isPublished(), newSpaceDoc.isPublished());
             assertEquals(originalSpaceDoc.getMaxGuests(), newSpaceDoc.getMaxGuests());
             assertEquals(originalSpaceDoc.getOwnerUsername(), newSpaceDoc.getOwnerUsername());
-            
+
             ThingDocument[] newThingDocs = client2.getThingDocuments();
             Arrays.sort(newThingDocs, new ThingDocComparator());
             Arrays.sort(originalThingDocs, new ThingDocComparator());
@@ -83,7 +87,7 @@
                 assertEquals(originalDoorDocs[i].getLink(), newDoorDocs[i].getLink());
                 assertEqualPositions(originalDoorDocs[i], newDoorDocs[i]);
             }
- 
+
             Map newSettings = client2.getSettings();
             newSettings.equals(originalSettings);
         } catch (IOException e) {
@@ -91,19 +95,19 @@
             fail("" + e);
         }
     }
-    
+
     private static class ThingDocComparator implements Comparator {
         public int compare(Object arg0, Object arg1) {
             ThingDocument doc1 = (ThingDocument) arg0;
             ThingDocument doc2 = (ThingDocument) arg1;
             long idDiff = doc1.getTemplateID() - doc2.getTemplateID();
-            if(idDiff != 0) {
+            if (idDiff != 0) {
                 return idDiff < 0 ? -1 : 1;
             }
             return doc1.getPossessionID() < doc1.getPossessionID() ? -1 : 1;
         }
     }
-    
+
     private static void assertEqualPositions(PositionedDocument doc1, PositionedDocument doc2) {
         assertEquals(doc1.getX(), doc2.getX(), 0.001);
         assertEquals(doc1.getY(), doc2.getY(), 0.001);

Modified: spaces/trunk/src/com/ogoglio/client/WebAPIClient.java
===================================================================
--- spaces/trunk/src/com/ogoglio/client/WebAPIClient.java	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/src/com/ogoglio/client/WebAPIClient.java	2007-06-29 23:23:02 UTC (rev 203)
@@ -520,13 +520,17 @@
     }
 
     public InputStream getGeometryStream(URI renderableRootURI, String name) throws IOException {
-        return fetchAuthenticatedStream(appendToURI(renderableRootURI, "geometry/" + (name == null ? "data/" : name)), authCookie);
+        return fetchAuthenticatedStream(appendToURI(renderableRootURI, "geometry/" + name), authCookie);
     }
 
     public void putGeometryStream(URI rootURI, InputStream input, String name) throws IOException {
-        performPOST(appendToURI(rootURI, "geometry/" + (name == null ? "data/" : name)), StreamUtils.readInput(input), "application/octet-stream", authCookie);
+        performPOST(appendToURI(rootURI, "geometry/" + name), StreamUtils.readInput(input), "application/octet-stream", authCookie);
     }
 
+    public void putGeometryStream(URI rootURI, InputStream input, int lodIndex) throws IOException {
+        performPOST(appendToURI(rootURI, "geometry/data/" + lodIndex), StreamUtils.readInput(input), "application/octet-stream", authCookie);
+    }
+
     public InputStream getGeometryStream(URI renderableRootURI, int lodIndex) throws IOException {
         return fetchAuthenticatedStream(appendToURI(renderableRootURI, "geometry/data/" + lodIndex), authCookie);
     }
@@ -554,6 +558,51 @@
         return sendAuthenticatedXML(uri, body, "POST", authCookie);
     }
 
+    public static long requestContentLength(URI uri, String authCookie) {
+        try {
+            HttpURLConnection connection = (HttpURLConnection) uri.toURL().openConnection();
+            connection.setRequestMethod("HEAD");
+            connection.setAllowUserInteraction(false);
+            if (authCookie != null) {
+                connection.setRequestProperty("Cookie", AuthServlet.AUTH_COOKIE + "=" + authCookie);
+            }
+
+            connection.setDoOutput(false);
+            if (connection.getResponseCode() != 200) {
+                return -1;
+            }
+            String lengthHeader = (String)connection.getRequestProperties().get("Content-Length");
+            if(lengthHeader == null) {
+                return -1;
+            }
+            return Integer.parseInt(lengthHeader);
+        } catch (IOException e) {
+            return -1;
+        }
+    }
+
+    public static InputStream performPUT(URI uri, InputStream input, String type, int length, String authCookie) throws IOException {
+        HttpURLConnection connection = (HttpURLConnection) uri.toURL().openConnection();
+        connection.setRequestMethod("PUT");
+        connection.setAllowUserInteraction(false);
+        if (authCookie != null) {
+            connection.setRequestProperty("Cookie", AuthServlet.AUTH_COOKIE + "=" + authCookie);
+        }
+
+        connection.setDoOutput(true);
+        connection.setRequestProperty("Content-type", type);
+        if (length >= 0) {
+            connection.setRequestProperty("Content-length", Integer.toString(length));
+        }
+        StreamUtils.write(input, connection.getOutputStream());
+
+        if (connection.getResponseCode() != 200) {
+            throw new IOException("Get status " + connection.getResponseCode() + " from " + uri);
+        }
+
+        return connection.getInputStream();
+    }
+
     public static InputStream performPOST(URI uri, String body, String type, String authCookie) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) uri.toURL().openConnection();
         connection.setRequestMethod("POST");
@@ -762,4 +811,5 @@
     public URI getSettingURI(String key) {
         return appendToURI(getSettingsURI(), key + "/");
     }
+
 }

Modified: spaces/trunk/src/com/ogoglio/media/FileStore.java
===================================================================
--- spaces/trunk/src/com/ogoglio/media/FileStore.java	2007-06-28 23:14:43 UTC (rev 202)
+++ spaces/trunk/src/com/ogoglio/media/FileStore.java	2007-06-29 23:23:02 UTC (rev 203)
@@ -43,6 +43,7 @@
         ArgumentUtils.assertNoPaths(name...
 
[truncated message content]

Thread: [Ogoglio-commits] SF.net SVN: ogoglio: [203] spaces/trunk

ogoglio-commits