Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [389] maven/trunk
|
From: <ian...@us...> - 2007-09-08 20:35:19
|
Revision: 389
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=389&view=rev
Author: iansmith
Date: 2007-09-08 13:35:20 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Removed all the references to 127.0.0.1 and replaced with values computed from the
settings.xml file. In principle, this will allow testing of machines in the cluster
from a remote host. For now, this is just cleanliness.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
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/ClientTest.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java
maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
Removed Paths:
-------------
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -174,6 +174,8 @@
}
MultiuserTests tests = null;
try {
+ //If you are going to run a test like this, these should be pulled from
+ //the properties files....
//String serviceURI = "http://127.0.0.1:8080/og/";
//String spaceURI = "http://127.0.0.1:8080/og/space/1/";
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-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -134,10 +134,12 @@
if (fullScreen) {
dim = new Dimension(device.getDisplayMode().getWidth(), device.getDisplayMode().getWidth());
}
- String serviceURI = "http://127.0.0.1:8080/og/";
- String loginCookie = null;
+ String serviceURI=null;
+ String loginCookie=null;
try {
- PropStorage ps = new PropStorage();
+ PropStorage ps=new PropStorage();
+ ps.loadPropertySet(PropStorage.BASIC_PROPS);
+ serviceURI = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl");
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"));
loginCookie = authenticator.getAuthCookie();
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -87,7 +87,11 @@
public void setUp() {
try {
- serviceURI1 = new URI("http://127.0.0.1:8080/og/"); //best choice: 127.0.0.1 for tests
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("couldn't load property set (BASIC)");
+ }
+ serviceURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl"));
linkURI1 = new URI("http://example.com/");
wire1 = new WebAPIClientWire();
descriptor1 = new WebAPIDescriptor(serviceURI1);
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -13,6 +13,7 @@
import com.ogoglio.client.WebAPIClient;
import com.ogoglio.client.WebAPIClientWire;
import com.ogoglio.client.WebAPIDescriptor;
+import com.ogoglio.util.PropStorage;
import com.ogoglio.xml.DoorDocument;
import com.ogoglio.xml.PositionedDocument;
import com.ogoglio.xml.SpaceDocument;
@@ -42,7 +43,11 @@
try {
spaceID1 = 1;
spaceID2 = 2;
- serviceURI1 = new URI("http://127.0.0.1:8080/og/");
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("couldn't load property set (BASIC)");
+ }
+ serviceURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl"));
descriptor = new WebAPIDescriptor(serviceURI1);
wire = new WebAPIClientWire();
auth = new WebAPIAuthenticator(wire, descriptor, ClientTest.USERNAME1, ClientTest.PASSWORD1);
Modified: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,4 +1,6 @@
# basic info needed for some tests
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
+ogoglio.internalUrl = ${ogoglio.internalURL}
+ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <servlet>
- <servlet-name>AccountServlet</servlet-name>
- <servlet-class>com.ogoglio.site.AccountServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>AuthServlet</servlet-name>
- <servlet-class>com.ogoglio.site.AuthServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SpaceServlet</servlet-name>
- <servlet-class>com.ogoglio.site.SpaceServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>MediaServlet</servlet-name>
- <servlet-class>com.ogoglio.media.site.MediaServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SimServlet</servlet-name>
- <servlet-class>com.ogoglio.sim.site.SimServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>AccountServlet</servlet-name>
- <url-pattern>/account/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AuthServlet</servlet-name>
- <url-pattern>/auth/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SpaceServlet</servlet-name>test
- <url-pattern>/space/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SimServlet</servlet-name>
- <url-pattern>/sim/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>MediaServlet</servlet-name>
- <url-pattern>/media/*</url-pattern>
- </servlet-mapping>
-
- <error-page>
- <error-code>404</error-code>
- <location>/notFound.html</location>
- </error-page>
-
-<!-- Start Authentication -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>SecurityRestriction</web-resource-name>
- <description>Demo For Friends Only</description>
- <url-pattern>/</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>Demo Users Group</description>
- <role-name>demo</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
-
- <security-role>
- <description>Demo role</description>
- <role-name>demo</role-name>
- </security-role>
-
- <!-- End Authentication -->
-</web-app>
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-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -20,8 +20,6 @@
import com.ogoglio.appdev.migrate.MigrationSupport;
import com.ogoglio.appdev.migrate.test.DBZapTest;
import com.ogoglio.appdev.persist.PersistException;
-import com.ogoglio.client.WebAPIClient;
-import com.ogoglio.client.WebAPIDescriptor;
import com.ogoglio.media.MediaService;
import com.ogoglio.migrate.OgoglioServerMigration;
import com.ogoglio.persist.AccountPersistTasks;
@@ -83,7 +81,11 @@
level2 = "pro";
try {
- simURI1 = new URI("http://127.0.0.1:8080/sim");
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("Can't load prop set (BASIC)");
+ }
+ simURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseSimUrl"));
} catch (URISyntaxException e) {
fail("bad URI:"+e.getMessage());
}
Modified: maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,4 +1,5 @@
# basic info needed for some tests
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
-ogoglio.mediaDirectory = ${ogoglio.mediaDirectory}
\ No newline at end of file
+ogoglio.mediaDirectory = ${ogoglio.mediaDirectory}
+ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
Modified: maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -45,12 +45,6 @@
EnvironmentStub clientStub1 = null;
- String host = "127.0.0.1:8080";
-
- String serviceURI = "http://" + host + "/og/";
-
- URL codeBase = getURL(serviceURI);
-
static boolean fullScreen = false;
public AppletTestWindow() {
@@ -70,9 +64,11 @@
Log.error("Can't find basic properties!");
System.exit(1);
}
+ String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
HashMap parameters1 = new HashMap();
try {
- WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)),
+ 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(WebConstants.AUTH_COOKIE, authenticator.getAuthCookie());
@@ -116,11 +112,17 @@
}
public URL getCodeBase() {
- return codeBase;
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ Log.error("Can't find basic properties!");
+ System.exit(1);
+ }
+ String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
+ return getURL(serviceURI);
}
public URL getDocumentBase() {
- return codeBase;
+ return getCodeBase();
}
public String getParameter(String name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
