Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [270] maven/trunk/ogoglio-server
|
From: <ian...@us...> - 2007-08-27 17:39:09
|
Revision: 270
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=270&view=rev
Author: iansmith
Date: 2007-08-27 10:39:06 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
Update filenames to work properly with browser.
Fixed test to not leave around sim records.
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AbstractResourceServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java
maven/trunk/ogoglio-server/src/main/webapp/browserTests.js
maven/trunk/ogoglio-server/src/main/webapp/spaceui.js
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/pom.xml 2007-08-27 17:39:06 UTC (rev 270)
@@ -8,8 +8,7 @@
<artifactId>ogoglio-server</artifactId>
<packaging>war</packaging>
<version>0.0.1</version>
-
-
+
<!-- -->
<!-- profiles -->
<!-- -->
@@ -86,19 +85,32 @@
<executions>
<execution>
<id>copy-applets</id>
- <phase>package</phase>
+ <phase>process-sources</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>
- ${project.build.directory}/ogoglio-server-0.0.1
- </outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>
- true
- </overWriteSnapshots>
- <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}/ogoglio-server-0.0.1</outputDirectory>
+ <overwriteIfNewer>true</overwriteIfNewer>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-viewer-applet</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-body-editor-applet</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-test-applet</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-common</artifactId>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -120,8 +132,6 @@
</plugins>
</build>
-
-
<!-- DEPENDENCIES -->
<dependencies>
<dependency>
@@ -174,31 +184,28 @@
<version>0.0.1</version>
</dependency>
- <!-- broken: really is a dependency on the FILE -->
+ <!-- -->
+ <!-- BOGUS DEPENDENCIES-->
+ <!-- -->
<dependency>
<groupId>com.ogoglio</groupId>
<artifactId>ogoglio-viewer-applet</artifactId>
<version>0.0.1</version>
<scope>runtime</scope>
- <classifier>common</classifier>
</dependency>
-
- <!-- broken: really is a dependency on the FILE -->
<dependency>
<groupId>com.ogoglio</groupId>
- <artifactId>ogoglio-test-applet</artifactId>
+ <artifactId>ogoglio-body-editor-applet</artifactId>
<version>0.0.1</version>
<scope>runtime</scope>
</dependency>
-
- <!-- broken: really is a dependency on the FILE -->
<dependency>
<groupId>com.ogoglio</groupId>
- <artifactId>ogoglio-body-editor-applet</artifactId>
+ <artifactId>ogoglio-test-applet</artifactId>
<version>0.0.1</version>
<scope>runtime</scope>
- <classifier>common</classifier>
</dependency>
+
</dependencies>
</project>
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-08-27 17:39:06 UTC (rev 270)
@@ -153,6 +153,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
try {
long spaceID = Long.parseLong(pathElements[pathElements.length - 1]);
+ System.out.println("FART TRYING TO GET SPACE DOC FOR "+spaceID);
SpaceRecord spaceRecord = SpacePersistTasks.findSpaceBySpaceID(spaceID, getSessionFactory());
if (spaceRecord == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
@@ -263,6 +264,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
long spaceID = Long.parseLong(pathElements[2]);
try {
+ System.out.println("SIM FART GET:"+spaceID);
SpaceRecord spaceRecord = SpacePersistTasks.findSpaceBySpaceID(spaceID, getSessionFactory());
if (spaceRecord == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
@@ -275,12 +277,14 @@
return;
}
+ System.out.println("SIM FART GET2:"+authedAccount.getUsername());
SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
String value = simulator.getSetting(pathElements[pathElements.length - 1]);
if (value == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
+ System.out.println("SIM FART GET3:"+value);
sendStringResponse(value, "text/plain", response);
} catch (PersistException e) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -320,11 +324,13 @@
public void doPost(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
long spaceID = Long.parseLong(pathElements[2]);
try {
+ System.out.println("do POST fart: SIM:"+spaceID);
SpaceRecord spaceRecord = SpacePersistTasks.findSpaceBySpaceID(spaceID, getSessionFactory());
if (spaceRecord == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
+ System.out.println("do POST2 fart: SIM:"+spaceID);
AccountRecord authedAccount = AuthServlet.getAuthedAccountRecord(request, getSessionFactory());
if (authedAccount != null && !authedAccount.getUsername().equals(spaceRecord.getOwnerUsername())) {
@@ -332,6 +338,7 @@
return;
}
+ System.out.println("do POST3 fart: authed acct:"+authedAccount.getUsername());
String value = getFirstStringValue(request);
if (value == null || value.trim().length() == 0) {
System.err.println("Posted null value: " + request.getContentType());
@@ -339,9 +346,11 @@
return;
}
+ System.out.println("do POST4 fart: value:"+value);
SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
simulator.putSetting(pathElements[pathElements.length - 1], value);
sendStringResponse(value, "text/plain", response);
+ System.out.println("do POST5 fart: value:"+value);
} catch (PersistException e) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AbstractResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AbstractResourceServlet.java 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AbstractResourceServlet.java 2007-08-27 17:39:06 UTC (rev 270)
@@ -247,7 +247,7 @@
outputStream.flush();
outputStream.close();
}
-
+ System.out.println("FART 2nd level proxy:"+connection.getResponseCode());
response.setStatus(connection.getResponseCode());
Map headers = connection.getHeaderFields();
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java 2007-08-27 17:39:06 UTC (rev 270)
@@ -152,6 +152,7 @@
}
public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements, AccountRecord authedAccount) throws PersistException, IOException {
+ System.out.println("***WE ARE FART:"+(pathElements.length-1));
long spaceID = Long.parseLong(pathElements[pathElements.length - 1]);
SpaceRecord spaceRecord = SpacePersistTasks.findSpaceBySpaceID(spaceID, getSessionFactory());
if (spaceRecord == null) {
Modified: maven/trunk/ogoglio-server/src/main/webapp/browserTests.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/browserTests.js 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/main/webapp/browserTests.js 2007-08-27 17:39:06 UTC (rev 270)
@@ -23,8 +23,8 @@
function testJava(testSpan){
try {
- var jarURI = getServiceURI() + "/ogoglio-test-applet-0.0.1.jar";
- var appletHTML = "<applet id='testApplet' name='testApplet' code='com.ogoglio.viewer.applet.TestApplet' archive='" + jarURI + "' width='1' height='1'></applet>";
+ var jarURI = getServiceURI() + "/ogoglio-test-applet.jar";
+ var appletHTML = "<applet id='testApplet' name='testApplet' code='com.ogoglio.testapplet.TestApplet' archive='" + jarURI + "' width='1' height='1'></applet>";
testSpan.innerHTML = appletHTML;
while(typeof document.testApplet == "undefined"){
for(i=0; i < 100; i++) setTimeout('this = "something";', 5000);
Modified: maven/trunk/ogoglio-server/src/main/webapp/spaceui.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/spaceui.js 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/main/webapp/spaceui.js 2007-08-27 17:39:06 UTC (rev 270)
@@ -70,7 +70,7 @@
var serviceURI = getServiceURI();
- var html = "<applet id='viewer' codebase='" + serviceURI + "' code='com.ogoglio.viewer.applet.ViewerApplet' archive='ogoglio-viewer-applet-0.0.1-common.jar' width='" + viewerWidth + "' height='" + viewerHeight + "' mayscript='true'>";
+ var html = "<applet id='viewer' archive='ogoglio-common.jar,ogoglio-viewer-applet.jar' codebase='" + serviceURI + "' code='com.ogoglio.viewer.applet.ViewerApplet' archive='/ogoglio-viewer-applet-0.0.1.jar' width='" + viewerWidth + "' height='" + viewerHeight + "' mayscript='true'>";
html += "<param name='loginCookie' value='" + loginCookie + "' />";
html += "<param name='serviceURI' value='" + serviceURI + "' />";
html += "<param name='spaceID' value='" + locationParameters['spaceID'] + "' />";
Modified: maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
===================================================================
--- maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java 2007-08-27 17:39:06 UTC (rev 270)
@@ -13,17 +13,10 @@
limitations under the License. */
package com.ogoglio.persist.test;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import junit.framework.TestCase;
-
-import org.hibernate.SessionFactory;
-
import com.ogoglio.migrate.DBZapTest;
-import com.ogoglio.migrate.MigrationSupport;
import com.ogoglio.persist.AccountPersistTasks;
import com.ogoglio.persist.AccountRecord;
import com.ogoglio.persist.BodyPersistTasks;
@@ -58,6 +51,18 @@
String level2 = null;
+ public void tearDown() {
+ try {
+ SimRecord simRecord1 = SimPersistTasks.findSimsBySimURI(simURI1,sessionFactory);
+ if (simRecord1 != null) {
+ System.out.println("Destroying leftover sim record test state:"
+ + simRecord1.getDisplayName());
+ SimPersistTasks.delete(simRecord1, sessionFactory);
+ }
+ } catch (PersistException e) {
+ fail("Unable to tear down:"+e.getMessage());
+ }
+ }
public void setUp() {
super.setUp();
username1 = AccountRecord.cleanUsername("MoonUnitZappa");
@@ -107,68 +112,8 @@
templateRec1.getTemplateID(), sessionFactory);
verifyTemplateProps(templateName1, templateRec1);
- SimRecord simRecord1 = SimPersistTasks.findSimsBySimURI(simURI1,
- sessionFactory);
- if (simRecord1 != null) {
- System.out.println("Destroying leftover sim record test state:"
- + simRecord1.getDisplayName());
- SimPersistTasks.delete(simRecord1, sessionFactory);
- }
- // ok to create sim now on that URI
- simRecord1 = SimPersistTasks.createSim(displayName1, simURI1, 2048,
- true, sessionFactory);
- verifySimProps(simRecord1, displayName1, simURI1, -1, 2048);
+ SpaceRecord spaceRecord1 = checkSpaceAndSimTasks();
- String displayName2 = "moon unit";
- simRecord1.setDisplayName(displayName2);
- SimPersistTasks.update(simRecord1, sessionFactory);
- assertEquals(displayName2, simRecord1.getDisplayName());
- // better test is to load it from db
- SimRecord simRecord2 = SimPersistTasks.findSimsBySimURI(simURI1,
- sessionFactory);
- verifySimProps(simRecord2, displayName2, simURI1, -1, 2048);
-
- // it's the same sim on the same URI so better have same id?
- assertEquals(simRecord1.getSimID(), simRecord2.getSimID());
-
- String spaceName1 = "Space 1";
- SpaceRecord spaceRecord1 = SpacePersistTasks.createSpace(
- spaceName1, "bubkus", sessionFactory);
- assertNull("created space with bogus username", spaceRecord1);
- spaceRecord1 = SpacePersistTasks.createSpace(spaceName1, username1,
- sessionFactory);
- assertNotNull(spaceRecord1);
- assertEquals(spaceName1, spaceRecord1.getDisplayName());
- assertFalse(spaceRecord1.getSpaceID() == -1);
- assertEquals(username1, spaceRecord1.getOwnerUsername());
-
- SpaceRecord spaceRecord2 = SpacePersistTasks.findSpaceBySpaceID(
- spaceRecord1.getSpaceID(), sessionFactory);
- assertEquals(spaceRecord1, spaceRecord2);
-
- SimRecord assignedSimRecord = SpacePersistTasks.findOrAssignSim(
- spaceRecord2, sessionFactory);
- assertNotNull(assignedSimRecord);
- //System.out.println("XXX ASSIGNED TO SIM:"
- // + assignedSimRecord.getSimID() + ","
- // + assignedSimRecord.getSimURI() + " -->\n" + "space was "
- // + spaceRecord2.getSpaceID() + " now on "
- // + spaceRecord2.getSimID() + ","
- // + spaceRecord2.getDisplayName());
- /*
- * IES: I spent a lot of time looking at this and could not see any
- * way to test this given that IES: that assigned sim is random.
- * Apparently, before we were depending on a random number IES:
- * sequence doing something we expected.
- * assertEquals(simRecord1.getSimURI(),
- * assignedSimRecord.getSimURI());
- * assertEquals(simRecord1.getDisplayName(),
- * assignedSimRecord.getDisplayName());
- * assertEquals(simRecord1.getSimID(),
- * assignedSimRecord.getSimID()); assertEquals(simRecord1,
- * assignedSimRecord);
- */
-
BodyRecord bodyRec1 = BodyPersistTasks.createBody(displayName1,
"bogosity", sessionFactory);
assertNull("created body with bogus username", bodyRec1);
@@ -214,7 +159,65 @@
fail("Should have just returned null instead of failed: " + e);
}
}
+ private SpaceRecord checkSpaceAndSimTasks() throws PersistException {
+ SimRecord simRecord1;
+ // ok to create sim now on that URI
+ simRecord1 = SimPersistTasks.createSim(displayName1, simURI1, 2048,
+ true, sessionFactory);
+ verifySimProps(simRecord1, displayName1, simURI1, -1, 2048);
+ String displayName2 = "moon unit";
+ simRecord1.setDisplayName(displayName2);
+ SimPersistTasks.update(simRecord1, sessionFactory);
+ assertEquals(displayName2, simRecord1.getDisplayName());
+ // better test is to load it from db
+ SimRecord simRecord2 = SimPersistTasks.findSimsBySimURI(simURI1,
+ sessionFactory);
+ verifySimProps(simRecord2, displayName2, simURI1, -1, 2048);
+
+ // it's the same sim on the same URI so better have same id?
+ assertEquals(simRecord1.getSimID(), simRecord2.getSimID());
+
+ String spaceName1 = "Space 1";
+ SpaceRecord spaceRecord1 = SpacePersistTasks.createSpace(
+ spaceName1, "bubkus", sessionFactory);
+ assertNull("created space with bogus username", spaceRecord1);
+ spaceRecord1 = SpacePersistTasks.createSpace(spaceName1, username1,
+ sessionFactory);
+ assertNotNull(spaceRecord1);
+ assertEquals(spaceName1, spaceRecord1.getDisplayName());
+ assertFalse(spaceRecord1.getSpaceID() == -1);
+ assertEquals(username1, spaceRecord1.getOwnerUsername());
+
+ SpaceRecord spaceRecord2 = SpacePersistTasks.findSpaceBySpaceID(
+ spaceRecord1.getSpaceID(), sessionFactory);
+ assertEquals(spaceRecord1, spaceRecord2);
+
+ SimRecord assignedSimRecord = SpacePersistTasks.findOrAssignSim(
+ spaceRecord2, sessionFactory);
+ assertNotNull(assignedSimRecord);
+ //System.out.println("XXX ASSIGNED TO SIM:"
+ // + assignedSimRecord.getSimID() + ","
+ // + assignedSimRecord.getSimURI() + " -->\n" + "space was "
+ // + spaceRecord2.getSpaceID() + " now on "
+ // + spaceRecord2.getSimID() + ","
+ // + spaceRecord2.getDisplayName());
+ /*
+ * IES: I spent a lot of time looking at this and could not see any
+ * way to test this given that IES: that assigned sim is random.
+ * Apparently, before we were depending on a random number IES:
+ * sequence doing something we expected.
+ * assertEquals(simRecord1.getSimURI(),
+ * assignedSimRecord.getSimURI());
+ * assertEquals(simRecord1.getDisplayName(),
+ * assignedSimRecord.getDisplayName());
+ * assertEquals(simRecord1.getSimID(),
+ * assignedSimRecord.getSimID()); assertEquals(simRecord1,
+ * assignedSimRecord);
+ */
+ return spaceRecord1;
+ }
+
private void verifySimProps(SimRecord rec, String name, URI uri,
int not_id, int port) {
assertNotNull(rec);
Modified: maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java
===================================================================
--- maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java 2007-08-27 17:37:49 UTC (rev 269)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java 2007-08-27 17:39:06 UTC (rev 270)
@@ -4,15 +4,12 @@
import java.io.InputStream;
import java.util.HashMap;
-import javax.media.j3d.Transform3D;
-
import junit.framework.TestCase;
import com.ogoglio.sim.SpaceSimulator;
import com.ogoglio.xml.SpaceDocument;
import com.ogoglio.xml.SpaceEvent;
import com.ogoglio.xml.TemplateDocument;
-import com.ogoglio.xml.ThingDocument;
public class ScriptTest extends TestCase {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
