Thread: [Ogoglio-commits] SF.net SVN: ogoglio: [290] maven/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 290
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=290&view=rev
Author:   iansmith
Date:     2007-08-29 13:55:24 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
New support for migrations and better support for test resources.

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/Migration.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-common/.classpath
    maven/trunk/ogoglio-common/pom.xml
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java
    maven/trunk/ogoglio-integration-test/pom.xml
    maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
    maven/trunk/ogoglio-server/.classpath
    maven/trunk/ogoglio-server/pom.xml
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/migrate/AccountsForTesting.java
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AuthServlet.java
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/MessageProxy.java
    maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java

Added Paths:
-----------
    maven/trunk/ogoglio-appdev/src/test/resources/basic.properties
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/PropStorage.java
    maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
    maven/trunk/ogoglio-integration-test/src/test/resources/bootstrap.properties
    maven/trunk/ogoglio-integration-test/src/test/resources/test-config.properties
    maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
    maven/trunk/ogoglio-server/src/test/resources/bootstrap.properties
    maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/
    maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/Migration.java
===================================================================

--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/Migration.java	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/Migration.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -9,6 +9,21 @@
 
 public interface Migration {
 
-    public boolean migrate(SessionFactory sessionFactory, ServletConfig servletConfig, Context ctx, Properties testConfig, int from, int to);
+	/*
+	 * Called to move a running database from one version to another.  The receiver should
+	 * take actions that are required to make the new schema work properly, such as fixing
+	 * pointers that may have been put out-of-date.
+	 * 
+	 * Return false if things went wrong.
+	 */
+    public boolean patch(SessionFactory sessionFactory, ServletConfig servletConfig, Context ctx, int from, int to);
 
+    /*O
+     * The receiver should use this call to populate the database with data that would be useful
+     * to sample programs or a user such as example user accounts, etc.
+     * 
+     * Return false if things went wrong.
+     */
+    public boolean populate(SessionFactory sessionFactory, int from, int to);
+
 }

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-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -1,9 +1,5 @@
 package com.ogoglio.appdev.migrate;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -12,13 +8,19 @@
 import org.hibernate.cfg.Configuration;
 
 import com.ogoglio.appdev.persist.PersistException;
+import com.ogoglio.util.PropStorage;
 import com.ogoglio.viewer.render.UIConstants;
 
+
+
 public abstract class MigrationSupport {
 
     //check on migration okayness
     public static final String MIGRATION_KEY = "ogoglio/okToMigrateDB";
 
+    public static final boolean DDL_MODE_UPDATE=true;
+    public static final boolean DDL_MODE_CREATE=false;
+    
     public MigrationSupport() {
     }
     
@@ -32,7 +34,8 @@
             if (version != versionNumber()) {
                 System.err.println("DB Version Mismatch! Expected (" + versionNumber() + ") but got " + version + "!");
                 sessionFactory.close();
-                return tryUpgrade(servletConf, ctx, version, versionNumber(), "update", true);
+                return tryUpgrade(servletConf, ctx, version, versionNumber(), 
+                		DDL_MODE_UPDATE, true, null);
             }
             sessionFactory.close();
             return true; // we are at the expected version
@@ -42,12 +45,12 @@
                 return false;
             }
             System.err.println("Unable to figure out DB version number. Likely this is a fresh database....(" + e.innerThrowable.getClass().getName() + ")");
-            return initialize_version(servletConf, ctx, true);
+            return initVersionAndUpgrade(servletConf, ctx);
         }
     }
 
