[Ogoglio-commits] SF.net SVN: ogoglio: [395] maven/trunk/ogoglio-server/src/main/java/com/ ogoglio/persist

[<ian...@us...>]

Revision: 395
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=395&view=rev
Author:   iansmith
Date:     2007-09-12 05:06:08 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
Added support for bringing up local sim on different machine from the one the DB was
created on.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java	2007-09-12 02:30:41 UTC (rev 394)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java	2007-09-12 12:06:08 UTC (rev 395)
@@ -31,7 +31,21 @@
 
     public static void initializeLocalSim(URI serviceURI, SessionFactory sessionFactory) throws PersistException {
         SimRecord[] simRecords = SimPersistTasks.findSims(sessionFactory);
+        URI ourURI=WebAPIUtil.appendToURI(serviceURI, "sim/");
+        
         if (simRecords.length != 0) {
+        	//the db might have been created on another host (e.g. the amazon case)
+        	for (int i=0; i<simRecords.length;++i) {
+        		SimRecord sim=simRecords[i];
+        		if (LOCAL_SIM_DISPLAY_NAME.equals(sim.getDisplayName())) {
+        			if (!(ourURI.equals(sim.getSimURI()))) {
+        				//make it point to us
+        				sim.setSimURI(ourURI);
+        				SimPersistTasks.update(sim, sessionFactory);
+        			}
+        		}
+        	}
+        	SimRecord rec = SimPersistTasks.findSimsBySimURI(ourURI, sessionFactory);
             return;
         }
         SimPersistTasks.createSim(LOCAL_SIM_DISPLAY_NAME, WebAPIUtil.appendToURI(serviceURI, "sim/"), SimRecord.DEFAULT_EVENT_PORT, true, sessionFactory);

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java	2007-09-12 02:30:41 UTC (rev 394)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java	2007-09-12 12:06:08 UTC (rev 395)
@@ -78,6 +78,10 @@
         }
         return ArgumentUtils.createURI(simURIString);
     }
+
+    public void setSimURI(URI uri) {
+    	simURIString = uri.toString();
+    }
     
     //hibernate access
     private String getSimURIString() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.