Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [358] maven/trunk
|
From: <ian...@us...> - 2007-09-04 19:00:18
|
Revision: 358
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=358&view=rev
Author: iansmith
Date: 2007-09-04 12:00:02 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
First cut at a logging centralization.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/DBVersionPersistTasks.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/test/DBZapTest.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/persist/HibernateTask.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIUtil.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/NetworkChannelServer.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/TCPMessageReader.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/NetworkUtils.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDoorRenderable.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DPageRenderable.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderableLoader.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/RenderableMotionInterpolator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skeleton.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/smap/SkinMapParser.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BootstrapInfo.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
maven/trunk/ogoglio-integration-test/src/test/resources/log4j.properties
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/FileStore.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/migrate/AccountsForTesting.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/AccountPersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/TemplatePersistTasks.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/script/ScriptHTTPRequest.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptSpace.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/SpaceScriptEngine.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/site/SimServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/OgoglioServletBase.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/SpaceServlet.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/TemplateResource.java
maven/trunk/ogoglio-server/src/main/resources/log4j/log4j.properties
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/j3d/bvh/test/BvhTest.java
maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
Removed Paths:
-------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/OgoglioProperties.java
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/DBVersionPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/DBVersionPersistTasks.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/DBVersionPersistTasks.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -6,6 +6,7 @@
import com.ogoglio.appdev.persist.HibernateTask;
import com.ogoglio.appdev.persist.PersistException;
+import com.ogoglio.util.Log;
public class DBVersionPersistTasks {
public final static String FIND_VERSION = "com.ogoglio.appdev.migrate.dbversions";
@@ -28,7 +29,7 @@
int size = query.list().size();
DBVersionRecord rec;
if (expectedSize != size) {
- System.err.println("Whoa! Size of returned result for db version record was (" + size + ") but should have been " + expectedSize + "!");
+ Log.error("Whoa! Size of returned result for db version record was (" + size + ") but should have been " + expectedSize + "!");
return Boolean.FALSE;
}
if (size == 0) {
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -4,11 +4,11 @@
import javax.naming.NamingException;
import javax.servlet.ServletConfig;
-import org.apache.commons.logging.LogFactory;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import com.ogoglio.appdev.persist.PersistException;
+import com.ogoglio.util.Log;
import com.ogoglio.util.PropStorage;
import com.ogoglio.viewer.render.UIConstants;
@@ -21,7 +21,6 @@
public static final boolean DDL_MODE_UPDATE=true;
public static final boolean DDL_MODE_CREATE=false;
- static org.apache.commons.logging.Log log = LogFactory.getLog("com.ogoglio.migrate");
public MigrationSupport() {
}
@@ -35,7 +34,7 @@
SessionFactory sessionFactory = getCurrentConfiguration().buildSessionFactory();
int version = DBVersionPersistTasks.findVersion(sessionFactory);
if (version != getVersionNumber()) {
- log.error("DB Version Mismatch! Expected (" + getVersionNumber() + ") but got " + version + "!");
+ Log.error("DB Version Mismatch! Expected (" + getVersionNumber() + ") but got " + version + "!");
sessionFactory.close();
return tryUpgrade(servletConf, ctx, version, getVersionNumber(),
DDL_MODE_UPDATE, true, null);
@@ -44,10 +43,10 @@
return true; // we are at the expected version
} catch (PersistException e) {
if (e.innerThrowable == null) {
- log.error("Serious problem with hibernate:" + e.getMessage());
+ Log.error("Serious problem with hibernate:" + e.getMessage());
return false;
}
- log.info("Unable to figure out DB version number. Likely this is a fresh database....(" + e.innerThrowable.getClass().getName() + ")");
+ Log.info("Unable to figure out DB version number. Likely this is a fresh database....(" + e.innerThrowable.getClass().getName() + ")");
return initVersionAndUpgrade(servletConf, ctx);
}
}
@@ -63,7 +62,7 @@
factory.close();
return true;
} catch (Throwable t) {
- log.error("Error trying initialized DB:" + t.getMessage());
+ Log.error("Error trying initialized DB:" + t.getMessage());
return false;
}
}
@@ -97,7 +96,7 @@
try {
return DBVersionPersistTasks.updateVersion(targetVersion, expectedSize, sessionFactory);
} catch (PersistException e) {
- log.error("Problem updating the version of the database to version " + targetVersion + ":" + e.getMessage());
+ Log.error("Problem updating the version of the database to version " + targetVersion + ":" + e.getMessage());
return false;
}
}
@@ -105,7 +104,7 @@
public boolean tryUpgrade(ServletConfig servletConfig, Context ctx, int db_is,
int db_wants_to_be, boolean isUpdate, boolean useJNDI, PropStorage propStore) {
if (getMigrationList().length != getVersionNumber()) {
- log.error("Internal error! Migration list length should be " + getVersionNumber() + " but is " + getMigrationList().length + "!");
+ Log.error("Internal error! Migration list length should be " + getVersionNumber() + " but is " + getMigrationList().length + "!");
return false;
}
boolean canMigrate = false;
@@ -122,12 +121,12 @@
canMigrate = true;
}
} catch (NamingException e) {
- log.error("Naming exception trying to access " + MIGRATION_KEY + " from naming context!");
+ Log.error("Naming exception trying to access " + MIGRATION_KEY + " from naming context!");
canMigrate=false;
}
if (!canMigrate) {
- log.error("Cannot migrate data! Property ogoglio.okToMigrateDB is false or non-existent!");
+ Log.error("Cannot migrate data! Property ogoglio.okToMigrateDB is false or non-existent!");
return false;
}
String hbm_auto_flag="update";
@@ -138,7 +137,7 @@
for (int i = db_is; i < db_wants_to_be; ++i) {
Migration current = getMigrationList()[i];
- log.info("DB: Attempting migration from " + i + " to " + (i + 1) + " with auto HBM:"+hbm_auto_flag);
+ Log.info("DB: Attempting migration from " + i + " to " + (i + 1) + " with auto HBM:"+hbm_auto_flag);
//try to get hibernate to do the work
Configuration config = createConfigurationForHibernate(i + 1, hbm_auto_flag, useJNDI, propStore);
@@ -157,22 +156,22 @@
return false;
}
} catch (PersistException e) {
- log.error("Whoa! Patch failed at revision!"+(i+1)+" on class "+current.getClass().getName());
- log.error("Whoa! Persistance layer problem was:"+e.getMessage());
+ Log.error("Whoa! Patch failed at revision!"+(i+1)+" on class "+current.getClass().getName());
+ Log.error("Whoa! Persistance layer problem was:"+e.getMessage());
}
try {
if (!isUpdate) {
//we need to go ahead and create the data
if (!current.populate(factory, i, i+1)) {
- log.error("Whoa! Populate failed at revision!"+(i+1)+" on class "+current.getClass().getName());
+ Log.error("Whoa! Populate failed at revision!"+(i+1)+" on class "+current.getClass().getName());
factory.close();
return false;
}
}
} catch (PersistException e) {
- log.error("Whoa! Populate failed at revision!"+(i+1)+" on class "+current.getClass().getName());
- log.error("Whoa! Persistance layer problem was:"+e.getMessage());
+ Log.error("Whoa! Populate failed at revision!"+(i+1)+" on class "+current.getClass().getName());
+ Log.error("Whoa! Persistance layer problem was:"+e.getMessage());
}
factory.close();
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/test/DBZapTest.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/test/DBZapTest.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/test/DBZapTest.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -5,6 +5,7 @@
import org.hibernate.SessionFactory;
import com.ogoglio.appdev.migrate.MigrationSupport;
+import com.ogoglio.util.Log;
import com.ogoglio.util.PropStorage;
public abstract class DBZapTest extends TestCase {
@@ -30,9 +31,7 @@
//if we are here, db stuff worked, but we still need to avoid all the jndi stuff
sessionFactory = support.createConfigurationForHibernate(getMigrationSupport().getVersionNumber(), null, false, ps).buildSessionFactory();
} catch (Exception e) {
- System.out.println("-------");
- e.printStackTrace(System.out);
- System.out.println("---------");
+ Log.error("Trying to setUp DBZapTest",e);
fail("Could not setup:" + e.getMessage());
}
}
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/persist/HibernateTask.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/persist/HibernateTask.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/persist/HibernateTask.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -19,7 +19,9 @@
import org.hibernate.StaleObjectStateException;
import org.hibernate.Transaction;
+import com.ogoglio.util.Log;
+
public abstract class HibernateTask {
private SessionFactory sessionFactory = null;
@@ -41,8 +43,8 @@
transaction.commit();
return result;
} catch (StaleObjectStateException staleEx) {
- System.err.println("This interceptor does not implement optimistic concurrency control!");
- System.err.println("Your application will not work until you add compensation actions!");
+ Log.error("This interceptor does not implement optimistic concurrency control!",staleEx);
+ Log.error("Your application will not work until you add compensation actions!",staleEx);
throw new PersistException("This DB is not supported.");
} catch (PersistException ex) {
try {
@@ -53,9 +55,7 @@
}
throw ex;
} catch (Throwable ex) { //catches things that are created by Hibernate that are not PersistException
- System.err.println("TRUE TYPE OF CAUGHT EXCEPTION:"+ex.getClass().getName());
- System.err.println("ORIG STACK TRACE");
- ex.printStackTrace();
+ Log.error("TRUE TYPE OF CAUGHT EXCEPTION:"+ex.getClass().getName(),ex);
try {
if (transaction.isActive()) {
transaction.rollback();
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -41,6 +41,7 @@
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import com.ogoglio.client.DecoratedInputStream;
+import com.ogoglio.util.Log;
import com.ogoglio.util.StreamUtils;
import com.ogoglio.util.WebConstants;
import com.ogoglio.xml.SpaceDocument;
@@ -88,7 +89,7 @@
baseResource = createBaseResource(config);
if (baseResource==null) {
- System.out.println("Warning: Class "+getClass().getName()+" should be sure it eventually sets the value of the base resource on it's servlet.");
+ Log.warn("Class "+getClass().getName()+" should be sure it eventually sets the value of the base resource on it's servlet.");
} else {
if (!(baseResource.getPathElement() instanceof String)) {
throw new IllegalStateException("The base resource must have a String path element: " + baseResource.getPathElement());
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/MigratedResourceServlet.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -8,6 +8,7 @@
import org.hibernate.SessionFactory;
import com.ogoglio.appdev.migrate.MigrationSupport;
+import com.ogoglio.util.Log;
public abstract class MigratedResourceServlet extends AbstractResourceServlet {
@@ -45,7 +46,7 @@
private SessionFactory getOrCreateHibernateSessionFactory(ServletConfig config, Context context) {
SessionFactory sessionFactory = (SessionFactory) config.getServletContext().getAttribute(HIBERNATE_SESSION_FACTORY_KEY);
if (sessionFactory == null) {
- System.out.println(config.getServletName()+" checking DB Version...");
+ 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!");
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-04 19:00:02 UTC (rev 358)
@@ -46,6 +46,13 @@
<version>2.0.0-rc-6</version>
<scope>compile</scope>
</dependency>
+
+ <!-- for logging layer -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
</dependencies>
</project>
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -11,6 +11,7 @@
import com.ogoglio.client.model.SplinePath;
import com.ogoglio.client.model.Thing;
import com.ogoglio.client.model.User;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.j3d.J3DSplinePath;
public class MultiuserTests {
@@ -82,7 +83,7 @@
}
public void disconnected() {
- System.err.println("UserRobot was disconnected");
+ Log.error("UserRobot was disconnected");
}
public void receivedChatMessage(String username, String message) {
@@ -168,7 +169,7 @@
public static void main(String[] args) {
if (args.length != 3) {
- System.err.println("usage: ... spaceURI serviceURI numRobots");
+ Log.error("usage: ... spaceURI serviceURI numRobots");
return;
}
MultiuserTests tests = null;
@@ -185,7 +186,7 @@
for (int i = 0; i < numRobots; i++) {
startPosition.setTranslation(new Vector3d(0, 0, -10));
tests.addRobot(startPosition, true);
- System.out.println("Added robot " + (i + 1) + " of " + numRobots);
+ Log.test("Added robot " + (i + 1) + " of " + numRobots);
Thread.sleep(1000);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -37,6 +37,7 @@
import com.ogoglio.message.PayloadFactory;
import com.ogoglio.message.TCPChannel;
import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.render.UIConstants;
import com.ogoglio.xml.AccountDocument;
import com.ogoglio.xml.BodyDocument;
@@ -109,7 +110,7 @@
}
if (messenger.authStatus != messenger.SUCCESS_STATUS) {
- System.err.println("No auth, message " + messenger.errorMessage);
+ Log.error("No auth, message " + messenger.errorMessage);
messenger.cleanup();
if(messenger.errorMessage == null) {
@@ -180,7 +181,7 @@
}
public void mouseClickedUser(User user, Point3d intersection) {
- System.err.println("SpaceClient ignoring user click");
+ Log.warn("SpaceClient ignoring user click");
}
public void mouseClickedDoor(Door door, String name, Point3d intersection) {
@@ -231,7 +232,7 @@
public void mouseClickedPage(Page page, Point3d intersection) {
- System.out.println("User clicked the page. Ignoring");
+ Log.info("User clicked the page. Ignoring");
}
public void viewpointMotionChanged(SplinePath newPath) {
@@ -293,7 +294,7 @@
} else if (SpaceEvent.REMOVE_USER_EVENT.equals(event.getName())) {
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
- System.err.println("Tried to remove unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ Log.error("Tried to remove unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
space.removeUser(user);
@@ -314,8 +315,7 @@
template = new Template(templateDoc);
space.addTemplate(template);
} catch (IOException e) {
- e.printStackTrace();
- System.err.println("Could not add the template");
+ Log.error("Could not add the template",e);
}
}
Thing thing = new Thing(space, event.getLongProperty(SpaceEvent.THING_ID).longValue(), template, event.getStringProperty(SpaceEvent.DISPLAY_NAME), event.getStringProperty(SpaceEvent.OWNER_USERNAME), event.getLongProperty(SpaceEvent.POSSESSION_ID).longValue(), event.getTransform());
@@ -334,7 +334,7 @@
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Tried to add a page for a non-existent thing: " + thingID);
+ Log.error("Tried to add a page for a non-existent thing: " + thingID);
return;
}
Page page = new Page(thing, event.getLongProperty(SpaceEvent.PAGE_ID).longValue(), event.getStringProperty(SpaceEvent.CONTENT_TYPE), event.getDoubleProperty(SpaceEvent.WIDTH).doubleValue(), event.getDoubleProperty(SpaceEvent.HEIGHT).doubleValue(), event.getTransform());
@@ -344,13 +344,13 @@
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Tried to remove a page for a non-existent thing: " + thingID);
+ Log.error("Tried to remove a page for a non-existent thing: " + thingID);
return;
}
long pageID = event.getLongProperty(SpaceEvent.PAGE_ID).longValue();
Page page = thing.getPage(pageID);
if (page == null) {
- System.err.println("Tried to remove an unknown page: " + thingID + ", " + pageID);
+ Log.error("Tried to remove an unknown page: " + thingID + ", " + pageID);
return;
}
thing.removePage(page);
@@ -359,13 +359,13 @@
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Tried to update a page for a non-existent thing: " + thingID);
+ Log.error("Tried to update a page for a non-existent thing: " + thingID);
return;
}
long pageID = event.getLongProperty(SpaceEvent.PAGE_ID).longValue();
Page page = thing.getPage(pageID);
if (page == null) {
- System.err.println("Tried to update an unknown page: " + thingID + ", " + pageID);
+ Log.error("Tried to update an unknown page: " + thingID + ", " + pageID);
return;
}
if (!page.getPosition().epsilonEquals(event.getTransform(), 0.001)) {
@@ -378,13 +378,13 @@
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Tried to update content on a page for a non-existent thing: " + thingID);
+ Log.error("Tried to update content on a page for a non-existent thing: " + thingID);
return;
}
long pageID = event.getLongProperty(SpaceEvent.PAGE_ID).longValue();
Page page = thing.getPage(pageID);
if (page == null) {
- System.err.println("Tried to update content on an unknown page: " + thingID + ", " + pageID);
+ Log.error("Tried to update content on an unknown page: " + thingID + ", " + pageID);
return;
}
if (!page.getContentType().equals(event.getStringProperty(SpaceEvent.CONTENT_TYPE))) {
@@ -403,14 +403,14 @@
template = new Template(templateDoc);
space.addTemplate(template);
} catch (IOException e) {
- System.err.println("Could not add the template");
+ Log.error("Could not add the template",e);
}
}
try {
Door door = new Door(space, template, event.getLongProperty(SpaceEvent.DOOR_ID).longValue(), event.getStringProperty(SpaceEvent.DISPLAY_NAME), new URI(event.getStringProperty(SpaceEvent.LINK)), event.getTransform());
space.addDoor(door);
} catch (URISyntaxException e) {
- System.err.println("Could not parse the door link: " + event.getStringProperty(SpaceEvent.LINK));
+ Log.error("Could not parse the door link: " + event.getStringProperty(SpaceEvent.LINK),e);
}
} else if (SpaceEvent.UPDATE_DOOR_EVENT.equals(event.getName())) {
@@ -438,7 +438,7 @@
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
- System.err.println("Got a motion event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ Log.error("Got a motion event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
SplinePath path = event.getSplinePath();
@@ -451,7 +451,7 @@
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
- System.err.println("Got a stop event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ Log.error("Got a stop event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
user.stopMotion(event.getTransform());
@@ -476,12 +476,12 @@
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Tried to move a shape for an unknown thing: " + thingID);
+ Log.error("Tried to move a shape for an unknown thing: " + thingID);
return;
}
Shape shape = thing.getShape(event.getStringProperty(SpaceEvent.SHAPE_NAME));
if (shape == null) {
- System.err.println("Tried to move unknown shape: " + event.getStringProperty(SpaceEvent.SHAPE_NAME));
+ Log.error("Tried to move unknown shape: " + event.getStringProperty(SpaceEvent.SHAPE_NAME));
return;
}
shape.startMotion(event.getSplinePath());
@@ -494,7 +494,7 @@
}
Shape shape = thing.getShape(event.getStringProperty(SpaceEvent.SHAPE_NAME));
if (shape == null) {
- System.err.println("Tried to stop unknown shape: " + event.getStringProperty(SpaceEvent.SHAPE_NAME));
+ Log.error("Tried to stop unknown shape: " + event.getStringProperty(SpaceEvent.SHAPE_NAME));
return;
}
shape.stopMotion(event.getTransform());
@@ -502,7 +502,7 @@
} else if (SpaceEvent.TEXT_SAY_EVENT.equals(event.getName())) {
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
- System.err.println("Got a text say event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ Log.error("Got a text say event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
@@ -511,7 +511,7 @@
} else if (SpaceEvent.PLAY_ANIMATION_EVENT.equals(event.getName())) {
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
- System.err.println("Got an animation event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ Log.error("Got an animation event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
user.playAnimation(event.getLongProperty(SpaceEvent.ANIMATION_ID).longValue());
@@ -554,23 +554,23 @@
Thing thing = space.getThing(thingID);
if (thing == null) {
- System.err.println("Received browser message from unknown thing: " + thingID);
+ Log.error("Received browser message from unknown thing: " + thingID);
return;
}
String browserMessage = event.getStringProperty(SpaceEvent.MESSAGE_TO_BROWSER);
if (browserMessage == null || browserMessage.trim().length() == 0) {
- System.err.println("Received empty browser message from thing: " + thingID);
+ Log.error("Received empty browser message from thing: " + thingID);
return;
}
listener.receivedBrowserMessage(thingID, browserMessage);
} else {
- System.out.println("Client received (and ignored) event: " + event);
+ Log.warn("Client received (and ignored) event: " + event);
}
} else if (message.getPayload() instanceof PayloadFactory.HeartbeatPayload) {
//ignore it
} else {
- System.err.println("Client received (and ignored) message: " + message);
+ Log.error("Client received (and ignored) message: " + message);
}
}
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceDuplicator.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -6,6 +6,7 @@
import java.util.Map;
import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
import com.ogoglio.xml.DoorDocument;
import com.ogoglio.xml.PositionedDocument;
import com.ogoglio.xml.PossessionDocument;
@@ -139,7 +140,7 @@
SpaceDuplicator duplicator = new SpaceDuplicator(sourceSpaceID, descriptor, auth, wire);
duplicator.duplicateSpace(destSpaceID, true);
} catch (URISyntaxException e) {
- System.err.println("Error parsing URI: " + e);
+ Log.error("Error parsing URI",e);
printUsage();
} catch (IOException e) {
e.printStackTrace();
@@ -147,6 +148,6 @@
}
private static void printUsage() {
- System.err.println("...SpaceDuplicator <SERVICE_URI> <SOURCE_SPACE> <DESTINATION_SPACE_URI> <AUTH_COOKIE>");
+ Log.error("...SpaceDuplicator <SERVICE_URI> <SOURCE_SPACE> <DESTINATION_SPACE_URI> <AUTH_COOKIE>");
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -13,6 +13,7 @@
import nanoxml.XMLElement;
+import com.ogoglio.util.Log;
import com.ogoglio.util.StreamUtils;
import com.ogoglio.util.WebConstants;
@@ -152,10 +153,10 @@
}
if (!printedCacheComplaint) {
printedCacheComplaint = true;
- System.err.println("NOTE: Not using Sun's download cache, which they broke in Java 1.6u1.");
+ Log.warn("Not using Sun's download cache, which they broke in Java 1.6u1.");
}
} catch (URISyntaxException e) {
- System.err.println("Tried to reset the URI to avoid bad cache in 1.6:" + e);
+ Log.error("Tried to reset the URI to avoid bad cache in 1.6",e);
}
}
@@ -223,10 +224,10 @@
}
if (!printedCacheComplaint) {
printedCacheComplaint = true;
- System.err.println("NOTE: Not using Sun's download cache, which they broke in Java 1.6u1.");
+ Log.warn("Not using Sun's download cache, which they broke in Java 1.6u1.");
}
} catch (URISyntaxException e) {
- System.err.println("Tried to reset the URI to avoid bad cache in 1.6:" + e);
+ Log.error("Tried to reset the URI to avoid bad cache in 1.6",e);
}
}
@@ -301,7 +302,7 @@
headerValue = (String) ((List) makeLinuxHappy).get(0);
} else {
// we don't understand this type at all
- System.err.println("Unable to understand the type returned by Linux workaround in WebAPIClient:"+makeLinuxHappy.getClass().getName());
+ Log.error("Unable to understand the type returned by Linux workaround in WebAPIClient:"+makeLinuxHappy.getClass().getName());
return null;
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIUtil.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIUtil.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIUtil.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -3,6 +3,7 @@
import java.net.URI;
import java.net.URISyntaxException;
+import com.ogoglio.util.Log;
import com.ogoglio.util.WebConstants;
public class WebAPIUtil {
@@ -20,7 +21,7 @@
return null;
}
if (!setCookieHeader.startsWith(WebConstants.AUTH_COOKIE + "=")) {
- System.err.println("Unknown set cookie: " + setCookieHeader);
+ Log.error("Unknown set cookie: " + setCookieHeader);
return null;
}
return setCookieHeader.substring(setCookieHeader.indexOf("=") + 1, setCookieHeader.indexOf(";"));
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -26,6 +26,7 @@
import javax.vecmath.Vector3d;
import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
import com.ogoglio.xml.BodyDocument;
public class Space {
@@ -117,7 +118,7 @@
Arrays.sort(things, new DistanceComparator());
if (things.length > 0) {
- System.out.println("Adding " + things[0].getName());
+ Log.info("Adding " + things[0].getName());
listener.thingAdded(things[0]);
}
@@ -127,7 +128,7 @@
}
for (int i = 1; i < things.length; i++) {
- System.out.println("Adding " + things[i].getName());
+ Log.info("Adding " + things[i].getName());
listener.thingAdded(things[i]);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/NetworkChannelServer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/NetworkChannelServer.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/NetworkChannelServer.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -20,6 +20,7 @@
import java.util.Vector;
import com.ogoglio.util.BlockingQueue;
+import com.ogoglio.util.Log;
import com.ogoglio.util.NetworkUtils;
public class NetworkChannelServer implements TCPChannel.Listener {
@@ -105,7 +106,7 @@
}
}
- System.out.println("Attempted location: " + remoteLocator);
+ Log.info("Attempted location??: " + remoteLocator);
//for (int i = 0; i < channels.length; i++) {
// System.out.println("Available channels: " + channels[i].getRemoteLocator());
//}
@@ -122,7 +123,7 @@
try {
serverSocket.close();
} catch (Exception e) {
- System.out.println("Trying to close server socket of NCServer:"+e.getMessage());
+ Log.info("Trying to close server socket of NCServer",e);
// don't care
}
TCPChannel[] channels = getChannels();
@@ -156,7 +157,7 @@
}
}
if (!cleaned) {
- System.err.println("Unclean client socket listener thread exiting.");
+ Log.error("Unclean client socket listener thread exiting.");
}
}
}
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/SenderQueue.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -19,6 +19,7 @@
import java.net.Socket;
import com.ogoglio.util.BlockingQueue;
+import com.ogoglio.util.Log;
public class SenderQueue {
private SenderThread senderThread = new SenderThread();
@@ -57,7 +58,7 @@
messageQueue.close();
}
} catch (IOException e) {
- System.out.println("IOException trying cleanup SenderQueue:"+e.getMessage());
+ Log.info("IOException trying cleanup SenderQueue",e);
}
}
@@ -91,7 +92,7 @@
Message message = (Message) messageQueue.dequeue();
unsafeSendMessage(message);
} catch (Throwable e) {
- System.err.println("Could not send message: " + e);
+ Log.error("Could not send message",e);
break;
}
}
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-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPChannel.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -18,6 +18,7 @@
import java.net.InetSocketAddress;
import java.net.Socket;
+import com.ogoglio.util.Log;
import com.ogoglio.util.NetworkUtils;
import com.ogoglio.util.BlockingQueue.QueueClosedException;
import com.ogoglio.util.BlockingQueue.QueueOverflowException;
@@ -88,14 +89,14 @@
readerThread.cleanup();
}
} catch (Exception e) {
- System.out.println("TCPChannel: Trying to cleanup to readerThread:"+(e.getClass().getName())+":"+e.getMessage());
+ Log.info("TCPChannel: Trying to cleanup to readerThread:"+(e.getClass().getName()),e);
}
try {
if (senderQueue!=null) {
senderQueue.cleanup();
}
} catch (Exception e) {
- System.out.println("TCPChannel: Trying to cleanup to senderQueue:"+(e.getClass().getName())+":"+e.getMessage());
+ Log.info("TCPChannel: Trying to cleanup to senderQueue:"+(e.getClass().getName()),e);
}
listener.channelClosed(this);
}
@@ -112,10 +113,10 @@
try {
senderQueue.sendMessage(message);
} catch (QueueOverflowException e) {
- System.err.println("Queue overflow: " + remoteHostName + ":" + remoteHostPort);
+ Log.error("Queue overflow: " + remoteHostName + ":" + remoteHostPort,e);
cleanup();
} catch (QueueClosedException e) {
- System.err.println("Queue closed: " + remoteHostName + ":" + remoteHostPort);
+ Log.error("Queue closed: " + remoteHostName + ":" + remoteHostPort,e);
cleanup();
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPMessageReader.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPMessageReader.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/message/TCPMessageReader.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -19,6 +19,8 @@
import java.net.InetSocketAddress;
import java.net.Socket;
+import com.ogoglio.util.Log;
+
public class TCPMessageReader extends Thread {
//TODO make this not suck ass
@@ -79,7 +81,7 @@
socketInput.close();
}
} catch (IOException e) {
- System.out.println("IOException caught trying to clean up TCPMessageReader:"+e.getMessage());
+ Log.info("IOException caught trying to clean up TCPMessageReader",e);
}
}
@@ -126,7 +128,7 @@
try {
messageHandler.handleMessage(message, channel);
} catch (Throwable e) {
- System.err.println("Error handling message: " + e);
+ Log.error("Error handling message",e);
e.printStackTrace();
}
messageBuffer.delete(0, messageBuffer.length());
@@ -140,7 +142,7 @@
}
}
if (!cleaned) {
- System.out.println("Unclean client socket listener thread exiting.");
+ Log.warn("Unclean client socket listener thread exiting");
channel.socketClosed();
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/NetworkUtils.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/NetworkUtils.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/NetworkUtils.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -53,7 +53,7 @@
}
if (!notified) {
notified = true;
- System.out.println("Using 127.0.0.1 as local address");
+ Log.info("Using 127.0.0.1 as local address");
}
return "127.0.0.1";
}
Deleted: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/OgoglioProperties.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/OgoglioProperties.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/OgoglioProperties.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -1,74 +0,0 @@
-package com.ogoglio.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-
-public class OgoglioProperties extends Properties {
-
- public static final String PROPERTY_FILE_NAME = ".ogoglio-properties";
- private static OgoglioProperties prop=null;
-
- public static String WHICH_DB = "database_choice";
- public static String WHICH_MYSQL = "mysql";
- public static String WHICH_HSQL = "hsql";
-
- // the reason these properties are duplicated is to make it easy to switch in the configuration
- // file by changing only one line and leaving everything else in place
- public static String MYSQL_DB_DIALECT = "database_mysql_hibernate_dialect";
- public static String MYSQL_DB_DRIVER= "database_mysql_driver";
-
- public static String MYSQL_DB_SERVER_URI = "database_mysql_server_uri";
- public static String MYSQL_DB_SERVER_USER = "database_mysql_server_user";
- public static String MYSQL_DB_SERVER_PASS = "database_mysql_server_pass";
-
- public static String MYSQL_DB_TEST_URI = "database_mysql_test_uri";
- public static String MYSQL_DB_TEST_USER = "database_mysql_test_user";
- public static String MYSQL_DB_TEST_PASS = "database_mysql_test_pass";
-
- public static String HSQL_DB_DIALECT = "database_hsql_hibernate_dialect";
- public static String HSQL_DB_DRIVER= "database_hsql_driver";
-
- public static String HSQL_DB_SERVER_URI = "database_hsql_server_uri";
- public static String HSQL_DB_SERVER_USER = "database_hsql_server_user";
- public static String HSQL_DB_SERVER_PASS = "database_hsql_server_pass";
-
- public static String HSQL_DB_TEST_URI = "database_hsql_test_uri";
- public static String HSQL_DB_TEST_USER = "database_hsql_test_user";
- public static String HSQL_DB_TEST_PASS = "database_hsql_test_pass";
-
- private OgoglioProperties() {
-
- }
-
- public static void validate() {
- if (prop!=null) {
- return;
- }
- //init
- File f = new File(System.getProperty("user.home"),PROPERTY_FILE_NAME);
- prop=new OgoglioProperties();
- try {
- prop.load(new FileInputStream(f));
- } catch (FileNotFoundException e) {
- System.err.println("Can't find ogoglio properties file ("+f.getPath()+"):"+e.getMessage());
- System.exit(1);
- } catch (IOException e) {
- System.err.println("Error reading ogoglio properties file ("+f.getPath()+"):"+e.getMessage());
- System.exit(1);
- }
- }
-
- public static String getOgoglioProperty(String pname)
- {
- validate();
- String result = prop.getProperty(pname,null);
- if (result==null) {
- System.out.println("Unable to locate property "+pname+" in your "+PROPERTY_FILE_NAME+" file! Aborting!");
- System.exit(1);
- }
- return result;
- }
-}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDoorRenderable.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDoorRenderable.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDoorRenderable.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -21,6 +21,7 @@
import javax.media.j3d.TransformGroup;
import com.ogoglio.client.model.Door;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.render.DoorRenderable;
public class J3DDoorRenderable extends BranchGroup implements DoorRenderable {
@@ -53,7 +54,7 @@
public void addShapeRenderable(J3DShapeRenderable shape, int lodIndex) {
if(lodIndex != 0) {
- System.err.println("Add lod indices to door, yo");
+ Log.error("Add lod indices to door, yo");
}
shapeRenderables.put(shape.getName().toLowerCase(), shape);
transformGroup.addChild(shape);
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DPageRenderable.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DPageRenderable.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DPageRenderable.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -27,6 +27,7 @@
import javax.vecmath.TexCoord2f;
import com.ogoglio.client.model.Page;
+import com.ogoglio.util.Log;
import com.ogoglio.util.StreamUtils;
import com.ogoglio.viewer.render.PageRenderable;
import com.ogoglio.viewer.render.Renderable;
@@ -237,7 +238,7 @@
Graphics graphics = image.getGraphics();
graphics.setClip(0, 0, getPreferredSize().width, getPreferredSize().height);
if (sourceImage == null) {
- System.err.println("Source image is null");
+ Log.error("Source image is null");
graphics.setColor(Color.red);
graphics.fillRect(0, 0, getPreferredSize().width, getPreferredSize().height);
return;
@@ -281,7 +282,7 @@
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
- System.out.println("Link clicked : " + e.getURL());
+ Log.info("Link clicked : " + e.getURL());
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderableLoader.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderableLoader.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderableLoader.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -38,6 +38,7 @@
import com.ogoglio.client.model.GeometryProvider;
import com.ogoglio.client.model.Shape;
import com.ogoglio.client.model.Thing;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.j3d.obj.Obj;
import com.ogoglio.viewer.j3d.obj.ObjMtl;
import com.ogoglio.viewer.render.Renderable;
@@ -75,7 +76,7 @@
//TODO consider a more memory efficient way to load shapes
Obj.Range[] ranges = group.getRanges();
if (ranges.length == 0) {
- System.err.println("Zero range group: " + group.getName());
+ Log.error("Zero range group: " + group.getName());
return null;
}
@@ -89,7 +90,7 @@
}
if (vertices.size() == 0) {
- System.err.println("Empty group: " + group.getName());
+ Log.error("Empty group: " + group.getName());
return null;
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -47,6 +47,7 @@
import com.ogoglio.client.model.Template;
import com.ogoglio.client.model.Thing;
import com.ogoglio.client.model.User;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.j3d.bvh.BvhParseException;
import com.ogoglio.viewer.j3d.obj.Obj;
import com.ogoglio.viewer.j3d.obj.ObjParseException;
@@ -243,12 +244,12 @@
}
J3DThingRenderable thingRenderable = (J3DThingRenderable) getThingRenderable(page.getThing().getThingID());
if (thingRenderable == null) {
- System.err.println("Tried to move a page to an unknown thing: " + page.getThing().getThingID());
+ Log.error("Tried to move a page to an unknown thing: " + page.getThing().getThingID());
return;
}
J3DPageRenderable pageRenderable = thingRenderable.getPageRenderable(page.getPageID());
if (pageRenderable == null) {
- System.err.println("Tried to move an unknown page: " + page.getThing().getThingID() + ", " + page.getPageID());
+ Log.error("Tried to move an unknown page: " + page.getThing().getThingID() + ", " + page.getPageID());
} else {
pageRenderable.setPosition(position);
}
@@ -260,7 +261,7 @@
}
J3DThingRenderable thingRenderable = (J3DThingRenderable) getThingRenderable(page.getThing().getThingID());
if (thingRenderable == null) {
- System.err.println("Tried to add a page to an unknown thing: " + page.getThing().getThingID());
+ Log.error("Tried to add a page to an unknown thing: " + page.getThing().getThingID());
return;
}
J3DPageRenderable pageRenderable = new J3DPageRenderable(thingRenderable/*not used!*/, page);
@@ -503,12 +504,12 @@
}
J3DThingRenderable renderable = (J3DThingRenderable) getThingRenderable(shape.getThing().getThingID());
if (renderable == null) {
- System.err.println("Tried to move a shape in an unrendered thing: " + shape.getThing().getThingID() + ", " + shape.getName());
+ Log.error("Tried to move a shape in an unrendered thing: " + shape.getThing().getThingID() + ", " + shape.getName());
return;
}
J3DShapeRenderable shapeRenderable = renderable.getShapeRenderable(shape.getName());
if (shapeRenderable == null) {
- System.err.println("Tried to move an unknown shape: " + shape.getThing().getThingID() + ", " + shape.getName());
+ Log.error("Tried to move an unknown shape: " + shape.getThing().getThingID() + ", " + shape.getName());
return;
}
startRenderableMotion(shapeRenderable, path);
@@ -517,12 +518,12 @@
public void shapeMotionStopped(Shape shape, Transform3D position) {
J3DThingRenderable renderable = (J3DThingRenderable) getThingRenderable(shape.getThing().getThingID());
if (renderable == null) {
- System.err.println("Tried to move a shape in an unrendered thing: " + shape.getThing().getThingID() + ", " + shape.getName());
+ Log.error("Tried to move a shape in an unrendered thing: " + shape.getThing().getThingID() + ", " + shape.getName());
return;
}
J3DShapeRenderable shapeRenderable = renderable.getShapeRenderable(shape.getName());
if (shapeRenderable == null) {
- System.err.println("Tried to move an unknown shape: " + shape.getThing().getThingID() + ", " + shape.getName());
+ Log.error("Tried to move an unknown shape: " + shape.getThing().getThingID() + ", " + shape.getName());
return;
}
stopRenderableMotion(shapeRenderable, position);
@@ -535,7 +536,7 @@
universe.removeAllLocales();
if(!offScreen) {
canvas.stopRenderer();
- System.out.println("Stopped renderer");
+ Log.info("Stopped renderer");
}
}
@@ -547,7 +548,7 @@
}
objs[0] = getObj(door, 0);
if (objs[0] == null) {
- System.err.println("Could not load the door geometry!");
+ Log.error("Could not load the door geometry!");
objs[0] = getObj(errorGeometryProvider, 0);
}
if (objs[0] == null) {
@@ -601,7 +602,7 @@
private void removeUserRenderable(UserRenderable renderable) {
if (renderable == null) {
- System.err.println("User renderable == null");
+ Log.error("User renderable == null");
return;
}
physicsBehavior.stopRenderableMotion(renderable);
@@ -719,7 +720,7 @@
for (int i = 0; i < objs.length; i++) {
objs[i] = getObj(thing, i);
if(objs[i] != null && objs[i].getGroups().length == 0) {
- System.err.println("Got obj with no groups for thing " + thing.getThingID() + ": " + thing.getName());
+ Log.error("Got obj with no groups for thing " + thing.getThingID() + ": " + thing.getName());
objs[i] = null;
}
if (!gotObj && objs[i] != null) {
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-09-04 15:32:46 UTC (rev 357)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-09-04 19:00:02 UTC (rev 358)
@@ -20,13 +20,13 @@
import java.awt.event.MouseMotionListener;
import javax.media.j3d.Transform3D;
-import javax.swing.JPopupMenu;
import javax.vecmath.Point3d;
import com.ogoglio.client.UserInputListener;
import com.ogoglio.client.model.SplinePath;
import com.ogoglio.client.model.Thing;
import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
import com.ogoglio.viewer.render.ClickTarget;
import com.ogoglio.viewer.render.DoorRenderable;
import com.ogoglio.viewer.render.PageRenderable;
@@ -111,7 +111,7 @@
// called from within PhysicsBehavior
public void keyPressed(KeyEvent e) {
- System.out.println("Key down");
+ Log.info("Key down "+e.toString());
if (e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_W) {
if (moveForward == false || run == true) {
dirty = true;
@@ -156,7 +156,7 @@
// called from within PhysicsBehavior
public void keyReleased(KeyEvent e) {
- System.out.println("Key up");
+ Log.info("Key up:"+e.toString());
if (e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_W) {
if (mo...
[truncated message content] |