-    public boolean initialize_version(ServletConfig conf, Context ctx, boolean useJNDI) {
-        Configuration configuration = createConfigurationForHibernate(0, "create", useJNDI);
+    public boolean initVersionOnly(boolean useJNDI, PropStorage propStore) {
+        Configuration configuration = createConfigurationForHibernate(0, "create", useJNDI, propStore);
         try {
             SessionFactory factory = configuration.buildSessionFactory();
             if (setVersionNumberOfDbViaQuery(factory, 0, 0) == false) {
@@ -55,19 +58,25 @@
                 return false;
             }
             factory.close();
-            return tryUpgrade(conf, ctx, 0, versionNumber(), "create", useJNDI);
-        } catch (Throwable e) {
-            System.err.println("Error trying initialized DB:" + e.getMessage());
+            return true;
+        } catch (Throwable t) {
+            System.err.println("Error trying initialized DB:" + t.getMessage());
             return false;
         }
-
     }
+    
+    public boolean initVersionAndUpgrade(ServletConfig conf, Context ctx) {
+    	if (!initVersionOnly(true,null)) {
+    		return false;
+    	}
+    	return tryUpgrade(conf, ctx, 0, versionNumber(), DDL_MODE_UPDATE, true,null);
+    }
 
     public Configuration getCurrentConfiguration() {
-        return createConfigurationForHibernate(versionNumber(), null, true);
+        return createConfigurationForHibernate(versionNumber(), null, true, null);
     }
 
-    public Configuration createConfigurationForHibernate(int num, String autoSetting, boolean useJNDI) {
+    public Configuration createConfigurationForHibernate(int num, String autoSetting, boolean useJNDI, PropStorage ps) {
         Configuration configuration = new Configuration();
         if (autoSetting != null) {
             configuration.setProperty("hibernate.hbm2ddl.auto", autoSetting);
@@ -75,14 +84,7 @@
         if (useJNDI) {
             configuration.setProperty("hibernate.connection.datasource", "java:comp/env/jdbc/space");
         } else {
-            Properties p = new Properties();
-            try {
-                p.load(getClass().getResourceAsStream("/test-config.properties"));
-                configuration.addProperties(p);
-            } catch (IOException e) {
-                System.err.println("Unable to find the test configuration file!" + e.getMessage());
-                return configuration.configure();
-            }
+        	configuration.addProperties(ps.getAllProps(PropStorage.TEST_CONFIG_PROPS));
         }
         configuration.addInputStream(UIConstants.getResource("com/ogoglio/migrate/migration-" + num + ".xml"));
         return configuration.configure();
@@ -97,35 +99,39 @@
         }
     }
 
-    public boolean tryUpgrade(ServletConfig servletConfig, Context ctx, int db_is, int db_wants_to_be, String ddlMode, boolean useJNDI) {
+    public boolean tryUpgrade(ServletConfig servletConfig, Context ctx, int db_is, 
+    		int db_wants_to_be, boolean isUpdate, boolean useJNDI, PropStorage propStore) {
         if (migrationList().length != versionNumber()) {
             System.out.println("Internal error! Migration list length should be " + versionNumber() + " but is " + migrationList().length + "!");
             return false;
         }
-        Properties testConfig = new Properties();
         boolean canMigrate = false;
-        if (ctx == null) {
-            //in test mode
-            testConfig = getTestConfig();
-            if ("true".equals(testConfig.getProperty("ogoglio.okToMigrateDB"))) {
-                canMigrate = true;
-            }
-        } else {
-            //not testing, but might be integration testing
-            try {
-                String migrate = (String) ctx.lookup(MIGRATION_KEY);
-                if ("true".equals(migrate)) {
-                    canMigrate = true;
-                }
-            } catch (NamingException e) {
-                System.err.println("Naming exception trying to access " + MIGRATION_KEY + " from naming context!");
-            }
+        
+        //check the flags
+        try {
+        	String migrate;
+        	if (useJNDI) {
+        		migrate = (String) ctx.lookup(MIGRATION_KEY);
+        	} else {
+        		migrate= propStore.getKeyFromSet(PropStorage.TEST_CONFIG_PROPS, "ogoglio.okToMigrateDB");
+        	}
+    		if ("true".equals(migrate)) {
+    			canMigrate = true;
+    		}
+        } catch (NamingException e) {
+        	System.err.println("Naming exception trying to access " + MIGRATION_KEY + " from naming context!");
+        	canMigrate=false;
         }
 
         if (!canMigrate) {
             System.err.println("Cannot migrate data! Property ogoglio.okToMigrateDB is false or non-existent!");
             return false;
         }
+        String hbm_auto_flag="update";
+        if (!isUpdate) {
+        	hbm_auto_flag="create";
+        }
+        
 
         for (int i = db_is; i < db_wants_to_be; ++i) {
             Migration current = migrationList()[i];
@@ -133,38 +139,47 @@
             System.out.println("DB: Attempting migration from " + i + " to " + (i + 1) + "...");
 
             //try to get hibernate to do the work
-            Configuration config = createConfigurationForHibernate(i + 1, ddlMode, useJNDI);
+            Configuration config = createConfigurationForHibernate(i + 1, hbm_auto_flag, useJNDI, propStore);
             SessionFactory factory = config.buildSessionFactory();
 
             //subtle: if the ddlMode is create, hibernate blows away all the data (including our version number record)
             int expectedRecords = 1;
-            if ("create".equals(ddlMode)) {
+            if (!isUpdate) {
                 expectedRecords = 0;
             }
             setVersionNumberOfDbViaQuery(factory, i + 1, expectedRecords);
 
-            if (!current.migrate(factory, servletConfig, ctx, testConfig, i, i + 1)) {
+            if (!current.patch(factory, servletConfig, ctx,  i, i + 1)) {
                 factory.close();
                 return false;
             }
+            
+            if (!isUpdate) {
+            	//we need to go ahead and create the data
+            	if (!current.populate(factory, i, i+1)) {
+            		System.out.println("FART: Whoa! Populate failed!"+i);
+            		factory.close();
+            		return false;
+            	}
+        		System.out.println("FART: Populate ok!"+i);
+            }
+            
             factory.close();
             System.out.println("------------------------------------------------\n");
         }
         return true;
     }
 
-    public Properties getTestConfig() {
-        Properties testConfig = new Properties();
-        InputStream is = getClass().getResourceAsStream("/test-config.properties");
-        if (is == null) {
-            System.err.println("Warning! Unable to find test-config.properties! Probably something is broken!");
-        } else {
-            try {
-                testConfig.load(is);
-            } catch (IOException e) {
-                System.err.println("Warning! Error reading test-config.properties! " + e.getMessage());
-            }
-        }
-        return testConfig;
-    }
+	public boolean destroyAllData() {
+		PropStorage ps =new PropStorage();
+		if (ps.loadPropertySet(PropStorage.TEST_CONFIG_PROPS)==false) {
+			return false;
+		}
+
+		if (initVersionOnly(false, ps)==false) {
+			return false;
+		}
+
+		return tryUpgrade(null, null, 0, versionNumber(), DDL_MODE_CREATE, false, ps);
+	}
 }

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-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/test/DBZapTest.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -5,6 +5,7 @@
 import org.hibernate.SessionFactory;
 
 import com.ogoglio.appdev.migrate.MigrationSupport;
+import com.ogoglio.util.PropStorage;
 
 public abstract class DBZapTest extends TestCase {
 
@@ -15,15 +16,19 @@
     public void setUp() {
         try {
             MigrationSupport support = getMigrationSupport();
-            if (!("true".equals(support.getTestConfig().getProperty("ogoglio.okToZapDB")))) {
+            PropStorage ps=new PropStorage();
+            if (ps.loadPropertySet(PropStorage.TEST_CONFIG_PROPS)==false) {
+            	fail("Can't load test configuration for hibernate properties!");
+            }
+            if (!("true".equals(ps.getKeyFromSet(PropStorage.TEST_CONFIG_PROPS,"ogoglio.okToZapDB")))) {
                 fail("Whoa! Shouldn't be running tests without setting the ogoglio.okToZapDB property!");
             }
-            if (support.initialize_version(null, null, false) == false) {
+            if (support.destroyAllData() == false) {
                 fail("can't get DB set up: trying to initialize it in the test code");
             }
 
             //if we are here, db stuff worked, but we still need to avoid all the jndi stuff
-            sessionFactory = support.createConfigurationForHibernate(getMigrationSupport().versionNumber(), null, false).buildSessionFactory();
+            sessionFactory = support.createConfigurationForHibernate(getMigrationSupport().versionNumber(), null, false, ps).buildSessionFactory();
         } catch (Exception e) {
             System.out.println("-------");
             e.printStackTrace(System.out);

Added: maven/trunk/ogoglio-appdev/src/test/resources/basic.properties
===================================================================
--- maven/trunk/ogoglio-appdev/src/test/resources/basic.properties	                        (rev 0)
+++ maven/trunk/ogoglio-appdev/src/test/resources/basic.properties	2007-08-29 20:55:24 UTC (rev 290)
@@ -0,0 +1,4 @@
+# basic info needed for some tests
+ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
+ogoglio.baseUrl = ${ogoglio.baseURL}
+

Modified: maven/trunk/ogoglio-common/.classpath
===================================================================
--- maven/trunk/ogoglio-common/.classpath	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-common/.classpath	2007-08-29 20:55:24 UTC (rev 290)
@@ -2,9 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry excluding="**" output="src/main/resources/avatar" kind="src" path="src/main/resources/avatar"/>
-	<classpathentry excluding="**" output="src/main/resources/templates" kind="src" path="src/main/resources/templates"/>
-	<classpathentry excluding="**" output="src/test/resources" kind="src" path="src/test/resources"/>
+	<classpathentry excluding="**" kind="src" output="src/main/resources/templates" path="src/main/resources/templates"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-common/pom.xml	2007-08-29 20:55:24 UTC (rev 290)
@@ -13,14 +13,7 @@
 	<build>
 		<resources>
 			<!--  FILTER RESOURCES FOR SOME CONSTANTS-->
-			<!--
 			<resource>
-				<directory>src/main/resources/testing_constants</directory>
-				<filtering>true</filtering>
-			</resource>
-			-->
-			
-			<resource>
 				<targetPath>avatar</targetPath>
 				<directory>src/main/resources/avatar</directory>
 			</resource>

Added: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/PropStorage.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/PropStorage.java	                        (rev 0)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/PropStorage.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -0,0 +1,55 @@
+package com.ogoglio.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/*
+ * This is used by test and utility code to manipulate the DB and avoid having production
+ * jars that contain property files that have private information.
+ */
+public class PropStorage {
+
+    public static final String TEST_CONFIG_PROPS="test-config.properties";
+    public static final String BOOTSTRAP_PROPS="bootstrap.properties";
+	public static final String BASIC_PROPS = "basic-config.properties";
+    
+
+	
+	private Map propMap = new HashMap();
+	
+	public PropStorage() {}
+	
+	public boolean loadPropertySet(String propsetNameAndPath) {
+		if (!propMap.containsKey(propsetNameAndPath)) {
+			InputStream is;
+            is = UIConstants.class.getClassLoader().getResourceAsStream(propsetNameAndPath);
+            if (is== null) {
+                is= UIConstants.class.getResourceAsStream(propsetNameAndPath);
+            }
+			if (is==null) {
+				return false;
+			}
+			Properties props=new Properties();
+			try {
+				props.load(is);
+				propMap.put(propsetNameAndPath,props);
+			} catch (IOException e) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public String getKeyFromSet(String propSetName, String key) {
+		Properties props=(Properties)propMap.get(propSetName);
+		return props.getProperty(key);
+	}
+
+	public Properties getAllProps(String propsetNameAndPath) {
+		return (Properties)propMap.get(propsetNameAndPath);
+	}
+
+}

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -1,8 +1,5 @@
 package com.ogoglio.util;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
 
 public class WebConstants {
     public static final String AUTH_USERNAME_PARAM = "username";

Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-integration-test/pom.xml	2007-08-29 20:55:24 UTC (rev 290)
@@ -9,13 +9,23 @@
 	<packaging>pom</packaging>
 
 	<build>
+		<!--  -->
+		<!-- TEST RESOURCES -->
+		<!--  -->
 		<testResources>
 			<testResource>
-				<targetPath></targetPath>
-				<directory>src/test/resources/</directory>
+				<directory>src/test/resources</directory>
 				<filtering>true</filtering>
+				<includes>
+					<include>test-config.properties</include>
+					<include>basic-config.properties</include>
+					<include>bootstrap.properties</include>
+					<include>mail/*</include>
+					<include>sample-art3d/*</include>
+				</includes>
 			</testResource>
 		</testResources>
+
 		<plugins>
 			<!-- COMPILER needed b/c POM packaging by default doesn't build the tests -->
 			<plugin>
@@ -99,8 +109,10 @@
 						<goals>
 							<goal>stop</goal>
 						</goals>
+						
 						<configuration>
 							<wait>true</wait>
+							<type>runtime</type>
 						</configuration>
 					</execution>
 					<execution>
@@ -110,7 +122,8 @@
 						<goals>
 							<goal>stop</goal>
 						</goals>
-						<configuration>	
+						<configuration>
+							<type>runtime</type>	
 							<wait>false</wait>
 						</configuration>
 					</execution>

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-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -41,8 +41,10 @@
 import com.ogoglio.client.model.SplinePath;
 import com.ogoglio.client.model.Thing;
 import com.ogoglio.client.model.User;
+import com.ogoglio.util.PropStorage;
 import com.ogoglio.util.StreamUtils;
 import com.ogoglio.util.WebConstants;
+import com.ogoglio.viewer.render.UIConstants;
 import com.ogoglio.xml.AccountDocument;
 import com.ogoglio.xml.AuthDocument;
 import com.ogoglio.xml.BodyDocument;
@@ -97,7 +99,15 @@
 
     public void testWebAdmin() {
         try {
-            WebAPIAuthenticator adminAuthenticator = new WebAPIAuthenticatorFactory().authenticate(wire1, descriptor1, BootstrapInfo.getBootstrapUsername(), BootstrapInfo.getBootstrapUserPW());
+        	PropStorage ps=new PropStorage();
+        	if (ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS)==false) {
+        		fail("unable to load properties bootstrap.properties!");
+        	}
+        	
+            WebAPIAuthenticator adminAuthenticator = new WebAPIAuthenticatorFactory().authenticate(wire1, descriptor1, 
+            		ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"), 
+            		ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
+            
             assertNotNull("got null auth cookie", adminAuthenticator.getAuthCookie());
 
             WebAPIClient adminWebClient = new WebAPIClient(descriptor1, adminAuthenticator, wire1);
@@ -240,7 +250,7 @@
 
     private UserDocument[] verifyUserDocsBySize(WebAPIClient webClient1, long spaceID, int expectedLen, String expectedUsername) throws IOException {
         UserDocument[] userDocs = webClient1.getUserDocuments(spaceID);
-        assertTrue(userDocs.length == expectedLen);
+        assertEquals(expectedLen,userDocs.length);
         if (expectedUsername != null) {
             assertEquals(expectedUsername, userDocs[0].getUsername());
         }
@@ -422,6 +432,7 @@
         SpaceClient guestSpaceClient1 = new SpaceClient(spaceID, serviceURI1, guestCookie1, new TestSpaceClientListener());
         try {
             Thread.sleep(1000);
+            Thread.yield();
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -533,11 +544,10 @@
         String CUBE_GIF = "TestCube.gif";
         String CUBE_MATERIAL = "TestCube.mtl";
 
-        Class clazz = getClass();
-        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), 0, clazz.getResourceAsStream("/sample-art3d/TestCube.obj"));
-        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_MATERIAL, clazz.getResourceAsStream("/sample-art3d/TestCube.mtl"));
-        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_GIF, clazz.getResourceAsStream("/sample-art3d/TestCube.gif"));
-        webClient1.updateTemplateScript(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), StreamUtils.readInput(clazz.getResourceAsStream("/sample-art3d/TestCube.js")));
+        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), 0, UIConstants.getResource("sample-art3d/TestCube.obj"));
+        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_MATERIAL, UIConstants.getResource("sample-art3d/TestCube.mtl"));
+        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_GIF, UIConstants.getResource("sample-art3d/TestCube.gif"));
+        webClient1.updateTemplateScript(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), StreamUtils.readInput(UIConstants.getResource("sample-art3d/TestCube.js")));
 
         baseDoc = webClient1.getTemplateDocument(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID());
         //make sure the sequence right above didn't take more than 1 sec

Added: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties	                        (rev 0)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties	2007-08-29 20:55:24 UTC (rev 290)
@@ -0,0 +1,4 @@
+# basic info needed for some tests
+ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
+ogoglio.baseUrl = ${ogoglio.baseURL}
+

Added: maven/trunk/ogoglio-integration-test/src/test/resources/bootstrap.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/bootstrap.properties	                        (rev 0)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/bootstrap.properties	2007-08-29 20:55:24 UTC (rev 290)
@@ -0,0 +1,2 @@
+bootstrapUser=${ogoglio.bootstrapUser}
+bootstrapUserPW=${ogoglio.bootstrapUserPW}

Added: maven/trunk/ogoglio-integration-test/src/test/resources/test-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/test-config.properties	                        (rev 0)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/test-config.properties	2007-08-29 20:55:24 UTC (rev 290)
@@ -0,0 +1,28 @@
+# this is needed for running tests because tomcat isn't
+# actually around when these tests get run so we need
+# to use the DB via the simple c3po connection manager
+# (supplied with hibernate)
+
+hibernate.connection.driver_class = com.mysql.jdbc.Driver
+hibernate.connection.url = ${ogoglio.mysql.url}
+hibernate.connection.username = ${ogoglio.mysql.user}
+hibernate.connection.password = ${ogoglio.mysql.password}
+hibernate.show_sql=false
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+
+#copied from the web
+#hibernate.c3p0.min_size=5
+#hibernate.c3p0.max_size=20
+#hibernate.c3p0.timeout=1800
+#hibernate.c3p0.max_statements=50
+
+#for doing tests that need bootstrap
+ogoglio.baseURL=${ogoglio.baseURL}
+ogoglio.bootstrapUser=${ogoglio.bootstrapUser}
+ogoglio.bootstrapUserPW=${ogoglio.bootstrapUserPW}
+
+#can destroy the db?
+ogoglio.okToZapDB=${ogoglio.okToZapDB}
+#can migrate data?
+ogoglio.okToMigrateDB=${ogoglio.okToMigrateDB}
+

Modified: maven/trunk/ogoglio-server/.classpath
===================================================================
--- maven/trunk/ogoglio-server/.classpath	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-server/.classpath	2007-08-29 20:55:24 UTC (rev 290)
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="src/main/resources/hibernate" path="src/main/resources/hibernate"/>
+	<classpathentry excluding="**" kind="src" output="src/main/resources/log4j" path="src/main/resources/log4j"/>
+	<classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute value="/usr/local/jdk1.5.0_12/jre/lib/i386" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/usr/local/jdk1.5.0_12/jre/lib/i386"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-server/pom.xml	2007-08-29 20:55:24 UTC (rev 290)
@@ -65,6 +65,8 @@
 				<filtering>true</filtering>
 				<includes>
 					<include>test-config.properties</include>
+					<include>basic-config.properties</include>
+					<include>bootstrap.properties</include>
 					<include>mail/*</include>
 					<include>templates/*</include>
 				</includes>

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/migrate/AccountsForTesting.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/migrate/AccountsForTesting.java	2007-08-29 00:48:02 UTC (rev 289)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/migrate/AccountsForTesting.java	2007-08-29 20:55:24 UTC (rev 290)
@@ -1,7 +1,6 @@
 package com.ogoglio.migrate;
 
 impo...
 
[truncated message content]

Thread: [Ogoglio-commits] SF.net SVN: ogoglio: [290] maven/trunk

ogoglio-commits