Menu
▾
▴
ogoglio-commits — for people that want commit messages from SVN
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
(26) |
Aug
(85) |
Sep
(141) |
Oct
(85) |
Nov
(60) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(38) |
Feb
(78) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tre...@us...> - 2008-01-02 06:01:04
|
Revision: 662
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=662&view=rev
Author: trevorolio
Date: 2008-01-01 22:00:45 -0800 (Tue, 01 Jan 2008)
Log Message:
-----------
Tuned to the xml serializer to avoid some of the insanity from IE's habit of loading up all dom Elements with a ton of useless attributes.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2008-01-01 22:54:12 UTC (rev 661)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2008-01-02 06:00:45 UTC (rev 662)
@@ -234,6 +234,9 @@
var attributes = xml.attributes;
for (var i = 0; i < attributes.length; i++){
+ if(attributes.item(i).value == null || attributes.item(i).value == "null"){
+ continue;
+ }
result += " " + attributes.item(i).name.toLowerCase() + "='" + escapeHTML(attributes.item(i).value) + "'";
}
var hasText = (typeof xml.text != "undefined") && xml.text.length != 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2008-01-01 22:54:07
|
Revision: 661
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=661&view=rev
Author: trevorolio
Date: 2008-01-01 14:54:12 -0800 (Tue, 01 Jan 2008)
Log Message:
-----------
Added email update to the account resource, which now triggers a validation email, creates a pending validation record, and sets the emailValid field to false on the account record.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2008-01-01 21:35:01 UTC (rev 660)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2008-01-01 22:54:12 UTC (rev 661)
@@ -184,6 +184,28 @@
return (AccountRecord) task.execute();
}
+ public static PendingEmailValidationRecord updateAccountEmail(final AccountRecord account, final String newEmail, SessionFactory sessionFactory) throws PersistException {
+ if(account.getEmail().equals(newEmail)){
+ return null;
+ }
+ final String cleanedEmail = AccountRecord.cleanEmail(newEmail);
+ if(cleanedEmail == null){
+ return null;
+ }
+ HibernateTask task = new HibernateTask() {
+ public Object run(Session hibernateSession) {
+ PendingEmailValidationRecord validationRec = new PendingEmailValidationRecord(account.getUsername(), cleanedEmail);
+ hibernateSession.save(validationRec);
+ account.setEmail(cleanedEmail);
+ account.setEmailValid(false);
+ hibernateSession.update(account);
+ return validationRec;
+ }
+ };
+ task.setSessionFactory(sessionFactory);
+ return (PendingEmailValidationRecord) task.execute();
+ }
+
public static AccountRecord findAccountByUsername(String username, SessionFactory sessionFactory) throws PersistException {
final String cleanedUsername = AccountRecord.cleanUsername(username);
if (cleanedUsername == null) {
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2008-01-01 21:35:01 UTC (rev 660)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2008-01-01 22:54:12 UTC (rev 661)
@@ -73,7 +73,7 @@
public static final String SECRET_PARAMETER = "secret";
public String defaultAccountPhotoPath = null;
-
+
public static URI getAccountURI(AccountRecord accountRecord, URI baseURI) {
try {
return new URI(baseURI.toString() + "account/" + accountRecord.getUsername());
@@ -481,7 +481,7 @@
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- if(authedAccount == null || !authedAccount.getUsername().equals(requestedUsername)){
+ if (authedAccount == null || !authedAccount.getUsername().equals(requestedUsername)) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -519,7 +519,7 @@
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- if(authedAccount == null || !authedAccount.getUsername().equals(requestedUsername)){
+ if (authedAccount == null || !authedAccount.getUsername().equals(requestedUsername)) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -609,17 +609,30 @@
}
}
+ //Email changes are special, as they involve validation messages
+ if (updatedDocument.getEmail() != null && !updatedDocument.getEmail().equals(requestedAccount.getEmail())) {
+ try {
+ PendingEmailValidationRecord pendingRecord = AccountPersistTasks.updateAccountEmail(requestedAccount, updatedDocument.getEmail(), getSessionFactory());
+ if (pendingRecord == null) {
+ Log.error("Could not update account email: " + requestedAccount.getUsername() + ": " + updatedDocument.getEmail());
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ return;
+ }
+ sendValidationMail(pendingRecord);
+ requestedAccount = AccountPersistTasks.findAccountByUsername(usernameParam, getSessionFactory());
+ sendStringResponse(createAccountDocument(requestedAccount, true).toString(), "text/xml", response);
+ return;
+ } catch (MailSendException e) {
+ Log.error("Could not send email validation message: " + e);
+ }
+ }
+
//TODO if this returns false we really should reflect that in the response
-
if (!AccountPersistTasks.update(requestedAccount, updatedDocument, getSessionFactory())) {
Log.warn("Account update failed:" + requestedAccount.getUsername());
}
- AccountDocument result = createAccountDocument(requestedAccount, true);
- response.setStatus(HttpServletResponse.SC_OK);
- response.setContentType("text/xml");
- response.getOutputStream().write(result.toString().getBytes());
- return;
+ sendStringResponse(createAccountDocument(requestedAccount, true).toString(), "text/xml", response);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2008-01-01 21:34:57
|
Revision: 660
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=660&view=rev
Author: trevorolio
Date: 2008-01-01 13:35:01 -0800 (Tue, 01 Jan 2008)
Log Message:
-----------
WARNING: DB SCHEMA CHANGE
Added an emailValid field to account records, their XML docs, and the Java APIs.
Fixed up the existing email validation framework to update this value.
Added an email validation test to the integration test suite.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountRecord.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/PendingEmailValidationTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/defaultAccountPhoto.gif
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2008-01-01 21:34:54 UTC (rev 659)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2008-01-01 21:35:01 UTC (rev 660)
@@ -171,7 +171,7 @@
BodyConfigurationRecord bodyConfRecord = new BodyConfigurationRecord(username, "Body", bodyDataRecords[0].getBodyDataID(), null);
hibernateSession.save(bodyConfRecord);
- record = new AccountRecord(username, accountlevel, email, bodyConfRecord.getBodyConfigurationID(), null, null);
+ record = new AccountRecord(username, accountlevel, email, false, bodyConfRecord.getBodyConfigurationID(), null, null);
hibernateSession.save(record);
PendingEmailValidationRecord validationRec = new PendingEmailValidationRecord(username, email);
@@ -199,16 +199,4 @@
task.setSessionFactory(sessionFactory);
return (AccountRecord) task.execute();
}
-
- public static void delete(final AccountRecord accRec, SessionFactory sessionFactory) throws PersistException {
- HibernateTask task = new HibernateTask() {
- public Object run(Session hibernateSession) {
- hibernateSession.delete(accRec);
- return null;
- }
- };
- task.setSessionFactory(sessionFactory);
- task.execute();
-
- }
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountRecord.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountRecord.java 2008-01-01 21:34:54 UTC (rev 659)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountRecord.java 2008-01-01 21:35:01 UTC (rev 660)
@@ -36,6 +36,8 @@
private String passwordHash = null;
private String email = null;
+
+ private boolean emailValid = false;
private long creationDate = AccountDocument.NO_TIME_VALUE;
@@ -52,7 +54,7 @@
public AccountRecord() {
}
- public AccountRecord(String username, String accountlevel, String email, long defaultBodyConfigurationID, String voiceURI, String textURI) {
+ public AccountRecord(String username, String accountlevel, String email, boolean emailValid, long defaultBodyConfigurationID, String voiceURI, String textURI) {
this.username = cleanUsername(username);
if (this.username == null) {
throw new IllegalArgumentException("Bad username (only letters and numbers): " + username);
@@ -66,7 +68,8 @@
if (this.email == null) {
throw new IllegalArgumentException("Bad email: " + email);
}
-
+ this.emailValid = emailValid;
+
this.defaultBodyConfigurationID = defaultBodyConfigurationID;
this.voiceURI = voiceURI;
@@ -311,4 +314,12 @@
public void setTextURI(String textURI) {
this.textURI = textURI;
}
+
+ public boolean isEmailValid() {
+ return emailValid;
+ }
+
+ public void setEmailValid(boolean emailValid) {
+ this.emailValid = emailValid;
+ }
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/PendingEmailValidationTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/PendingEmailValidationTasks.java 2008-01-01 21:34:54 UTC (rev 659)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/PendingEmailValidationTasks.java 2008-01-01 21:35:01 UTC (rev 660)
@@ -50,10 +50,20 @@
return (PendingEmailValidationRecord) task.execute();
}
- public static boolean delete(final PendingEmailValidationRecord validationRecord, SessionFactory sessionFactory) throws PersistException {
+ public static boolean setValidAndDelete(final PendingEmailValidationRecord validationRecord, SessionFactory sessionFactory) throws PersistException {
HibernateTask task = new HibernateTask() {
- public Object run(Session hibernateSession) {
- hibernateSession.delete(validationRecord);
+ public Object run(Session session) {
+ Query accountQuery = session.getNamedQuery(AccountPersistTasks.ACCOUNT_BY_USERNAME);
+ accountQuery.setString("username", validationRecord.getUsername());
+ AccountRecord accountRec = (AccountRecord)accountQuery.uniqueResult();
+ if(accountRec == null){
+ return Boolean.FALSE;
+ }
+ accountRec.setEmail(validationRecord.getEmail());
+ accountRec.setEmailValid(true);
+ session.update(accountRec);
+
+ session.delete(validationRecord);
return Boolean.TRUE;
}
};
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2008-01-01 21:34:54 UTC (rev 659)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2008-01-01 21:35:01 UTC (rev 660)
@@ -86,9 +86,9 @@
AccountDocument result = null;
if (authed) {
- result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, account.getEmail(), account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID(), account.getVoiceURI(), account.getTextURI());
+ result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, account.getEmail(), account.isEmailValid(), account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID(), account.getVoiceURI(), account.getTextURI());
} else {
- result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, null, account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID(), null, null);
+ result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, null, account.isEmailValid(), account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID(), null, null);
}
return result;
}
@@ -436,8 +436,8 @@
return;
}
- if (!PendingEmailValidationTasks.delete(validationRecord, getSessionFactory())) {
- Log.error("Could not delete validation record for email: " + validationRecord.getEmail());
+ if (!PendingEmailValidationTasks.setValidAndDelete(validationRecord, getSessionFactory())) {
+ Log.error("Could not update database with email validation: " + validationRecord.getEmail());
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
Modified: maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml 2008-01-01 21:34:54 UTC (rev 659)
+++ maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml 2008-01-01 21:35:01 UTC (rev 660)
@@ -85,6 +85,7 @@
table="AccountRecords">
<id name="username"></id>
<property name="email" not-null="true" unique="true" />
+ <property name="emailValid" />
<property name="accountlevel" not-null="true" />
<property name="passwordHash" />
<property name="firstName" />
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/defaultAccountPhoto.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2008-01-01 21:34:50
|
Revision: 659
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=659&view=rev
Author: trevorolio
Date: 2008-01-01 13:34:54 -0800 (Tue, 01 Jan 2008)
Log Message:
-----------
WARNING: DB SCHEMA CHANGE
Added an emailValid field to account records, their XML docs, and the Java APIs.
Fixed up the existing email validation framework to update this value.
Added an email validation test to the integration test suite.
Modified Paths:
--------------
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/WebAPITest.java
maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
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 2008-01-01 21:34:46 UTC (rev 658)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2008-01-01 21:34:54 UTC (rev 659)
@@ -16,10 +16,11 @@
import java.awt.Dimension;
import java.awt.Shape;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.LineNumberReader;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
@@ -51,6 +52,7 @@
import com.ogoglio.client.model.SplinePath;
import com.ogoglio.client.model.Thing;
import com.ogoglio.client.model.User;
+import com.ogoglio.util.ArgumentUtils;
import com.ogoglio.util.Log;
import com.ogoglio.util.PropStorage;
import com.ogoglio.util.StreamUtils;
@@ -97,7 +99,9 @@
String mikeBodyTextureResourcePath = "sample-art3d/TestBodyTexture-Mike.jpg";
String testAccountPhotoPath = "sample-art3d/TestAccountPhoto.jpg";
-
+
+ File mailDirectory = null;
+
public void setUp() {
try {
PropStorage ps = new PropStorage();
@@ -110,7 +114,8 @@
linkURI1 = new URI("http://example.com/");
wire1 = new WebAPIClientWire();
descriptor1 = new WebAPIDescriptor(serviceURI1);
-
+ mailDirectory = new File(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.mailDirectory"));
+ ArgumentUtils.assertReadableDir(mailDirectory, true);
} catch (Throwable e) {
e.printStackTrace();
fail(e.getMessage());
@@ -214,13 +219,18 @@
assertNull(guestWebClient.createAccount("shouldnotexist" + System.currentTimeMillis(), AccountDocument.ACCOUNT_LEVEL_BASIC, "Test", "Sims", null, System.currentTimeMillis() + "@example.com", "1234"));
String username = "testuser" + Math.abs(new Random().nextLong());
- adminWebClient.createAccount(username, AccountDocument.ACCOUNT_LEVEL_BASIC, "Test", "Sims", null, username + "@example.com", "1234");
-
- AccountDocument accountDoc = adminWebClient.getAccountDocument(username);
+ AccountDocument accountDoc = adminWebClient.createAccount(username, AccountDocument.ACCOUNT_LEVEL_BASIC, "Test", "Sims", null, username + "@example.com", "1234");
assertNotNull(accountDoc);
assertEquals("Test", accountDoc.getFirstName());
assertEquals("Sims", accountDoc.getLastName());
+ assertFalse(accountDoc.isEmailValid());
+ String emailValidationURL = getLastEmailValidationURL(accountDoc.getEmail());
+ assertNotNull(emailValidationURL);
+ StreamUtils.discardInput(wire1.performGET(URI.create(emailValidationURL), null));
+ accountDoc = adminWebClient.getAccountDocument(username);
+ assertTrue(accountDoc.isEmailValid());
+
Date frozenDate = new Date(System.currentTimeMillis() + 1000000);
accountDoc.setFrozenUntil(frozenDate);
accountDoc.setAccountLevel(AccountDocument.ACCOUNT_LEVEL_ADMIN);
@@ -281,6 +291,39 @@
assertNull(basicWebClient.getBodyTexture(basicAuthenticator.getUsername(), configDoc.getBodyConfigurationID()));
}
+ private String getLastEmailValidationURL(String email) throws IOException {
+ File[] mailFiles = mailDirectory.listFiles();
+ File emailFile = null;
+ for (int i = 0; i < mailFiles.length; i++) {
+ if(containsString(email, mailFiles[i])){
+ emailFile = mailFiles[i];
+ break;
+ }
+ }
+ if(emailFile == null){
+ return null;
+ }
+ LineNumberReader input = new LineNumberReader(new FileReader(emailFile));
+ String line;
+ while((line = input.readLine()) != null){
+ if(line.startsWith("http://")){
+ return line.trim();
+ }
+ }
+ return null;
+ }
+
+ private boolean containsString(String target, File file) throws IOException {
+ LineNumberReader input = new LineNumberReader(new FileReader(file));
+ String line;
+ while((line = input.readLine()) != null){
+ if(line.indexOf(target) != -1){
+ return true;
+ }
+ }
+ return false;
+ }
+
public void testWebAPIClient() throws IOException {
SpaceClient spaceClient1 = null;
SpaceClient guestSpaceClient1 = null;
@@ -301,14 +344,14 @@
assertNull(basicClient.createSpace("Tina's Illegal Space Which She Should Not Be Able To Create"));
checkAccountPhoto(basicClient);
-
+
checkNoConnectionToSpaceWithoutAuth(spaceDocument.getSpaceID());
checkAuthDoc(advancedAuth, basicAuth);
spaceDocument = checkSpaceSeaLevel(advancedClient, spaceDocument);
spaceDocument = checkBackgroundColor(advancedClient, spaceDocument);
-
+
checkSettings(spaceDocument.getSpaceID(), advancedClient);
TemplateDocument newTemplateDoc = checkTemplateScriptAPI(advancedClient);
@@ -610,8 +653,8 @@
}
private SpaceDocument checkBackgroundColor(WebAPIClient advancedClient, SpaceDocument spaceDocument) throws IOException {
- advancedClient.setSpaceBackgroundColor(spaceDocument.getSpaceID(), new float[]{ 0.5f, 0.5f, 0.5f });
-
+ advancedClient.setSpaceBackgroundColor(spaceDocument.getSpaceID(), new float[] { 0.5f, 0.5f, 0.5f });
+
spaceDocument = advancedClient.getSpaceDocument(spaceDocument.getSpaceID(), false);
assertEquals(0.5, spaceDocument.getBackgroundColor()[0], 0.0001);
assertEquals(0.5, spaceDocument.getBackgroundColor()[1], 0.0001);
@@ -1102,7 +1145,7 @@
public void receivedUserContextMenuRequest(User user, int x, int y) {
// TODO Auto-generated method stub
-
+
}
}
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/WebAPITest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/WebAPITest.java 2008-01-01 21:34:46 UTC (rev 658)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/WebAPITest.java 2008-01-01 21:34:54 UTC (rev 659)
@@ -47,7 +47,7 @@
notAuthedAuthDoc = new AuthDocument("Ian", false, AccountDocument.ACCOUNT_LEVEL_BASIC);
authedAuthDoc = new AuthDocument("Ian", true, AccountDocument.ACCOUNT_LEVEL_BASIC);
- accountDoc = new AccountDocument(authedAuthDoc.getUsername(), AccountDocument.ACCOUNT_LEVEL_ADVANCED, null, null, null, null, null, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, 1, null, null);
+ accountDoc = new AccountDocument(authedAuthDoc.getUsername(), AccountDocument.ACCOUNT_LEVEL_ADVANCED, null, null, null, null, null, false, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, 1, null, null);
} catch (URISyntaxException e) {
fail("Bad URIL: " + e);
}
Modified: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2008-01-01 21:34:46 UTC (rev 658)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2008-01-01 21:34:54 UTC (rev 659)
@@ -3,4 +3,4 @@
ogoglio.baseUrl = ${ogoglio.baseURL}
ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
ogoglio.mediaUrl = ${ogoglio.mediaURL}
-
+ogoglio.mailDirectory = ${ogoglio.mailDirectory}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2008-01-01 21:34:41
|
Revision: 658
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=658&view=rev
Author: trevorolio
Date: 2008-01-01 13:34:46 -0800 (Tue, 01 Jan 2008)
Log Message:
-----------
WARNING: DB SCHEMA CHANGE
Added an emailValid field to account records, their XML docs, and the Java APIs.
Fixed up the existing email validation framework to update this value.
Added an email validation test to the integration test suite.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2008-01-01 21:34:46 UTC (rev 658)
@@ -62,7 +62,7 @@
}
public AccountDocument createAccount(String username, String accountLevel, String firstName, String lastName, String homepage, String email, String password) throws IOException {
- AccountDocument newAccountDoc = new AccountDocument(username, accountLevel, firstName, lastName, homepage, password, email, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
+ AccountDocument newAccountDoc = new AccountDocument(username, accountLevel, firstName, lastName, homepage, password, email, false, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
try {
XMLElement result = wire.sendAuthenticatedXML(descriptor.getAccountURI(), newAccountDoc.toString(), "POST", authenticator.getAuthCookie());
return new AccountDocument(result);
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java 2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java 2008-01-01 21:34:46 UTC (rev 658)
@@ -59,9 +59,11 @@
public static final String TEXT_URI = "text";
+ private static final String EMAIL_VALID = "emailvalid";
+
XMLElement data = null;
- public AccountDocument(String username, String accountLevel, String firstName, String lastName, String homepage, String password, String email, long creationDate, String cookie, long frozenUntil, long bodyConfigurationID, String voiceURI, String textURI) {
+ public AccountDocument(String username, String accountLevel, String firstName, String lastName, String homepage, String password, String email, boolean emailValid, long creationDate, String cookie, long frozenUntil, long bodyConfigurationID, String voiceURI, String textURI) {
data = new XMLElement(NAME);
if (username == null) {
@@ -83,6 +85,7 @@
data.setAttribute(PASSWORD, password);
if (email != null)
data.setAttribute(EMAIL, email);
+ data.setAttribute(EMAIL_VALID, emailValid);
if (cookie != null)
data.setAttribute(COOKIE, cookie);
@@ -112,7 +115,7 @@
}
public AccountDocument(String username) { //used when updating the document, with absent items indicating no change
- this(username, null, null, null, null, null, null, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
+ this(username, null, null, null, null, null, null, false, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
}
public XMLElement toElement() {
@@ -213,4 +216,8 @@
}
return getUsername().equals(((AccountDocument) obj).getUsername());
}
+
+ public boolean isEmailValid() {
+ return data.getBooleanAttribute(EMAIL_VALID);
+ }
}
\ No newline at end of file
Modified: maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
===================================================================
--- maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java 2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java 2008-01-01 21:34:46 UTC (rev 658)
@@ -87,7 +87,7 @@
}
public void testAccountDocument() {
- AccountDocument doc1 = new AccountDocument(username1, accountLevel1, firstName1, lastName1, company1, password1, email1, creationDate1, cookie1, frozenUntil1, 1, "skype:echo1234", "aim:echo");
+ AccountDocument doc1 = new AccountDocument(username1, accountLevel1, firstName1, lastName1, company1, password1, email1, false, creationDate1, cookie1, frozenUntil1, 1, "skype:echo1234", "aim:echo");
XMLElement element = new XMLElement();
element.parseString(doc1.toString());
AccountDocument doc2 = new AccountDocument(element);
@@ -99,6 +99,7 @@
assertEquals(doc1.getCookie(), doc2.getCookie());
assertEquals(doc1.getCreationDate(), doc2.getCreationDate());
assertEquals(doc1.getEmail(), doc2.getEmail());
+ assertEquals(doc1.isEmailValid(), doc2.isEmailValid());
assertEquals(doc1.getFirstName(), doc2.getFirstName());
assertEquals(doc1.getFrozenUntil(), doc2.getFrozenUntil());
assertEquals(doc1.getLastName(), doc2.getLastName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-31 23:16:09
|
Revision: 656
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=656&view=rev
Author: trevorolio
Date: 2007-12-31 15:15:54 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
Fixed the rotted verification email setup. Requires the following additions:
To TOMCAT/conf/server.xml add
<Resource name="mailSession" auth="Container" type="javax.mail.Session" mail.smtp.host="localhost" />
<Environment name="mailDirectory" value="/tmp/" type="java.lang.String"/>
To ~/.m2/settings.xml add
<ogoglio.mailDirectory>
/tmp/
</ogoglio.mailDirectory>
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java 2007-12-31 23:15:48 UTC (rev 655)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java 2007-12-31 23:15:54 UTC (rev 656)
@@ -195,21 +195,35 @@
Log.error("Aborted destroying data after failure to upgrade");
return false;
}
+
ps.loadPropertySet(PropStorage.BASIC_PROPS);
String dir = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.mediaDirectory");
if (dir == null) {
Log.error("Can't find a property ogoglio.mediaDirectory to cleanse media store");
return false;
}
- File store = new File(dir);
- if ((!store.exists()) || (!store.canWrite())) {
+ if(!destroyFiles(new File(dir))){
Log.error("Media directory doesn't exist or can't be changed:" + dir);
return false;
}
+
+ dir = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.mailDirectory");
+ if (dir != null) {
+ destroyFiles(new File(dir));
+ }
+
+ return true;
+ }
+
+ private boolean destroyFiles(File store){
+ if ((!store.exists()) || (!store.canWrite())) {
+ return false;
+ }
File[] children = store.listFiles();
for (int i = 0; i < children.length; ++i) {
if (children[i].delete() != true) {
- Log.error("Failed to delete media file:" + children[i].getAbsolutePath());
+ Log.error("Failed to delete file:" + children[i].getAbsolutePath());
+ return false;
}
}
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-31 23:16:00
|
Revision: 657
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=657&view=rev
Author: trevorolio
Date: 2007-12-31 15:16:03 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
Fixed the rotted verification email setup. Requires the following additions:
To TOMCAT/conf/server.xml add
<Resource name="mailSession" auth="Container" type="javax.mail.Session" mail.smtp.host="localhost" />
<Environment name="mailDirectory" value="/tmp/" type="java.lang.String"/>
To ~/.m2/settings.xml add
<ogoglio.mailDirectory>
/tmp/
</ogoglio.mailDirectory>
Modified Paths:
--------------
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/OgoglioServletBase.java
maven/trunk/ogoglio-server/src/main/resources/mail/EmailValidationTemplate.txt
maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/pom.xml 2007-12-31 23:16:03 UTC (rev 657)
@@ -286,6 +286,7 @@
<groupId>com.sun</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
+ <scope>provided</scope>
</dependency>
<!-- need MYSQL for tests -->
<dependency>
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java 2007-12-31 23:16:03 UTC (rev 657)
@@ -54,16 +54,16 @@
record.setLastName(document.getLastName());
}
- if (document.getVoiceURI() != null && !equals(record.getVoiceURI(), document.getVoiceURI())){
+ if (document.getVoiceURI() != null && !equals(record.getVoiceURI(), document.getVoiceURI())) {
dirty = true;
record.setVoiceURI(document.getVoiceURI());
}
-
- if (document.getTextURI() != null && !equals(record.getTextURI(), document.getTextURI())){
+
+ if (document.getTextURI() != null && !equals(record.getTextURI(), document.getTextURI())) {
dirty = true;
record.setTextURI(document.getTextURI());
}
-
+
if (document.getPassword() != null && !record.isValidPassword(document.getPassword())) {
if (AccountRecord.cleanPassword(document.getPassword()) != null) {
dirty = true;
@@ -81,21 +81,21 @@
}
}
}
-
- if(document.getBodyConfigurationID() != -1 && document.getBodyConfigurationID() != record.getDefaultBodyConfigurationID()){
+
+ if (document.getBodyConfigurationID() != -1 && document.getBodyConfigurationID() != record.getDefaultBodyConfigurationID()) {
Query bodyConfigQuery = hibernateSession.getNamedQuery(BodyPersistTasks.BODY_CONFIGURATION_BY_ID);
bodyConfigQuery.setLong("bodyConfigurationID", document.getBodyConfigurationID());
- BodyConfigurationRecord bodyConfigRecord = (BodyConfigurationRecord)bodyConfigQuery.uniqueResult();
- if(bodyConfigRecord == null){
+ BodyConfigurationRecord bodyConfigRecord = (BodyConfigurationRecord) bodyConfigQuery.uniqueResult();
+ if (bodyConfigRecord == null) {
return Boolean.FALSE;
}
- if(!record.getUsername().equals(bodyConfigRecord.getOwnerUsername())){
+ if (!record.getUsername().equals(bodyConfigRecord.getOwnerUsername())) {
return Boolean.FALSE;
}
dirty = true;
record.setDefaultBodyConfigurationID(document.getBodyConfigurationID());
}
-
+
if (dirty) {
hibernateSession.update(record);
return Boolean.TRUE;
@@ -164,16 +164,19 @@
}
Query bodyDataQuery = hibernateSession.getNamedQuery(BodyPersistTasks.BODY_DATA);
- BodyDataRecord[] bodyDataRecords = (BodyDataRecord[])bodyDataQuery.list().toArray(new BodyDataRecord[0]);
- if(bodyDataRecords.length == 0){
+ BodyDataRecord[] bodyDataRecords = (BodyDataRecord[]) bodyDataQuery.list().toArray(new BodyDataRecord[0]);
+ if (bodyDataRecords.length == 0) {
throw new IllegalStateException("No body data records!");
}
BodyConfigurationRecord bodyConfRecord = new BodyConfigurationRecord(username, "Body", bodyDataRecords[0].getBodyDataID(), null);
hibernateSession.save(bodyConfRecord);
-
+
record = new AccountRecord(username, accountlevel, email, bodyConfRecord.getBodyConfigurationID(), null, null);
hibernateSession.save(record);
+ PendingEmailValidationRecord validationRec = new PendingEmailValidationRecord(username, email);
+ hibernateSession.save(validationRec);
+
return record;
}
};
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/OgoglioServletBase.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/OgoglioServletBase.java 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/OgoglioServletBase.java 2007-12-31 23:16:03 UTC (rev 657)
@@ -37,6 +37,9 @@
try {
mailDir = new File((String)envCtx.lookup("ogoglio/mailDirectory"));
+ if(mailDir != null && mailDir.length() == 0){
+ mailDir = null;
+ }
} catch (NamingException e) {
} // The media directory is where the MediaServlet will store your models, textures, scripts, and space documents
Modified: maven/trunk/ogoglio-server/src/main/resources/mail/EmailValidationTemplate.txt
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/mail/EmailValidationTemplate.txt 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/src/main/resources/mail/EmailValidationTemplate.txt 2007-12-31 23:16:03 UTC (rev 657)
@@ -1,7 +1,5 @@
-Hello from ${serviceName},
-
-Someone (maybe you) has requested that the address ${emailToValidate} be associated
-with an account at ${serviceName}. If that someone was you and you'd like to make that
+Someone (hopefully you) has requested that the address ${emailToValidate} be associated
+with an account at ${serviceURL}. If that someone was you and you'd like to make that
association, just click this link:
${validationURL}
@@ -9,8 +7,3 @@
If you did not make this request, don't worry. If you don't click that link then the
email will not be associated with the account and after a few days the request will be
deleted.
-
-Keep it real,
-
- - The folks from ${serviceName} at ${serviceURL}
-
Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-31 23:16:03 UTC (rev 657)
@@ -2,10 +2,11 @@
<Context reloadable="true" path="/og" >
<Realm className="org.apache.catalina.realm.MemoryRealm" />
- <ResourceLink name="jdbc/space"
- global="ogoglioDB"
- type="javax.sql.DataSource"/>
+ <ResourceLink name="mail/Session" global="mailSession" type="javax.mail.Session"/>
+ <ResourceLink name="ogoglio/mailDirectory" global="mailDirectory" type="java.lang.String"/>
+ <ResourceLink name="jdbc/space" global="ogoglioDB" type="javax.sql.DataSource"/>
+
<ResourceLink name="ogoglio/mediaURL" global="mediaURL" type="java.lang.String"/>
<ResourceLink name="ogoglio/baseURL" global="baseURL" type="java.lang.String"/>
<ResourceLink name="ogoglio/baseSimURL" global="baseSimURL" type="java.lang.String"/>
Modified: maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-12-31 23:15:54 UTC (rev 656)
+++ maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-12-31 23:16:03 UTC (rev 657)
@@ -2,4 +2,5 @@
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
ogoglio.mediaDirectory = ${ogoglio.mediaDirectory}
+ogoglio.mailDirectory = ${ogoglio.mailDirectory}
ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-30 23:25:55
|
Revision: 652
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=652&view=rev
Author: trevorolio
Date: 2007-12-30 15:15:10 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Added the ability to update the account photo using the body editor
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DCamera.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DCamera.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DCamera.java 2007-12-30 23:15:03 UTC (rev 651)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DCamera.java 2007-12-30 23:15:10 UTC (rev 652)
@@ -116,6 +116,10 @@
public Canvas3D getCanvas() {
return canvas;
}
+
+ public View getView(){
+ return view;
+ }
public void addHUDObject(Node geom) {
hudGroup.addChild(geom);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-30 23:25:54
|
Revision: 653
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=653&view=rev
Author: trevorolio
Date: 2007-12-30 15:15:18 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Added the ability to update the account photo using the body editor
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java 2007-12-30 23:15:10 UTC (rev 652)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java 2007-12-30 23:15:18 UTC (rev 653)
@@ -17,8 +17,11 @@
import java.applet.AppletContext;
import java.applet.AppletStub;
import java.awt.BorderLayout;
+import java.awt.Button;
import java.awt.Dimension;
import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -34,8 +37,7 @@
public class BodyAppletTestWindow extends Frame {
- Dimension appDimension = new Dimension(300, 420);
-
+ Dimension appDimension = new Dimension(300, 460);
public BodyEditorApplet applet = null;
EnvironmentStub clientStub1 = null;
@@ -50,7 +52,7 @@
setLayout(new BorderLayout());
setSize(appDimension);
- setLocation(30, 50);
+ setLocation(200, 50);
setResizable(false);
HashMap parameters1 = new HashMap();
@@ -61,6 +63,14 @@
applet = new BodyEditorApplet();
applet.setStub(clientStub1);
add(applet, BorderLayout.CENTER);
+
+ Button snapshotButton = new Button("Save Snaphot");
+ snapshotButton.addActionListener(new ActionListener(){
+ public void actionPerformed(ActionEvent event) {
+ applet.saveAccountPhoto();
+ }
+ });
+ add(snapshotButton, BorderLayout.SOUTH);
}
private class EnvironmentStub implements AppletStub {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-30 23:25:54
|
Revision: 654
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=654&view=rev
Author: trevorolio
Date: 2007-12-30 15:15:30 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Added the ability to update the account photo using the body editor
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/account.html
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.css
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.html
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.js
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/account.html
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/account.html 2007-12-30 23:15:18 UTC (rev 653)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/account.html 2007-12-30 23:15:30 UTC (rev 654)
@@ -52,6 +52,7 @@
var spaceMembershipTable = null;
var profileTable = null;
var profileGoButton = null;
+var accountPhotoElement = null;
function handleAuth(){
if(requestedUsername == null){
@@ -65,7 +66,7 @@
}
inventoryLink.innerHTML = "<a href='inventory.html?username=" + requestedUsername + "'>Check your inventory »</a>"
-
+ accountPhotoElement.innerHTML = "<img width='210' src='" + appPath + "/account/" + requestedUsername + "/photo' />";
requestAccountDocument(requestedUsername, handleAccount);
requestSpaceList(requestedUsername, handleSpaceList);
requestAccountMembership(requestedUsername, handleMembership);
@@ -208,7 +209,8 @@
spaceMembershipTable = document.getElementById("spaceMembershipTable");
profileGoButton = document.getElementById("profileGoButton");
profileTable = document.getElementById("profileTable");
-
+ accountPhotoElement = document.getElementById("accountPhotoElement");
+
addAuthListeners(handleAuth, handleAuth);
}
</script>
@@ -252,12 +254,15 @@
<form onsubmit="createNewSpace('New Space'); return false;"><input type="submit" value="create a new space"/></form>
</div>
- <p class="navLink" id="bodyLink"><a href='body.html'>Edit your body »</a></p>
<p class="navLink" id="inventoryLink"></p>
</div><!-- end content -->
<div id="rail">
<div class="section">
+ <span id="accountPhotoElement"> </span>
+ <p class="navLink" id="bodyLink"><a href='body.html'>Edit your body »</a></p>
+ </div>
+ <div class="section">
<h3>Space membership:</h3>
<div id="spaceMembershipTable">
loading...
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.css
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.css 2007-12-30 23:15:18 UTC (rev 653)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.css 2007-12-30 23:15:30 UTC (rev 654)
@@ -48,6 +48,10 @@
visibility: hidden;
}
+#bottomControlDiv form {
+ display: inline;
+}
+
#morphControls form {
display: inline;
}
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.html
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.html 2007-12-30 23:15:18 UTC (rev 653)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.html 2007-12-30 23:15:30 UTC (rev 654)
@@ -32,7 +32,6 @@
margin: 10px 0px 10px 0px;
}
-
</style>
<script type="text/javascript">
@@ -85,6 +84,7 @@
<div id="bottomControlDiv" style="text-align: center;">
<form onsubmit="doSave(); return false"><input type="submit" value="save" /></form>
+ <form onsubmit="doSaveAccountPhoto(); return false"><input type="submit" value="save profile photo" /></form>
</div>
</div> <!-- end main -->
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.js 2007-12-30 23:15:18 UTC (rev 653)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/body.js 2007-12-30 23:15:30 UTC (rev 654)
@@ -316,6 +316,14 @@
appletDiv.innerHTML = html;
}
+function doSaveAccountPhoto(){
+ var editor = document.getElementById("viewer");
+ if(editor == null){
+ return;
+ }
+ editor.saveAccountPhoto();
+}
+
function doSave(){
var editor = document.getElementById("viewer");
if(editor == null){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-30 23:15:00
|
Revision: 651
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=651&view=rev
Author: trevorolio
Date: 2007-12-30 15:15:03 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Added the ability to update the account photo using the body editor
Modified Paths:
--------------
maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
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 2007-12-29 20:07:54 UTC (rev 650)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-12-30 23:15:03 UTC (rev 651)
@@ -17,27 +17,38 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
+import java.awt.GraphicsConfiguration;
import java.awt.Panel;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.zip.ZipInputStream;
+import javax.imageio.ImageIO;
import javax.media.j3d.AmbientLight;
import javax.media.j3d.Background;
import javax.media.j3d.BoundingSphere;
import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
import javax.media.j3d.DirectionalLight;
+import javax.media.j3d.GraphicsContext3D;
+import javax.media.j3d.ImageComponent;
+import javax.media.j3d.ImageComponent2D;
+import javax.media.j3d.Raster;
import javax.media.j3d.Transform3D;
import javax.media.j3d.TransformGroup;
import javax.media.j3d.View;
import javax.swing.JLabel;
import javax.vecmath.Color3f;
import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
import javax.vecmath.Vector3f;
import com.ogoglio.client.WebAPIAuthenticator;
@@ -63,12 +74,15 @@
import com.ogoglio.xml.AccountDocument;
import com.ogoglio.xml.BodyConfigurationDocument;
import com.ogoglio.xml.BodyDataDocument;
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGEncodeParam;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
/*
* NOTE: String arrays don't function in LiveConnect in IE, so we use the getXXXCount and getXXX(index) pattern
*/
-public class BodyEditorApplet extends Applet{
+public class BodyEditorApplet extends Applet {
private URI serviceURI = null;
@@ -194,6 +208,14 @@
bodyPanel.renderable.playAnimation(animationName, false, true);
}
+ public void saveAccountPhoto() {
+ if (user == null || bodyPanel == null || bodyPanel.renderable == null) {
+ return;
+ }
+ bodyPanel.canvas.writeJPEG = true;
+ bodyPanel.canvas.repaint();
+ }
+
public String getBodyConfigurationDocument() {
if (user == null || bodyPanel == null || bodyPanel.renderable == null) {
return null;
@@ -301,23 +323,23 @@
private class BodyPanel extends Panel implements MouseWheelListener {
Dimension dimension = new Dimension(300, 400);
- private J3DUniverse universe = null;
+ J3DUniverse universe = null;
- private J3DCamera camera = null;
+ J3DCamera camera = null;
- private J3DCanvas canvas = null;
+ CapturingCanvas3D canvas = null;
- private BranchGroup sceneRoot = new BranchGroup();
+ BranchGroup sceneRoot = new BranchGroup();
- private BranchGroup worldBranch = new BranchGroup();
+ BranchGroup worldBranch = new BranchGroup();
- private TransformGroup userGroup = new TransformGroup();
+ TransformGroup userGroup = new TransformGroup();
- private BoundingSphere bounds = new BoundingSphere(new Point3d(), 1000);
+ BoundingSphere bounds = new BoundingSphere(new Point3d(), 1000);
J3DUserRenderable renderable = null;
- private J3DBodyData bodyData = null;
+ J3DBodyData bodyData = null;
public BodyPanel() {
setPreferredSize(dimension);
@@ -326,7 +348,7 @@
setLayout(new BorderLayout());
universe = new J3DUniverse();
- canvas = new J3DCanvas(J3DRenderer.getGraphicsConfiguration(), false);
+ canvas = new CapturingCanvas3D(J3DRenderer.getGraphicsConfiguration(), false);
canvas.addMouseWheelListener(this);
camera = new J3DCamera();
camera.setCanvas(canvas);
@@ -461,6 +483,35 @@
//renderer.stopRenderer();
}
+ private class CapturingCanvas3D extends J3DCanvas {
+ boolean writeJPEG = false;
+
+ public CapturingCanvas3D(GraphicsConfiguration graphicsConfiguration, boolean offscreen) {
+ super(graphicsConfiguration, offscreen);
+ }
+
+ public void postSwap() {
+ if (!writeJPEG) {
+ super.postSwap();
+ return;
+ }
+ try {
+ GraphicsContext3D ctx = getGraphicsContext3D();
+ Raster ras = new Raster(new Point3f(-1.0f, -1.0f, -1.0f), Raster.RASTER_COLOR, 0, 0, getWidth(), getHeight(), new ImageComponent2D(ImageComponent.FORMAT_RGB, new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB)), null);
+ ctx.readRaster(ras);
+ BufferedImage img = ras.getImage().getImage();
+
+ ByteArrayOutputStream jpegBuffer = new ByteArrayOutputStream();
+ ImageIO.write(img, "jpeg", jpegBuffer);
+ webClient.setAccountPhoto(webClient.getAuthenticator().getUsername(), new ByteArrayInputStream(jpegBuffer.toByteArray()), "image/jpeg");
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ writeJPEG = false;
+ }
+ }
+ }
+
private class TemplateProvider implements TemplateDataProvider {
public InputStream getTemplateGeometry(String username, long templateID, int lod) {
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-25 22:41:18
|
Revision: 645
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=645&view=rev
Author: trevorolio
Date: 2007-12-25 14:41:21 -0800 (Tue, 25 Dec 2007)
Log Message:
-----------
Added a context menu for users, which is currently empty unless the selected user has a voice URL, in which case it offers to initiate a call.
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/src/main/java/com/ogoglio/amazon/test/CometTest.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
Modified: maven/trunk/ogoglio-integration-test/src/main/java/com/ogoglio/amazon/test/CometTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/main/java/com/ogoglio/amazon/test/CometTest.java 2007-12-25 22:41:07 UTC (rev 644)
+++ maven/trunk/ogoglio-integration-test/src/main/java/com/ogoglio/amazon/test/CometTest.java 2007-12-25 22:41:21 UTC (rev 645)
@@ -11,6 +11,7 @@
import com.ogoglio.client.WebAPIClientWire;
import com.ogoglio.client.WebAPIDescriptor;
import com.ogoglio.client.model.Thing;
+import com.ogoglio.client.model.User;
import com.ogoglio.xml.SpaceDocument;
public class CometTest implements SpaceClient.Listener{
@@ -101,4 +102,9 @@
public void receivedSpaceTransfer(URI link) {
}
+ public void receivedUserContextMenuRequest(User user, int x, int y) {
+ // TODO Auto-generated method stub
+
+ }
+
}
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-12-25 22:41:07 UTC (rev 644)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-12-25 22:41:21 UTC (rev 645)
@@ -1091,6 +1091,11 @@
public void receivedInfoPanel(long sourceThingID, String nonce) {
}
+ public void receivedUserContextMenuRequest(User user, int x, int y) {
+ // TODO Auto-generated method stub
+
+ }
+
}
private class TestListener implements Space.Listener {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-21 05:22:12
|
Revision: 637
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=637&view=rev
Author: trevorolio
Date: 2007-12-20 21:21:52 -0800 (Thu, 20 Dec 2007)
Log Message:
-----------
Fixed a bug in the new RemoteSiteResource in which the auth doc was not required despite it being requested.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java 2007-12-18 01:44:26 UTC (rev 636)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java 2007-12-21 05:21:52 UTC (rev 637)
@@ -48,7 +48,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
AuthDocument authDoc = requestAllowed(request, pathElements);
- if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+ if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -57,7 +57,7 @@
public void doPost(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
AuthDocument authDoc = requestAllowed(request, pathElements);
- if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+ if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -66,7 +66,7 @@
public void doPut(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
AuthDocument authDoc = requestAllowed(request, pathElements);
- if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+ if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -75,7 +75,7 @@
public void doDelete(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
AuthDocument authDoc = requestAllowed(request, pathElements);
- if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+ if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -84,7 +84,7 @@
public void doHead(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
AuthDocument authDoc = requestAllowed(request, pathElements);
- if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+ if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-15 16:04:45
|
Revision: 635
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=635&view=rev
Author: trevorolio
Date: 2007-12-15 08:04:50 -0800 (Sat, 15 Dec 2007)
Log Message:
-----------
Added a onUserAdded and onUserRemoved function to the script API.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/SpaceScriptEngine.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-14 18:17:28 UTC (rev 634)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-15 16:04:50 UTC (rev 635)
@@ -222,10 +222,12 @@
if (SpaceEvent.ADD_USER_EVENT.equals(event.getName())) {
listener.generatedSpaceEvent(event, SpaceSimulator.this);
log("added user " + event.getStringProperty(SpaceEvent.USERNAME));
+ scriptEngine.handleSpaceEvent(event);
} else if (SpaceEvent.REMOVE_USER_EVENT.equals(event.getName())) {
listener.generatedSpaceEvent(event, SpaceSimulator.this);
log("removed user " + event.getStringProperty(SpaceEvent.USERNAME));
+ scriptEngine.handleSpaceEvent(event);
} else if (SpaceEvent.USER_START_MOTION_EVENT.equals(event.getName())) {
String username = event.getStringProperty(SpaceEvent.USERNAME);
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/SpaceScriptEngine.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/SpaceScriptEngine.java 2007-12-14 18:17:28 UTC (rev 634)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/SpaceScriptEngine.java 2007-12-15 16:04:50 UTC (rev 635)
@@ -71,8 +71,12 @@
public static final String ONUSERMOTIONSTART_FUNCTION_NAME = "onUserMotionStart";
- private static final String ONUSERSTOPPED_FUNCTION_NAME = "onUserStopped";
+ public static final String ONUSERSTOPPED_FUNCTION_NAME = "onUserStopped";
+ public static final String ONUSERADDED_FUNCTION_NAME = "onUserAdded";
+
+ public static final String ONUSERREMOVED_FUNCTION_NAME = "onUserRemoved";
+
private Vector3d workingPosition = new Vector3d();
private Quat4d workingOrientation = new Quat4d();
@@ -209,7 +213,7 @@
scriptPosition.jsSet_z(workingPosition.z);
workingTransform.get(workingOrientation);
- ScriptQuaternion scriptQuat = (ScriptQuaternion)context.newObject(globalScope, "Quaternion", new Object[0]);
+ ScriptQuaternion scriptQuat = (ScriptQuaternion) context.newObject(globalScope, "Quaternion", new Object[0]);
scriptQuat.jsFunction_set(workingOrientation.w, workingOrientation.x, workingOrientation.y, workingOrientation.z);
Object[] args = { username, scriptPosition, scriptQuat };
@@ -220,6 +224,33 @@
} finally {
Context.exit();
}
+
+ } else if (SpaceEvent.ADD_USER_EVENT.equals(event.getName())) {
+ String username = event.getStringProperty(SpaceEvent.USERNAME);
+ Context context = Context.enter();
+ try {
+ Object[] args = { username };
+ Object[] scopeObjs = thingScopes.getValues();
+ for (int i = 0; i < scopeObjs.length; i++) {
+ callJavascriptFunction(context, (ScriptableObject) scopeObjs[i], ONUSERADDED_FUNCTION_NAME, args);
+ }
+ } finally {
+ Context.exit();
+ }
+
+ } else if (SpaceEvent.REMOVE_USER_EVENT.equals(event.getName())) {
+ String username = event.getStringProperty(SpaceEvent.USERNAME);
+ Context context = Context.enter();
+ try {
+ Object[] args = { username };
+ Object[] scopeObjs = thingScopes.getValues();
+ for (int i = 0; i < scopeObjs.length; i++) {
+ callJavascriptFunction(context, (ScriptableObject) scopeObjs[i], ONUSERREMOVED_FUNCTION_NAME, args);
+ }
+ } finally {
+ Context.exit();
+ }
+
} else if (SpaceEvent.THING_CLICKED_EVENT.equals(event.getName())) {
Long thingID = event.getLongProperty(SpaceEvent.THING_ID);
if (thingID == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-12-14 18:17:24
|
Revision: 634
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=634&view=rev
Author: iansmith
Date: 2007-12-14 10:17:28 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
Renamed the filter to be more sensible. It is also now available (via web.xml) to the status
servlet as well, if you want to protect that servlet. For developers, this is all turned
OFF by default.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/FilterByPort.java
Removed Paths:
-------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java
Copied: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/FilterByPort.java (from rev 632, maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java)
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/FilterByPort.java (rev 0)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/FilterByPort.java 2007-12-14 18:17:28 UTC (rev 634)
@@ -0,0 +1,68 @@
+package com.ogoglio.sim.site;
+
+import java.io.IOException;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ogoglio.util.Log;
+
+public class FilterByPort implements Filter {
+
+ private boolean filterNeeded=false;
+ private int okPort=8888;
+
+ public void destroy() {
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
+ //do we even need to bother?
+ if (!filterNeeded) {
+ chain.doFilter(req, resp);
+ return;
+ }
+
+ //ok, now do the checking
+ if (req.getLocalPort()!=okPort) {
+ if (resp instanceof HttpServletResponse) {
+ Log.info("Refusing to allow connection to sim on port "+req.getLocalPort());
+ HttpServletResponse httpResp=(HttpServletResponse)resp;
+ httpResp.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ } else {
+ Log.warn("Configuration is almost certainly messed up, got a non HTTP servlet response:"+
+ resp.getClass().getName());
+ }
+ } else {
+ chain.doFilter(req,resp);
+ }
+ }
+
+ public void init(FilterConfig config) throws ServletException {
+ try {
+ Context initCtx = new InitialContext();
+ Context envCtx = (Context) initCtx.lookup("java:comp/env");
+ String useMe = (String) envCtx.lookup("ogoglio/simFilter");
+ if ("true".equals(useMe.toLowerCase())) {
+ filterNeeded=true;
+ String port=(String)envCtx.lookup("ogoglio/simFilterPort");
+ try {
+ okPort=Integer.parseInt(port);
+ } catch (NumberFormatException ex) {
+ Log.error("Whoa! Couldn't understand ogoglio/simFilterPort: "+port+" using "+okPort+" instead!");
+ }
+ }
+ Log.info("Filtering by port? "+useMe+" [port = "+okPort+"] and needed?"+filterNeeded);
+ } catch (NamingException e) {
+ throw new ServletException("Initialization time exception from Naming (JNDI):"+e.getMessage());
+ }
+ }
+}
+
Deleted: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java 2007-12-14 17:28:46 UTC (rev 633)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java 2007-12-14 18:17:28 UTC (rev 634)
@@ -1,67 +0,0 @@
-package com.ogoglio.sim.site;
-
-import java.io.IOException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ogoglio.util.Log;
-
-public class SimFilter implements Filter {
-
- private boolean filterNeeded=false;
- private int okPort=8888;
-
- public void destroy() {
- }
-
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
- //do we even need to bother?
- if (!filterNeeded) {
- chain.doFilter(req, resp);
- return;
- }
-
- //ok, now do the checking
- if (req.getLocalPort()!=okPort) {
- if (resp instanceof HttpServletResponse) {
- Log.info("Refusing to allow connection to sim on port "+req.getLocalPort());
- HttpServletResponse httpResp=(HttpServletResponse)resp;
- httpResp.setStatus(HttpServletResponse.SC_FORBIDDEN);
- } else {
- Log.warn("Configuration is almost certainly messed up, got a non HTTP servlet response:"+
- resp.getClass().getName());
- }
- } else {
- chain.doFilter(req,resp);
- }
- }
-
- public void init(FilterConfig config) throws ServletException {
- try {
- Context initCtx = new InitialContext();
- Context envCtx = (Context) initCtx.lookup("java:comp/env");
- String useMe = (String) envCtx.lookup("ogoglio/simFilter");
- if ("true".equals(useMe.toLowerCase())) {
- filterNeeded=true;
- String port=(String)envCtx.lookup("ogoglio/simFilterPort");
- try {
- okPort=Integer.parseInt(port);
- } catch (NumberFormatException ex) {
- Log.error("Whoa! Couldn't understand ogoglio/simFilterPort: "+port+" using "+okPort+" instead!");
- }
- }
- } catch (NamingException e) {
- throw new ServletException("Initialization time exception from Naming (JNDI):"+e.getMessage());
- }
- }
-}
-
Modified: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-12-14 17:28:46 UTC (rev 633)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-12-14 18:17:28 UTC (rev 634)
@@ -43,8 +43,8 @@
</servlet>
<filter>
- <filter-name>SimFilter</filter-name>
- <filter-class>com.ogoglio.sim.site.SimFilter</filter-class>
+ <filter-name>PortFilter</filter-name>
+ <filter-class>com.ogoglio.sim.site.FilterByPort</filter-class>
</filter>
@@ -69,7 +69,7 @@
</servlet-mapping>
<filter-mapping>
- <filter-name>SimFilter</filter-name>
+ <filter-name>PortFilter</filter-name>
<url-pattern>/sim/*</url-pattern>
</filter-mapping>
@@ -88,6 +88,11 @@
<url-pattern>/status/*</url-pattern>
</servlet-mapping>
+ <filter-mapping>
+ <filter-name>PortFilter</filter-name>
+ <url-pattern>/status/*</url-pattern>
+ </filter-mapping>
+
<error-page>
<error-code>404</error-code>
<location>/notFound.html</location>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-14 17:28:51
|
Revision: 633
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=633&view=rev
Author: trevorolio
Date: 2007-12-14 09:28:46 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
Tweaked a servlet filter config typo
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java
maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java 2007-12-13 01:58:05 UTC (rev 632)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java 2007-12-14 17:28:46 UTC (rev 633)
@@ -344,7 +344,6 @@
}
try {
URI result=new URI(representativeURI.getScheme(),null,representativeURI.getHost(),representativeURI.getPort(),cometPath,null,null);
- Log.warn("Somewhat dodgy: Converting the URI "+representativeURI+" to "+result+" for comet!");
return result;
} catch (URISyntaxException e) {
throw new IOException("Our converted URI was not well formed! Started with:"+representativeURI);
Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-13 01:58:05 UTC (rev 632)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-14 17:28:46 UTC (rev 633)
@@ -19,7 +19,7 @@
<ResourceLink name="ogoglio/isMediaServer" global="isMediaServer" type="java.lang.String"/>
<ResourceLink name="ogoglio/isWebappServer" global="isWebappServer" type="java.lang.String"/>
- <ResourceLink name="ogoglio/simFilter" global="simFilterPort" type="java.lang.String"/>
+ <ResourceLink name="ogoglio/simFilter" global="simFilter" type="java.lang.String"/>
<ResourceLink name="ogoglio/simFilterPort" global="simFilterPort" type="java.lang.String"/>
</Context>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-12-13 01:58:02
|
Revision: 632
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=632&view=rev
Author: iansmith
Date: 2007-12-12 17:58:05 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
First stage of allowing folks that want to protect their sims with a servlet filter.
Developers need to add this to their servlet.xml
<Environment name="simFilter" value="false" type="java.lang.String"/>
<!-- simFilterPortDoesn't matter unless simFilter is true and developers don't want that-->
<!-- but you want to keep in here so that tools that examine this file can find it -->
<Environment name="simFilterPort" value="0" type="java.lang.String"/>
With this, filtering is turned off for the development machine.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java
Removed Paths:
-------------
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-all.xml
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-app.xml
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-media.xml
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-sim.xml
Added: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java (rev 0)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimFilter.java 2007-12-13 01:58:05 UTC (rev 632)
@@ -0,0 +1,67 @@
+package com.ogoglio.sim.site;
+
+import java.io.IOException;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ogoglio.util.Log;
+
+public class SimFilter implements Filter {
+
+ private boolean filterNeeded=false;
+ private int okPort=8888;
+
+ public void destroy() {
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
+ //do we even need to bother?
+ if (!filterNeeded) {
+ chain.doFilter(req, resp);
+ return;
+ }
+
+ //ok, now do the checking
+ if (req.getLocalPort()!=okPort) {
+ if (resp instanceof HttpServletResponse) {
+ Log.info("Refusing to allow connection to sim on port "+req.getLocalPort());
+ HttpServletResponse httpResp=(HttpServletResponse)resp;
+ httpResp.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ } else {
+ Log.warn("Configuration is almost certainly messed up, got a non HTTP servlet response:"+
+ resp.getClass().getName());
+ }
+ } else {
+ chain.doFilter(req,resp);
+ }
+ }
+
+ public void init(FilterConfig config) throws ServletException {
+ try {
+ Context initCtx = new InitialContext();
+ Context envCtx = (Context) initCtx.lookup("java:comp/env");
+ String useMe = (String) envCtx.lookup("ogoglio/simFilter");
+ if ("true".equals(useMe.toLowerCase())) {
+ filterNeeded=true;
+ String port=(String)envCtx.lookup("ogoglio/simFilterPort");
+ try {
+ okPort=Integer.parseInt(port);
+ } catch (NumberFormatException ex) {
+ Log.error("Whoa! Couldn't understand ogoglio/simFilterPort: "+port+" using "+okPort+" instead!");
+ }
+ }
+ } catch (NamingException e) {
+ throw new ServletException("Initialization time exception from Naming (JNDI):"+e.getMessage());
+ }
+ }
+}
+
Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -19,4 +19,7 @@
<ResourceLink name="ogoglio/isMediaServer" global="isMediaServer" type="java.lang.String"/>
<ResourceLink name="ogoglio/isWebappServer" global="isWebappServer" type="java.lang.String"/>
+ <ResourceLink name="ogoglio/simFilter" global="simFilterPort" type="java.lang.String"/>
+ <ResourceLink name="ogoglio/simFilterPort" global="simFilterPort" type="java.lang.String"/>
+
</Context>
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-all.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-all.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-all.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -1,62 +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>
- <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>
-</web-app>
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-app.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-app.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-app.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -1,40 +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-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>
- <url-pattern>/space/*</url-pattern>
- </servlet-mapping>
-
- <error-page>
- <error-code>404</error-code>
- <location>/notFound.html</location>
- </error-page>
-</web-app>
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-media.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-media.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-media.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -1,18 +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>MediaServlet</servlet-name>
- <servlet-class>com.ogoglio.media.site.MediaServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <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>
-</web-app>
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-sim.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-sim.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-sim.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -1,18 +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>SimServlet</servlet-name>
- <servlet-class>com.ogoglio.sim.site.SimServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>SimServlet</servlet-name>
- <url-pattern>/sim/*</url-pattern>
- </servlet-mapping>
-
- <error-page>
- <error-code>404</error-code>
- <location>/notFound.html</location>
- </error-page>
-</web-app>
Modified: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-12-13 01:46:16 UTC (rev 631)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-12-13 01:58:05 UTC (rev 632)
@@ -42,6 +42,12 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <filter>
+ <filter-name>SimFilter</filter-name>
+ <filter-class>com.ogoglio.sim.site.SimFilter</filter-class>
+ </filter>
+
+
<servlet-mapping>
<servlet-name>AccountServlet</servlet-name>
<url-pattern>/account/*</url-pattern>
@@ -62,6 +68,11 @@
<url-pattern>/sim/*</url-pattern>
</servlet-mapping>
+ <filter-mapping>
+ <filter-name>SimFilter</filter-name>
+ <url-pattern>/sim/*</url-pattern>
+ </filter-mapping>
+
<servlet-mapping>
<servlet-name>MediaServlet</servlet-name>
<url-pattern>/media/*</url-pattern>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-13 01:46:19
|
Revision: 631
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=631&view=rev
Author: trevorolio
Date: 2007-12-12 17:46:16 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Removed old debug messages.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java 2007-12-13 01:29:46 UTC (rev 630)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java 2007-12-13 01:46:16 UTC (rev 631)
@@ -228,7 +228,6 @@
method.setFollowRedirects(false);
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(1, false));
method.getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
- Log.info("About to invoke an HTTP "+methodType+" on "+url+" from a sim script...");
try {
httpCode = client.executeMethod(method);
if (scriptSpace != null && destinationThingID != -1 && destinationPageID != -1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-13 01:29:41
|
Revision: 630
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=630&view=rev
Author: trevorolio
Date: 2007-12-12 17:29:46 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Removed old debug messages.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -100,7 +100,6 @@
//the buffer is critical here
StringBuffer buff=(StringBuffer)sessionToBuffer.get(event);
buff.append(tmp);
- Log.debug("Added some text to the buffer in ChanMgr:"+buff.toString());
String msg = CometClient.pullOutNextMessage(buff);
if (msg!=null) {
messageDone((TCPChannel) sessionToChannel.get(event), msg, event);
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -47,7 +47,6 @@
public static void addChannel(String subspace, CometChannelManager mgr) {
if (!clientChannelMap.containsKey(subspace)) {
clientChannelMap.put(subspace, Collections.synchronizedList(new ArrayList()));
- Log.info("Comet listener on space:" + subspace);
}
List clienChannList = (List) clientChannelMap.get(subspace);
clienChannList.add(mgr);
@@ -87,14 +86,12 @@
response.flushBuffer();
} else if (event.getEventType() == CometEvent.EventType.ERROR) {
if (event.getEventSubType().equals(CometEvent.EventSubType.TIMEOUT)) {
- //Log.info("Ignoring timeout on session "+ request.getSession(true).getId());
return;
}
Log.error("Error for session: " + request.getSession(true).getId() + "-->" + event.getEventSubType());
closeComet(event);
} else if (event.getEventType() == CometEvent.EventType.END) {
closeComet(event);
- //Log.info("End for session: " + request.getSession(true).getId());
} else if (event.getEventType() == CometEvent.EventType.READ) {
if (drainDataBuffer(event, request)) {
response.flushBuffer();
@@ -111,7 +108,6 @@
CometChannelManager mgr = (CometChannelManager) iterator.next();
mgr.connectionDropped(event);
}
- Log.info("Destroyed comet info for path "+path+":"+event.getHttpServletRequest().getSession(true).getId());
} else {
Log.warn("Close comet on path " + path + " but nobody interested....");
}
@@ -145,7 +141,6 @@
mgr.addConnection(event, channel);
//in 6.0.14 this is an unsupported operation
//event.setTimeout(30000);
- Log.info("Added comet connection for path "+event.getHttpServletRequest().getPathInfo()+":"+event.getHttpServletRequest().getSession(true).getId());
}
private boolean drainDataBuffer(CometEvent event, HttpServletRequest request) throws IOException {
@@ -167,7 +162,6 @@
} while (is.available() > 0);
return true;
} catch (IOException exception) {
- Log.info("Client appears to have closed the comet connection:" + event.getHttpServletRequest().getSession(true).getId()+". Closing it b/c:"+exception.getMessage()+" of type "+exception.getClass().getName());
closeComet(event);
return false;
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -296,19 +296,14 @@
return simulator;
}
- Log.debug("Sim.getOrCreateSpaceSim: don't have space doc cached.");
SpaceDocument spaceDoc = null;
try {
- Log.debug("Sim.getOrCreateSpaceSim: about to read it from the media service!");
spaceDoc = getSpaceDocument(record.getSpaceID());
- Log.debug("Sim.getOrCreateSpaceSim: Media service:" + (spaceDoc == null));
} catch (IOException e) {
}
if (spaceDoc == null) {
- Log.debug("Sim.getOrCreateSpaceSim:Now trying to get it from the DocumentFactory.");
spaceDoc = DocumentFactory.documentFromRecord(record);
} else {
- Log.debug("Sim.getOrCreateSpaceSim: Setting basic properties... why aren't these there before?");
spaceDoc.setDisplayName(record.getDisplayName());
spaceDoc.setMaxGuests(record.getMaxGuests());
spaceDoc.setSimID(record.getSimID());
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SimMessageHandler.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -56,7 +56,6 @@
Log.error("Somebody sent message with the 'heartbeat' space id:"+message.getPayload());
}
- //Log.info("Sim is ignoring heartbeat from proxy.");
return;
}
@@ -71,7 +70,6 @@
SpaceSimulator ss=(SpaceSimulator)allSpaces[i];
buffer.append(" "+ss.getSpaceID());
}
- Log.info("Currently supporting spaces:"+buffer);
return;
}
}
@@ -85,9 +83,7 @@
} else if (message.getPayload() instanceof PayloadFactory.LoggedOutPayload) {
PayloadFactory.LoggedOutPayload payload = (PayloadFactory.LoggedOutPayload) message.getPayload();
- Log.info("Client "+payload.getUsername()+" sent logged out!");
spaceSim.userLoggedOut(payload.getUsername());
- Log.info("Sim finished telling the spacesim about the logout.");
} else {
Log.error("Sim received unknown payload in this message: " + message);
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -102,7 +102,6 @@
renderer.setSimCamera(); //Sigh, you have to add a view before it will schedule the behavior
ThingDocument[] thingDocs = spaceDocument.getThingDocuments();
- Log.debug("Initialization SpaceSimulator on space " + spaceDocument.getSpaceID() + " with " + thingDocs.length);
for (int i = 0; i < thingDocs.length; i++) {
TemplateDocument templateDoc = listener.getTemplateDocument(thingDocs[i].getTemplateID());
if (templateDoc == null) {
@@ -196,7 +195,6 @@
public void startSim() {
simThread.setName("space-" + space.getSpaceID());
- //Log.info("Starting up thread: "+simThread.getName());
simThread.start();
}
@@ -717,7 +715,6 @@
public ThingDocument[] getThingDocuments() {
Thing[] things = space.getThings();
- Log.debug("SpaceSimulator: asked space object how many things:" + things.length);
ThingDocument[] results = new ThingDocument[things.length];
for (int i = 0; i < results.length; i++) {
results[i] = new ThingDocument(things[i]);
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-12-13 01:29:36 UTC (rev 629)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-13 01:29:46 UTC (rev 630)
@@ -95,10 +95,10 @@
//don't bother with the sim if nobody wants it
if (servletNeeded) {
- String tmpSimUrl=(String) envCtx.lookup(OGOGLIO_BASE_SIM_URL_KEY);
+ String tmpSimUrl = (String) envCtx.lookup(OGOGLIO_BASE_SIM_URL_KEY);
if (!tmpSimUrl.endsWith("/")) {
- tmpSimUrl=tmpSimUrl+"/";
- Log.warn(OGOGLIO_BASE_SIM_URL_KEY+" in server.xml should end in / but we are patching it:"+tmpSimUrl);
+ tmpSimUrl = tmpSimUrl + "/";
+ Log.warn(OGOGLIO_BASE_SIM_URL_KEY + " in server.xml should end in / but we are patching it:" + tmpSimUrl);
}
simURI = new URI(tmpSimUrl);
SimRecord simRecord = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
@@ -113,10 +113,10 @@
}
WebAPIDescriptor descriptor;
String serviceURI = (String) envCtx.lookup("ogoglio/baseURL");
- if ((serviceURI==null) || (serviceURI.trim().equals(""))) {
+ if ((serviceURI == null) || (serviceURI.trim().equals(""))) {
throw new ServletException("Unable to fetch ogoglio/baseURL from the server.xml file!");
}
- descriptor=new WebAPIDescriptor(new URI(serviceURI));
+ descriptor = new WebAPIDescriptor(new URI(serviceURI));
sim = new Sim(simRecord, getMediaService(), getSessionFactory(), descriptor);
localIP = InetAddress.getByName(simURI.getHost()).getHostAddress();
}
@@ -484,11 +484,8 @@
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- Log.debug("GET on SimServlet.ThingsResource: "+requestedSpaceID+" --- how many possessions?"+
- (PossessionPersistTasks.findPossessionsBySpaceID(requestedSpaceID, getSessionFactory())));
SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
ThingDocument[] thingDocs = simulator.getThingDocuments();
- Log.debug("SimServlet, Thing request:"+thingDocs.length);
XMLElement list = new XMLElement("list");
for (int i = 0; i < thingDocs.length; i++) {
list.addChild(thingDocs[i].toElement());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-13 01:29:34
|
Revision: 629
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=629&view=rev
Author: trevorolio
Date: 2007-12-12 17:29:36 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Removed old debug messages.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/SenderQueue.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPChannel.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometProto.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -36,14 +36,12 @@
throw new IllegalArgumentException("Cannot copy a space to itself: " + destinationSpaceID);
}
- Log.info("DUP:Creating new client:"+destinationSpaceID+","+emptyFirst+", from "+originSpaceID);
WebAPIClient client = new WebAPIClient(descriptor, auth, wire);
if (emptyFirst) {
emptySpace(destinationSpaceID, client);
}
- Log.info("DUP: Getting space document and setting simple properties");
SpaceDocument spaceDoc1 = client.getSpaceDocument(originSpaceID, false);
SpaceDocument spaceDoc2 = client.getSpaceDocument(destinationSpaceID, false);
@@ -54,9 +52,7 @@
client.setSpacePublished(destinationSpaceID, spaceDoc1.isPublished());
ThingDocument[] thingDocs = client.getThingDocuments(originSpaceID);
- Log.info("DUP: setting up possessions and things:"+thingDocs.length);
for (int i = 0; i < thingDocs.length; i++) {
- Log.info("DUP: Setting up thing "+i+":"+thingDocs[i].getDisplayName());
PossessionDocument[] possDocuments = client.getPossessionDocuments();
PossessionDocument possToUse = null;
for (int j = 0; j < possDocuments.length; j++) {
@@ -85,12 +81,10 @@
}
DoorDocument[] doorDocs = client.getDoorDocuments(spaceDoc1.getSpaceID());
- Log.info("DUP: Setting up doors:"+doorDocs.length);
for (int i = 0; i < doorDocs.length; i++) {
client.createDoor(spaceDoc2.getSpaceID(), doorDocs[i].getTemplateID(), doorDocs[i].getTemplateOwner(), doorDocs[i].getDisplayName(), doorDocs[i].getLink(), doorDocs[i].getTransform());
}
- Log.info("DUP: copying space settings ");
Map settings = client.getSpaceSettings(spaceDoc1.getSpaceID());
String[] keys = (String[]) settings.keySet().toArray(new String[0]);
for (int i = 0; i < keys.length; i++) {
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -86,25 +86,16 @@
public AccountDocument updateAccount(AccountDocument accountDoc) throws IOException {
XMLElement result = wire.sendAuthenticatedXML(descriptor.getAccountURI(accountDoc.getUsername()), accountDoc.toElement().toString(), "POST", authenticator.getAuthCookie());
- if (result == null) {
- return null;
- }
return new AccountDocument(result);
}
public AccountDocument getAccountDocument(String username) throws IOException {
XMLElement response = wire.fetchAuthenticatedXML(descriptor.getAccountURI(username), authenticator.getAuthCookie());
- if (response == null) {
- return null;
- }
return new AccountDocument(response);
}
public AuthDocument getAuthDocumentByAuthCookie(String authCookie) throws IOException {
XMLElement response = wire.fetchAuthenticatedXML(descriptor.getMeAuthURI(), authCookie);
- if (response == null) {
- return null;
- }
return new AuthDocument(response);
}
@@ -389,7 +380,6 @@
XMLElement list = wire.fetchAuthenticatedXML(descriptor.getThingsURI(spaceID), authenticator.getAuthCookie());
XMLElement[] children = (XMLElement[]) list.getChildren().toArray(new XMLElement[0]);
- Log.info("CLIENT: Fetched thing document for space "+spaceID+" and found "+children.length+" children");
for (int i = 0; i < children.length; i++) {
results.add(new ThingDocument(children[i]));
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -383,7 +383,6 @@
}
public synchronized Thing[] getThings() {
- Log.info("SPACE: query of things content:"+ things.values().size()+" of space "+spaceID);
return (Thing[]) things.values().toArray(new Thing[0]);
}
@@ -428,7 +427,6 @@
}
public void addThing(Thing thing) {
- Log.info("Space: adding thing:"+thing.getName()+" to space "+spaceID);
synchronized (this) {
if (thing.getThingID() == -1) {
thing.setThingID(getNewThingID());
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/SenderQueue.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/SenderQueue.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/SenderQueue.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -41,16 +41,13 @@
public void start(String debugInfo) {
senderThread.setName("sender-thread-"+debugInfo+"-"+senderThread.getId());
- //Log.info("Launching thread "+senderThread.getName());
senderThread.start();
}
public void cleanup() {
cleaned = true;
- Log.info("About to shut down the client proto of the sender queue...");
clientProto.shutdown();
if (messageQueue != null) {
- Log.info("About to close the message queue associated with the SenderQueue");
messageQueue.close();
}
}
@@ -83,7 +80,6 @@
Message message = (Message) messageQueue.dequeue();
unsafeSendMessage(message);
} catch (Throwable e) {
- //Log.error("Could not send message [aborting thread:"+Thread.currentThread().getName()+"]:"+ e.getClass().getName()+":"+e.getMessage());
cleaned=true;
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPChannel.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPChannel.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPChannel.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -66,7 +66,6 @@
if (needAReaderThread) {
readerThread = new TCPMessageReader(clientProto, message_handler, this);
readerThread.setName("tcp-reader-"+debugInfo+"-"+readerThread.getId());
- //Log.info("Starting reader thread:"+readerThread.getName());
readerThread.start();
}
@@ -74,7 +73,7 @@
}
public void clientReady(AsyncProto newlyConnectedProto) {
- Log.info("Client connected from: "+newlyConnectedProto.getRemoteLocator());
+ Log.debug("Client connected from: "+newlyConnectedProto.getRemoteLocator());
}
public interface Listener {
public void channelClosed(TCPChannel channel);
@@ -91,9 +90,7 @@
public void cleanup() {
//cleaned = true;
try {
- Log.info("Cleaning up the TCP channel "+getLocalLocator());
if (readerThread!=null) {
- Log.info("Reader thread about to be cleaned up...");
readerThread.cleanup();
}
} catch (Exception e) {
@@ -101,13 +98,11 @@
}
try {
if (senderQueue!=null) {
- Log.info("Sender queue about to be cleaned up...");
senderQueue.cleanup();
}
} catch (Exception e) {
Log.error("TCPChannel: Trying to cleanup to senderQueue:"+(e.getClass().getName()),e);
}
- Log.info("About to tell listener that the TCP channel is now closed.");
listener.channelClosed(this);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -62,7 +62,6 @@
}
private static void sendHTTPStartupInfo(Writer wr, String host, String path) throws IOException {
- Log.debug("About to send POST to "+path+" on "+host);
/*sendLine("POST "+path+" HTTP/1.1", wr);
HACK FOR DEALING WITH MOD_PROXY IN APACHE 2.2*/
sendLine("GET "+path+" HTTP/1.1", wr);
@@ -70,7 +69,6 @@
sendLine("Transfer-encoding: chunked",wr);
sendLine("",wr);
wr.flush();
- Log.debug("GET/POST Sent!");
}
private static String getHTTPResponse(InputStream is) throws IOException {
@@ -97,7 +95,7 @@
public static String pullOutNextMessage(StringBuffer buff) {
//if you have no "$" then you are right at the front
if (buff.indexOf("$")==-1) {
- Log.info("Unusual buffer situation, no $ found yet out of "+buff.length()+" chars...");
+ Log.warn("Unusual buffer situation, no $ found yet out of "+buff.length()+" chars...");
return null;
}
int result = CometClient.pullOutCommandPart(buff);
@@ -105,7 +103,6 @@
return null;
}
if (result== CometClient.CMD_BUFFERED) {
- //Log.info("Buffered partial packet of "+buff.length()+" chars...");
return null;
}
//the result is the size of the substring we want
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometProto.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometProto.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometProto.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -98,7 +98,6 @@
}
public void shutdown() {
- Log.info("Shutting down Comet Proto, flushing...");
if (writer != null) {
try {
writer.flush();
@@ -110,7 +109,6 @@
//client side
if (needsChunking) {
try {
- Log.info("Closing client-side connection to server since we are shutting down. ("+(writer==null)+")");
if (writer!=null) {
writer.close();
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-12-13 01:29:24 UTC (rev 628)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-12-13 01:29:36 UTC (rev 629)
@@ -47,7 +47,7 @@
}
static SimpleLogger simple = new SimpleLogger();
- static boolean haveLog4J = false;
+ public static boolean haveLog4J = false;
static Object reallyALogger=null;
static Object reallyTheSpaceLogger=null;
static boolean faultedInAlready=false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-13 01:29:34
|
Revision: 628
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=628&view=rev
Author: trevorolio
Date: 2007-12-12 17:29:24 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Removed old debug messages.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-12-12 17:46:59 UTC (rev 627)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-12-13 01:29:24 UTC (rev 628)
@@ -82,4 +82,8 @@
public String getOgoglioUsername() {
return ogoglioUsername;
}
+
+ public String getOgoglioPassword(){
+ return ogoglioPassword;
+ }
}
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java 2007-12-12 17:46:59 UTC (rev 627)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java 2007-12-13 01:29:24 UTC (rev 628)
@@ -50,14 +50,12 @@
private SessionFactory getOrCreateHibernateSessionFactory(ServletConfig config, Context context) {
SessionFactory sessionFactory = (SessionFactory) config.getServletContext().getAttribute(HIBERNATE_SESSION_FACTORY_KEY);
if (sessionFactory == null) {
- Log.info(config.getServletName() + ": checking DB version");
MigrationSupport ms = getMigration();
if (!ms.verifyVersion(config, context)) {
throw new IllegalStateException("Cannot find a DB configuration for hibernate!");
}
sessionFactory = ms.getCurrentConfiguration().configure().buildSessionFactory();
config.getServletContext().setAttribute(HIBERNATE_SESSION_FACTORY_KEY, sessionFactory);
- //Log.info(config.getServletName() + ": DB version OK");
}
return sessionFactory;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-12-12 17:47:06
|
Revision: 627
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=627&view=rev
Author: iansmith
Date: 2007-12-12 09:46:59 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Added some debugging logs to various parts of the comet chain so we can see what happens as tours get started.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/proto/CometClient.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -62,11 +62,15 @@
}
private static void sendHTTPStartupInfo(Writer wr, String host, String path) throws IOException {
- sendLine("POST "+path+" HTTP/1.1", wr);
+ Log.debug("About to send POST to "+path+" on "+host);
+ /*sendLine("POST "+path+" HTTP/1.1", wr);
+ HACK FOR DEALING WITH MOD_PROXY IN APACHE 2.2*/
+ sendLine("GET "+path+" HTTP/1.1", wr);
sendLine("Host: "+host, wr);
sendLine("Transfer-encoding: chunked",wr);
sendLine("",wr);
wr.flush();
+ Log.debug("GET/POST Sent!");
}
private static String getHTTPResponse(InputStream is) throws IOException {
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometChannelManager.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -100,7 +100,7 @@
//the buffer is critical here
StringBuffer buff=(StringBuffer)sessionToBuffer.get(event);
buff.append(tmp);
-
+ Log.debug("Added some text to the buffer in ChanMgr:"+buff.toString());
String msg = CometClient.pullOutNextMessage(buff);
if (msg!=null) {
messageDone((TCPChannel) sessionToChannel.get(event), msg, event);
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/message/server/CometServlet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -111,7 +111,7 @@
CometChannelManager mgr = (CometChannelManager) iterator.next();
mgr.connectionDropped(event);
}
- //Log.info("Destroyed comet info for path "+path+":"+event.getHttpServletRequest().getSession(true).getId());
+ Log.info("Destroyed comet info for path "+path+":"+event.getHttpServletRequest().getSession(true).getId());
} else {
Log.warn("Close comet on path " + path + " but nobody interested....");
}
@@ -145,7 +145,7 @@
mgr.addConnection(event, channel);
//in 6.0.14 this is an unsupported operation
//event.setTimeout(30000);
- //Log.info("Added comet connection for path "+event.getHttpServletRequest().getPathInfo()+":"+event.getHttpServletRequest().getSession(true).getId());
+ Log.info("Added comet connection for path "+event.getHttpServletRequest().getPathInfo()+":"+event.getHttpServletRequest().getSession(true).getId());
}
private boolean drainDataBuffer(CometEvent event, HttpServletRequest request) throws IOException {
@@ -167,7 +167,7 @@
} while (is.available() > 0);
return true;
} catch (IOException exception) {
- //Log.info("Client appears to have closed the comet connection:" + event.getHttpServletRequest().getSession(true).getId()+". Closing it b/c:"+exception.getMessage()+" of type "+exception.getClass().getName());
+ Log.info("Client appears to have closed the comet connection:" + event.getHttpServletRequest().getSession(true).getId()+". Closing it b/c:"+exception.getMessage()+" of type "+exception.getClass().getName());
closeComet(event);
return false;
}
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-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -134,13 +134,15 @@
public void destroy() {
try {
super.destroy();
- sim.cleanup();
- SimRecord rec = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
- if (rec == null) {
- Log.warn("Destroy: Can't find URI in database during shutdown of sim! URI=" + simURI);
- } else {
- Log.info("Destroy: Removing " + simURI + " from database list of sims.");
- SimPersistTasks.delete(rec, getSessionFactory());
+ if (servletNeeded) {
+ sim.cleanup();
+ SimRecord rec = SimPersistTasks.findSimsBySimURI(simURI, getSessionFactory());
+ if (rec == null) {
+ Log.warn("Destroy: Can't find URI in database during shutdown of sim! URI=" + simURI);
+ } else {
+ Log.info("Destroy: Removing " + simURI + " from database list of sims.");
+ SimPersistTasks.delete(rec, getSessionFactory());
+ }
}
} catch (PersistException e) {
Log.error("Can't clean up Sim record in database:" + e.getMessage(), e);
Modified: maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java 2007-12-10 22:57:46 UTC (rev 626)
+++ maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java 2007-12-12 17:46:59 UTC (rev 627)
@@ -126,6 +126,15 @@
transform.setEuler(new Vector3d(rx, ry, rz));
transform.setTranslation(new Vector3d(x, y, z));
spaceClient.viewpointMotionStopped(transform);
+ if (spaceClient.getSpace()==null) {
+ Log.warn("No space in space client!");
+ }
+ if (spaceClient.getUsername()==null) {
+ Log.warn("No username in space client");
+ }
+ if (spaceClient.getSpace().getUser(spaceClient.getUsername())==null) {
+ Log.warn("No user by that name in the space!");
+ }
spaceClient.getSpace().getUser(spaceClient.getUsername()).setPosition(transform);
}
renderer = new J3DRenderer(spaceClient, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-10 22:57:41
|
Revision: 626
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=626&view=rev
Author: trevorolio
Date: 2007-12-10 14:57:46 -0800 (Mon, 10 Dec 2007)
Log Message:
-----------
Remove overly verbose debug log.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java
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-12-10 22:50:59 UTC (rev 625)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java 2007-12-10 22:57:46 UTC (rev 626)
@@ -457,7 +457,6 @@
proxyURI += pathElements[i] + "/";
}
proxyURI += "?" + request.getQueryString();
- Log.debug("DoProxy SpaceServlet: proxying request for thing:"+proxyURI+" with "+method);
proxy(new URI(proxyURI), method, request, response);
} catch (PersistException e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-10 22:50:56
|
Revision: 625
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=625&view=rev
Author: trevorolio
Date: 2007-12-10 14:50:59 -0800 (Mon, 10 Dec 2007)
Log Message:
-----------
Fixed a couple of bugs in CometProto so it no longer throws NullPointerExceptions in routine failure cases seen in tests. Added mutable background colors to spaces.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpaceRecord.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/xml/server/DocumentFactory.java
maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java
Added Paths:
-----------
maven/trunk/ogoglio-server/src/main/resources/populate/space-3
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -74,6 +74,20 @@
dirty = true;
record.setDisplaySea(spaceDocument.getDisplaySea());
}
+
+ float[] bgColor = spaceDocument.getBackgroundColor();
+ if(record.getBgRed() != bgColor[0]){
+ dirty = true;
+ record.setBgRed(bgColor[0]);
+ }
+ if(record.getBgGreen() != bgColor[1]){
+ dirty = true;
+ record.setBgGreen(bgColor[1]);
+ }
+ if(record.getBgBlue() != bgColor[2]){
+ dirty = true;
+ record.setBgBlue(bgColor[2]);
+ }
if (Math.abs(spaceDocument.getSeaLevel() - record.getSeaLevel()) > 0.0001) {
dirty = true;
@@ -264,40 +278,7 @@
task.setSessionFactory(sessionFactory);
return (SimRecord[]) task.execute();
}
- public static SimRecord findOrAssignSim_OLD_VERSION(final SpaceRecord spaceRecord, SessionFactory sessionFactory) throws PersistException {
- HibernateTask task = new HibernateTask() {
- public Object run(Session hibernateSession) {
- SimRecord simRecord = null;
- if (spaceRecord.getSimID() != -1) {
- Query simQuery = hibernateSession.getNamedQuery(SimPersistTasks.SIM_BY_ID);
- simQuery.setLong("simID", spaceRecord.getSimID());
- simRecord = (SimRecord) simQuery.uniqueResult();
- if (simRecord == null || simRecord.isActive() == false) {
- spaceRecord.setSimID(-1);
- updateRecordAndUpdateModifiedTime(spaceRecord, hibernateSession, true);
- simRecord = null;
- } else {
- return simRecord;
- }
- }
-
- Query simsQuery = hibernateSession.getNamedQuery(SimPersistTasks.SIMS_BY_ACTIVE);
- simsQuery.setBoolean("active", true);
- SimRecord[] sims = (SimRecord[]) simsQuery.list().toArray(new SimRecord[0]);
- if (sims.length == 0) { // no active sims!!!
- return null;
- }
- //TODO pick a sim based on load, not at random
- simRecord = (SimRecord) sims[Math.abs(RANDOM.nextInt() % sims.length)];
- spaceRecord.setSimID(simRecord.getSimID());
- updateRecordAndUpdateModifiedTime(spaceRecord, hibernateSession, true);
- return simRecord;
- }
- };
- task.setSessionFactory(sessionFactory);
- return (SimRecord) task.execute();
- }
-
+
public static SpaceRecord createSpace(final String displayName, final String ownerUsername, SessionFactory sessionFactory) throws PersistException {
HibernateTask task = new HibernateTask() {
public Object run(Session hibernateSession) {
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpaceRecord.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpaceRecord.java 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpaceRecord.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -15,6 +15,8 @@
import java.util.Date;
+import com.ogoglio.util.UIConstants;
+import com.ogoglio.xml.SpaceDocument;
import com.ogoglio.xml.TemplateSupportFileDocument;
public class SpaceRecord {
@@ -30,13 +32,19 @@
private int maxGuests = 0;
private boolean displaySea = false;
-
+
private double seaLevel = 0;
-
+
private long simID = -1;
- private long lastModifiedTime=0L;
-
+ private long lastModifiedTime = 0L;
+
+ private float bgRed = UIConstants.LIGHT_BLUE.x;
+
+ private float bgGreen = UIConstants.LIGHT_BLUE.y;
+
+ private float bgBlue = UIConstants.LIGHT_BLUE.z;
+
public SpaceRecord() {
}
@@ -73,7 +81,7 @@
public void setSeaLevel(double seaLevel) {
this.seaLevel = seaLevel;
}
-
+
public double getSeaLevel() {
return seaLevel;
}
@@ -101,11 +109,11 @@
public long getSimID() {
return simID;
}
-
+
public void setSimID(long simID) {
this.simID = simID;
}
-
+
public boolean equals(Object obj) {
if (obj == null || !(obj instanceof SpaceRecord)) {
return false;
@@ -130,9 +138,9 @@
}
public void setLastModifiedTime(long time) {
- this.lastModifiedTime=time;
+ this.lastModifiedTime = time;
}
-
+
public long getLastModifiedTime() {
return this.lastModifiedTime;
}
@@ -141,4 +149,41 @@
return TemplateSupportFileDocument.fmt.format(new Date(lastModifiedTime));
}
+ public void setBackgroundColor(float red, float green, float blue){
+ if (!SpaceDocument.isValidColor(red) || !SpaceDocument.isValidColor(green) || !SpaceDocument.isValidColor(blue)){
+ throw new IllegalArgumentException("Bad rgb value: " + red + "," + green + "," + blue);
+ }
+ this.bgRed = red;
+ this.bgGreen = green;
+ this.bgBlue = blue;
+ }
+
+ public float[] getBackgroundColor(){
+ return new float[]{ bgRed, bgGreen, bgBlue };
+ }
+
+ public float getBgRed() {
+ return bgRed;
+ }
+
+ public void setBgRed(float bgRed) {
+ this.bgRed = bgRed;
+ }
+
+ public float getBgGreen() {
+ return bgGreen;
+ }
+
+ public void setBgGreen(float bgGreen) {
+ this.bgGreen = bgGreen;
+ }
+
+ public float getBgBlue() {
+ return bgBlue;
+ }
+
+ public void setBgBlue(float bgBlue) {
+ this.bgBlue = bgBlue;
+ }
+
}
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -290,7 +290,6 @@
}
public SpaceSimulator getOrCreateSpaceSimulator(SpaceRecord record) {
- Log.debug("Sim.getOrCreateSpaceSim:" + record.getDisplayName() + "," + record.getSpaceID());
synchronized (spaceSimulators) {
SpaceSimulator simulator = (SpaceSimulator) spaceSimulators.getForward(new Long(record.getSpaceID()));
if (simulator != null) {
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/SpaceSimulator.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -24,6 +24,7 @@
import java.util.zip.ZipInputStream;
import javax.media.j3d.Transform3D;
+import javax.vecmath.Color3f;
import javax.vecmath.Point3d;
import javax.vecmath.Vector3d;
@@ -92,7 +93,9 @@
userCounts = new UserCounts();
- space = new Space(new SimulatorSpaceContext(), spaceDocument.getSpaceID(), spaceDocument.getDisplayName(), spaceDocument.getOwnerUsername(), spaceDocument.getDisplaySea(), spaceDocument.getSeaLevel());
+ float[] bgColor = spaceDocument.getBackgroundColor();
+ Color3f backgroundColor = new Color3f(bgColor[0], bgColor[1], bgColor[2]);
+ space = new Space(new SimulatorSpaceContext(), spaceDocument.getSpaceID(), spaceDocument.getDisplayName(), spaceDocument.getOwnerUsername(), spaceDocument.getDisplaySea(), spaceDocument.getSeaLevel(), backgroundColor);
renderer = new J3DRenderer(space, null, new InSimInputListener(), templateDataProvider, new InSimBodyDataProvider(), true);
renderer.startRenderer();
@@ -924,7 +927,7 @@
}
public SpaceDocument toSpaceDocument() {
- SpaceDocument spaceDoc = new SpaceDocument(space.getSpaceID(), space.getDisplayName(), space.getOwnerUsername(), false, 0, space.shouldDisplaySea(), space.getSeaLevel(), -1, null);
+ SpaceDocument spaceDoc = new SpaceDocument(space.getSpaceID(), space.getDisplayName(), space.getOwnerUsername(), false, 0, space.shouldDisplaySea(), space.getSeaLevel(), -1, null, new float[] {space.getBackgroundColor().x, space.getBackgroundColor().y, space.getBackgroundColor().z });
ThingDocument[] thingDocs = getThingDocuments();
for (int i = 0; i < thingDocs.length; i++) {
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-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -219,11 +219,11 @@
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
-
SpaceDocument spaceDoc = DocumentFactory.documentFromRecord(spaceRecord);
if ("true".equals(request.getParameter(SpaceServlet.INCLUDE_CHILDREN_PARAM))) {
+ SpaceSimulator simulator = sim.getOrCreateSpaceSimulator(spaceRecord);
+
HashMap templateDocs = new HashMap();
DoorDocument[] doorDocs = simulator.getDoorDocuments();
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/xml/server/DocumentFactory.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/xml/server/DocumentFactory.java 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/xml/server/DocumentFactory.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -34,8 +34,7 @@
}
public static SpaceDocument documentFromRecord(SpaceRecord requestedRecord) {
- return new SpaceDocument(requestedRecord.getSpaceID(), requestedRecord.getDisplayName(), requestedRecord.getOwnerUsername(), requestedRecord.isPublished(), requestedRecord.getMaxGuests(), requestedRecord.getDisplaySea(), requestedRecord.getSeaLevel(), requestedRecord.getSimID(), requestedRecord.getLastModifiedTimeGMT());
-
+ return new SpaceDocument(requestedRecord.getSpaceID(), requestedRecord.getDisplayName(), requestedRecord.getOwnerUsername(), requestedRecord.isPublished(), requestedRecord.getMaxGuests(), requestedRecord.getDisplaySea(), requestedRecord.getSeaLevel(), requestedRecord.getSimID(), requestedRecord.getLastModifiedTimeGMT(), requestedRecord.getBackgroundColor());
}
public static SpaceMemberDocument documentFromRecord(SpaceMemberRecord record) {
Modified: maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml 2007-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml 2007-12-10 22:50:59 UTC (rev 625)
@@ -53,6 +53,9 @@
<property name="seaLevel" />
<property name="simID" />
<property name="lastModifiedTime" />
+ <property name="bgRed" />
+ <property name="bgGreen" />
+ <property name="bgBlue" />
</class>
<class name="com.ogoglio.persist.SpaceMemberRecord"
Added: maven/trunk/ogoglio-server/src/main/resources/populate/space-3
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/populate/space-3 (rev 0)
+++ maven/trunk/ogoglio-server/src/main/resources/populate/space-3 2007-12-10 22:50:59 UTC (rev 625)
@@ -0,0 +1 @@
+<space displaysea="false" maxguests="0" displayname="Solar System" simid="1" published="true" spaceid="2" bgred="0.000000" bgblue="0.000000" bggreen="0.000000" sealevel="0.000000" ownerusername="admin"><thing templateid="87" rz="0.000000" ry="0.000000" rx="0.000000" rw="1.000000" scalez="0.010000" displayname="Solar System" scaley="0.010000" templateowner="admin" scalex="0.010000" possessionid="1" thingid="1" z="0.000000" y="-4.000000" x="0.000000" ownerusername="admin"/></space>
\ No newline at end of file
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-12-10 22:50:47 UTC (rev 624)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/sim/script/test/ScriptTest.java 2007-12-10 22:50:59 UTC (rev 625)
@@ -29,7 +29,7 @@
TestSpaceListener listener = new TestSpaceListener();
SpaceSimulator spaceSimulator = null;
try {
- SpaceDocument spaceDocument = new SpaceDocument(1, "Space", "trevor", true, 0, false, 0, 1, null);
+ SpaceDocument spaceDocument = new SpaceDocument(1, "Space", "trevor", true, 0, false, 0, 1, null, UIConstants.SKY_COLOR_ARRAY);
spaceSimulator = new SpaceSimulator(spaceDocument, listener);
spaceSimulator.startSim();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-12-10 22:50:47
|
Revision: 622
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=622&view=rev
Author: trevorolio
Date: 2007-12-10 14:50:26 -0800 (Mon, 10 Dec 2007)
Log Message:
-----------
Fixed a couple of bugs in CometProto so it no longer throws NullPointerExceptions in routine failure cases seen in tests. Added mutable background colors to spaces.
Modified Paths:
--------------
maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
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 2007-12-10 22:50:15 UTC (rev 621)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-12-10 22:50:26 UTC (rev 622)
@@ -282,7 +282,7 @@
private class SpacelessUser extends User {
public SpacelessUser(String username, BodyConfigurationDocument bodyConfigDoc) {
- super(new Space(new SpacelessContext(), 1, "Space", "nobody", false, 0), username, new Transform3D(), new BodyConfiguration(bodyConfigDoc), null, null);
+ super(new Space(new SpacelessContext(), 1, "Space", "nobody", false, 0, UIConstants.LIGHT_BLUE), username, new Transform3D(), new BodyConfiguration(bodyConfigDoc), null, null);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
