Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [673] maven/trunk
|
From: <ian...@us...> - 2008-01-10 18:22:20
|
Revision: 673
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=673&view=rev
Author: iansmith
Date: 2008-01-10 10:22:23 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
Improved error logging when we fail to migrate.
Added log4j config for ogoglio-server so you can debug it.
Added support for concurrent database access via hibernate configuration files.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/resources/hibernate/hibernate.cfg.xml
maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-0.xml
maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml
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 2008-01-09 18:39:59 UTC (rev 672)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java 2008-01-10 18:22:23 UTC (rev 673)
@@ -92,6 +92,7 @@
} else {
configuration.addProperties(ps.getAllProps(PropStorage.TEST_CONFIG_PROPS));
}
+ Log.info("Trying read in hibernate config ["+getResourcePath() + "/migration-" + num + ".xml"+"]");
configuration.addInputStream(UIConstants.getResource(getResourcePath() + "/migration-" + num + ".xml"));
return configuration.configure();
}
@@ -182,28 +183,30 @@
}
public boolean destroyAllData() {
+ Log.info("Destroying all data in the database and media serve... hope this is a dev machine.");
PropStorage ps = new PropStorage();
if (ps.loadPropertySet(PropStorage.TEST_CONFIG_PROPS) == false) {
+ Log.error("destroyAllData: unable to load the property set!");
return false;
}
-
if (initVersionOnly(false, ps) == false) {
+ Log.error("destroyAllData: unable to init the version number!");
return false;
}
if (tryUpgrade(null, null, 0, getVersionNumber(), DDL_MODE_CREATE, false, ps) == false) {
- Log.error("Aborted destroying data after failure to upgrade");
+ Log.error("destroyAllData: 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");
+ Log.error("destroyAllData:Can't find a property ogoglio.mediaDirectory to cleanse media store");
return false;
}
if(!destroyFiles(new File(dir))){
- Log.error("Media directory doesn't exist or can't be changed:" + dir);
+ Log.error("destroyAllData: Media directory doesn't exist or can't be changed:" + dir);
return false;
}
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2008-01-09 18:39:59 UTC (rev 672)
+++ maven/trunk/ogoglio-server/pom.xml 2008-01-10 18:22:23 UTC (rev 673)
@@ -34,6 +34,12 @@
</includes>
</resource>
<resource>
+ <directory>src/main/resources/log4j</directory>
+ <includes>
+ <include>log4j.properties</include>
+ </includes>
+ </resource>
+ <resource>
<targetPath>com/ogoglio/migrate</targetPath>
<directory>src/main/resources/hibernate</directory>
<includes>
Modified: maven/trunk/ogoglio-server/src/main/resources/hibernate/hibernate.cfg.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/hibernate/hibernate.cfg.xml 2008-01-09 18:39:59 UTC (rev 672)
+++ maven/trunk/ogoglio-server/src/main/resources/hibernate/hibernate.cfg.xml 2008-01-10 18:22:23 UTC (rev 673)
@@ -13,6 +13,5 @@
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
<property name="show_sql">true</property>
-->
-
</session-factory>
</hibernate-configuration>
Modified: maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-0.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-0.xml 2008-01-09 18:39:59 UTC (rev 672)
+++ maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-0.xml 2008-01-10 18:22:23 UTC (rev 673)
@@ -6,7 +6,7 @@
<!-- version 0... from a clean DB -->
<class name="com.ogoglio.appdev.migrate.DBVersionRecord" table="DBVersionRecords">
<id name="versionId">
- <generator class="increment"/>
+ <generator class="identity"/>
</id>
<property name="version" not-null="true"/>
</class>
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-09 18:39:59 UTC (rev 672)
+++ maven/trunk/ogoglio-server/src/main/resources/hibernate/migration-1.xml 2008-01-10 18:22:23 UTC (rev 673)
@@ -12,7 +12,7 @@
<class name="com.ogoglio.persist.ServiceStateRecord"
table="ServiceStateRecords">
<id name="serviceStateID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="registrationState" not-null="true" />
</class>
@@ -30,7 +30,7 @@
<class name="com.ogoglio.persist.PossessionRecord"
table="PossessionRecords">
<id name="possessionID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="ownerUsername" not-null="true" />
@@ -42,7 +42,7 @@
<class name="com.ogoglio.persist.SpaceRecord"
table="SpaceRecords">
<id name="spaceID" access="field">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="displayName" not-null="true" />
@@ -61,7 +61,7 @@
<class name="com.ogoglio.persist.SpaceMemberRecord"
table="SpaceMemberRecords">
<id name="spaceMemberID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="spaceID" update="false" />
@@ -72,7 +72,7 @@
<class name="com.ogoglio.persist.SimRecord" table="SimRecords">
<id name="simID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="displayName" />
@@ -83,7 +83,9 @@
<class name="com.ogoglio.persist.AccountRecord"
table="AccountRecords">
- <id name="username"></id>
+ <id name="username">
+ <generator class="assigned" />
+ </id>
<property name="email" not-null="true" unique="true" />
<property name="emailValid" />
<property name="accountlevel" not-null="true" />
@@ -102,7 +104,7 @@
<class name="com.ogoglio.persist.TemplateRecord"
table="TemplateRecords">
<id name="templateID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="ownerUsername" not-null="true" />
@@ -127,9 +129,9 @@
</class>
<class name="com.ogoglio.appdev.migrate.DBVersionRecord"
- table="DBVersionRecords">
+ table="DBVersion">
<id name="versionId">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="version" not-null="true" />
</class>
@@ -137,7 +139,7 @@
<class name="com.ogoglio.persist.TemplateSupportFileRecord"
table="TemplateSupportFileRecords">
<id name="templateSupportFileID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="supportFile" />
<property name="script" not-null="true" />
@@ -148,7 +150,7 @@
<class name="com.ogoglio.persist.BodyDataRecord"
table="BodyDataRecords">
<id name="bodyDataID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="displayName" not-null="true" />
<property name="fileName" not-null="true" unique="true" />
@@ -157,7 +159,7 @@
<class name="com.ogoglio.persist.BodyConfigurationRecord"
table="BodyConfigurationRecords">
<id name="bodyConfigurationID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="ownerUsername" not-null="true" />
<property name="displayName" not-null="true" />
@@ -168,7 +170,7 @@
<class name="com.ogoglio.persist.BodySettingRecord"
table="BodySettingRecords">
<id name="bodySettingID">
- <generator class="increment" />
+ <generator class="identity" />
</id>
<property name="settingName" not-null="true" />
<property name="setting" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
