Return-Path: X-Original-To: apmail-empire-db-commits-archive@www.apache.org Delivered-To: apmail-empire-db-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E5729B4A for ; Sun, 11 Mar 2012 12:03:33 +0000 (UTC) Received: (qmail 60336 invoked by uid 500); 11 Mar 2012 12:03:33 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 60313 invoked by uid 500); 11 Mar 2012 12:03:33 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 60305 invoked by uid 99); 11 Mar 2012 12:03:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Mar 2012 12:03:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Mar 2012 12:03:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5C7BD2388860 for ; Sun, 11 Mar 2012 12:03:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1299349 - in /empire-db/trunk: empire-db-codegen/src/main/resources/templates/ empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/ empire-db/src/main/java/org/apache/empire/db/ empire-db/src/m... Date: Sun, 11 Mar 2012 12:03:07 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120311120309.5C7BD2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: doebele Date: Sun Mar 11 12:03:06 2012 New Revision: 1299349 URL: http://svn.apache.org/viewvc?rev=1299349&view=rev Log: EMPIREDB-79 New relation property: setOnDeleteAction. See DBRelation.DBCascadeAction for details. Added: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/StatementFailedException.java (with props) Modified: empire-db/trunk/empire-db-codegen/src/main/resources/templates/Table.vm empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/DatabaseNotOpenException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/FieldIllegalValueException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/FieldIsReadOnlyException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/FieldNotNullException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/FieldValueTooLongException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/InternalSQLException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/InvalidKeyException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/NoPrimaryKeyException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/QueryFailedException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/QueryNoResultException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordDeleteFailedException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordNotFoundException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordUpdateFailedException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordUpdateInvalidException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanIncompatibleException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanInstantiationException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertyGetException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertySetException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileParseException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileReadException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileWriteException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidArgumentException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidPropertyException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemExistsException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemNotFoundException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotImplementedException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotSupportedException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ObjectNotValidException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/PropertyReadOnlyException.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/UnexpectedReturnValueException.java Modified: empire-db/trunk/empire-db-codegen/src/main/resources/templates/Table.vm URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-codegen/src/main/resources/templates/Table.vm?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db-codegen/src/main/resources/templates/Table.vm (original) +++ empire-db/trunk/empire-db-codegen/src/main/resources/templates/Table.vm Sun Mar 11 12:03:06 2012 @@ -68,9 +68,6 @@ public class $parser.getTableClassName($ /*no locking column specified*/ #end #end - - // Set cascade delete - setCascadeDelete(true); } #if($nestTables == true) } Modified: empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java (original) +++ empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java Sun Mar 11 12:03:06 2012 @@ -38,6 +38,7 @@ import org.apache.empire.db.DBReader; import org.apache.empire.db.DBRecord; import org.apache.empire.db.DBSQLScript; import org.apache.empire.db.DBTableColumn; +import org.apache.empire.db.exceptions.StatementFailedException; import org.apache.empire.db.h2.DBDatabaseDriverH2; import org.apache.empire.db.postgresql.DBDatabaseDriverPostgreSQL; import org.slf4j.Logger; @@ -142,7 +143,7 @@ public class SampleAdvApp // commit db.commit(conn); - + // STEP 7: read from Employee_Info_View System.out.println("--------------------------------------------------------"); System.out.println("*** read from EMPLOYEE_INFO_VIEW ***"); @@ -193,6 +194,11 @@ public class SampleAdvApp script.run(db.getDriver(), conn, false); } + // STEP 13: delete records + System.out.println("--------------------------------------------------------"); + System.out.println("*** deleteRecordSample: shows how to delete records (with and without cascade) ***"); + deleteRecordSample(idEmp3, idSalDep, conn); + // Done System.out.println("--------------------------------------------------------"); System.out.println("DB Sample Advanced finished successfully."); @@ -612,6 +618,31 @@ public class SampleAdvApp // Successfully updated System.out.println("The employee has been sucessfully updated"); } + + /** + * This function demonstrates cascaded deletes. + * See DBRelation.setOnDeleteAction() + * + * @param idEmployee the id of the employee to delete + * @param idDepartment the id of the department to delete + * @param conn the connection + */ + private static void deleteRecordSample(int idEmployee, int idDepartment, Connection conn) + { + db.commit(conn); + // Delete an employee + // This statement is designed to succeed since cascaded deletes are enabled for this relation. + db.T_EMPLOYEES.deleteRecord(idEmployee, conn); + System.out.println("The employee has been sucessfully deleted"); + + // Delete a department + // This statement is designed to fail since cascaded deletes are not on! + try { + db.T_DEPARTMENTS.deleteRecord(idDepartment, conn); + } catch(StatementFailedException e) { + System.out.println("Delete of department failed as expected due to existing depending records."); + } + } /** * This functions prints the results of a query which is performed using the supplied command Modified: empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java (original) +++ empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java Sun Mar 11 12:03:06 2012 @@ -280,10 +280,10 @@ public class SampleAdvDB extends DBDatab { // Create views V_EMP_DEP_SINCE_VIEW = new EmployeeDepSinceView(this, T_EMP_DEP_HIST); - V_EMPLOYEE_INFO = new EmployeeInfoView(this, T_EMPLOYEES, T_DEPARTMENTS); + V_EMPLOYEE_INFO = new EmployeeInfoView(this, T_EMPLOYEES, T_DEPARTMENTS); // Define Foreign-Key Relations - addRelation( T_EMP_DEP_HIST.C_EMPLOYEE_ID .referenceOn( T_EMPLOYEES.C_EMPLOYEE_ID )); + addRelation( T_EMP_DEP_HIST.C_EMPLOYEE_ID .referenceOn( T_EMPLOYEES.C_EMPLOYEE_ID )).onDeleteCascade(); addRelation( T_EMP_DEP_HIST.C_DEPARTMENT_ID.referenceOn( T_DEPARTMENTS.C_DEPARTMENT_ID )); } Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java Sun Mar 11 12:03:06 2012 @@ -459,8 +459,12 @@ public abstract class DBDDLGenerator * @param reference a reference for a source and target column pair */ - public final void addRelation(DBRelation.DBReference reference) + public final DBRelation addRelation(DBRelation.DBReference reference) { String table = reference.getSourceColumn().getRowSet().getName(); String col1 = reference.getSourceColumn().getName(); // Create Relation Name - String name = table.substring(0, Math.min(table.length(), 14)) + "_" + col1.substring(0, Math.min(col1.length(), 12)) - + "_FK"; - addRelation(name, new DBRelation.DBReference[] { reference }); + String name = table.substring(0, Math.min(table.length(), 14)) + + "_" + col1.substring(0, Math.min(col1.length(), 12)) + + "_FK"; + return addRelation(name, new DBRelation.DBReference[] { reference }); } /** @@ -491,7 +494,7 @@ public abstract class DBDatabase extends * @param ref1 a reference for a source and target column pair * @param ref2 a reference for a source and target column pair */ - public final void addRelation(DBRelation.DBReference ref1, DBRelation.DBReference ref2) + public final DBRelation addRelation(DBRelation.DBReference ref1, DBRelation.DBReference ref2) { String table = ref1.getSourceColumn().getRowSet().getName(); String col1 = ref1.getSourceColumn().getName(); @@ -499,8 +502,9 @@ public abstract class DBDatabase extends // Create Relation Name String name = table.substring(0, Math.min(table.length(), 9)) + "_" + col1.substring(0, Math.min(col1.length(), 9)) - + "_" + col2.substring(0, Math.min(col2.length(), 9)) + "_FK"; - addRelation(name, new DBRelation.DBReference[] { ref1, ref2 }); + + "_" + col2.substring(0, Math.min(col2.length(), 9)) + + "_FK"; + return addRelation(name, new DBRelation.DBReference[] { ref1, ref2 }); } /** @@ -514,8 +518,11 @@ public abstract class DBDatabase extends // Check if (getRelation(name)!=null) throw new ItemExistsException(name); // Relation already exists + // Get default cascade action + DBTable targetTable = (DBTable)references[0].getTargetColumn().getRowSet(); + DBCascadeAction deleteAction = (targetTable.isCascadeDelete() ? DBCascadeAction.CASCADE_RECORDS : DBCascadeAction.NONE); // Add a Relation - DBRelation relation = new DBRelation(this, name, references); + DBRelation relation = new DBRelation(this, name, references, deleteAction); if (relations.contains(relation)) throw new ItemExistsException(name); // Relation already exists // Add Reference column to table @@ -1073,7 +1080,7 @@ public abstract class DBDatabase extends } catch (SQLException sqle) { // Error - throw new QueryFailedException(this, sqlCmd, sqle); + throw new StatementFailedException(this, sqlCmd, sqle); } } Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java Sun Mar 11 12:03:06 2012 @@ -38,7 +38,6 @@ import org.apache.empire.commons.ObjectU import org.apache.empire.commons.StringUtils; import org.apache.empire.data.DataMode; import org.apache.empire.data.DataType; -import org.apache.empire.db.DBCmdParam; import org.apache.empire.db.exceptions.InternalSQLException; import org.apache.empire.exceptions.NotImplementedException; import org.apache.empire.exceptions.NotSupportedException; Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java Sun Mar 11 12:03:06 2012 @@ -27,13 +27,37 @@ import java.io.Serializable; */ public class DBRelation extends DBObject { - private final static long serialVersionUID = 1L; + private final static long serialVersionUID = 1L; + + /** + * DBCascadeAction enum + * 
+     * This enum specifies options for a relation when deleting records
+     * (see DBRelation.setOnDeleteAction)
+     *  
+     * - NONE:    No Action is performed and the operation will fail if depending records exist.
+     * 
+     * - CASCADE: Delete (or update) any depending records. This action will be performed by the database and thus 
+     *            the option "ON DELETE CASCADE" is added to the DDL generated for the relation. 
+     * 
+     * - CASCADE_RECORDS: This option allows to handle the cascade in code. All depending records will be selected
+     *            by the framework and for each record DBRowSet.deleteRecord() will be called. 
+     *            The option "ON DELETE CASCADE" will NOT be added to the DDL generated for the relation. 
+     * 
+     *
+ */ + public static enum DBCascadeAction + { + NONE, + CASCADE, + CASCADE_RECORDS + } public static class DBReference implements Serializable { - private final static long serialVersionUID = 1L; + private final static long serialVersionUID = 1L; private DBTableColumn sourceColumn; - private DBTableColumn targetColumn; + private DBTableColumn targetColumn; public DBReference(DBTableColumn sourceColumn, DBTableColumn targetColumn) { @@ -56,6 +80,7 @@ public class DBRelation extends DBObject private DBDatabase db; private String name; private DBReference[] references; + private DBCascadeAction onDeleteAction; /** * Creates a DBRelation object for a foreing key relation. @@ -63,13 +88,27 @@ public class DBRelation extends DBObject * @param db the database object * @param name the name * @param references the references for this relation + * @param onDeleteAction specifies the action performed when deleting affected records. */ - public DBRelation(DBDatabase db, String name, DBReference[] references) + public DBRelation(DBDatabase db, String name, DBReference[] references, DBCascadeAction onDeleteAction) { this.db = db; this.name = name; this.references = references; + this.onDeleteAction = onDeleteAction; } + + /** + * Creates a DBRelation object for a foreing key relation. + * + * @param db the database object + * @param name the name + * @param references the references for this relation + */ + public DBRelation(DBDatabase db, String name, DBReference[] references) + { + this(db, name, references, DBCascadeAction.NONE); + } /** * Returns the name. @@ -107,5 +146,51 @@ public class DBRelation extends DBObject { return db; } + + /** + * return the action to perform when deleting affected records. + * See DBCascadeAction enum for details. + * + * @return the action to perform when deleting affected records + */ + public DBCascadeAction getOnDeleteAction() + { + return onDeleteAction; + } + + /** + * sets the action taken when deleting records that affect this foreign key relation + * See DBCascadeAction enum for details. + * + * @param onDeleteAction the action to perform when deleting affected records + */ + public void setOnDeleteAction(DBCascadeAction onDeleteAction) + { + this.onDeleteAction = onDeleteAction; + } + + /** + * short for + * 
 
+     *  setOnDeleteAction(DBCascadeAction.CASCADE);
+     *
+ * See DBCascadeAction enum for details. + */ + public void onDeleteCascade() + { + setOnDeleteAction(DBCascadeAction.CASCADE); + } + + /** + * short for + * 
 
+     *  setOnDeleteAction(DBCascadeAction.CASCADE);
+     *
+ * See DBCascadeAction enum for details. + */ + public void onDeleteCascadeRecords() + { + setOnDeleteAction(DBCascadeAction.CASCADE_RECORDS); + } } \ No newline at end of file Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Sun Mar 11 12:03:06 2012 @@ -30,6 +30,7 @@ import org.apache.empire.commons.ObjectU import org.apache.empire.commons.StringUtils; import org.apache.empire.data.Column; import org.apache.empire.data.DataType; +import org.apache.empire.db.DBRelation.DBCascadeAction; import org.apache.empire.db.DBRelation.DBReference; import org.apache.empire.db.exceptions.FieldNotNullException; import org.apache.empire.db.exceptions.NoPrimaryKeyException; @@ -754,7 +755,10 @@ public abstract class DBRowSet extends D return; // No primary key - no references! // Find all relations for (DBRelation rel : relations) - { // References + { // Check cascade + if (rel.getOnDeleteAction()!=DBCascadeAction.CASCADE_RECORDS) + continue; + // References DBReference[] refs = rel.getReferences(); for (int i=0; iserialVersionUID + */ + private static final long serialVersionUID = 1L; + + @SuppressWarnings("hiding") + public static final ErrorType errorType = new ErrorType("error.db.statementFailed", "Error executing statement {0}.\r\nNative error is: {1}"); + + public StatementFailedException(DBObject obj, String sqlCmd, SQLException cause) + { + super(StatementFailedException.errorType, new String[] { sqlCmd, messageFromSQLException(driverFromObject(obj), cause) }, cause); + } + + /** + * log the error + */ + @Override + protected void log() + { + if ( log.isErrorEnabled() ) + log.error(getMessage()); + else + super.log(); + } +} Propchange: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/StatementFailedException.java ------------------------------------------------------------------------------ eol-style = native Propchange: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/exceptions/StatementFailedException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanIncompatibleException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanIncompatibleException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanIncompatibleException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanIncompatibleException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class BeanIncompatibleException e */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.BeanIncompatible", "The class {0} is not compatible with {1}."); + public static final ErrorType errorType = new ErrorType("error.beanIncompatible", "The class {0} is not compatible with {1}."); public BeanIncompatibleException(Class clazz, DBRowSet rowset) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanInstantiationException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanInstantiationException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanInstantiationException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanInstantiationException.java Sun Mar 11 12:03:06 2012 @@ -32,7 +32,7 @@ public class BeanInstantiationException */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.BeanInstantiation", "Unable create an instance of type {0}."); + public static final ErrorType errorType = new ErrorType("error.beanInstantiationFailed", "Unable create an instance of type {0}."); public BeanInstantiationException(Class clazz, Throwable cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertyGetException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertyGetException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertyGetException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertyGetException.java Sun Mar 11 12:03:06 2012 @@ -32,7 +32,7 @@ public class BeanPropertyGetException ex */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.PropertyGet", "Unable to get the property {0} from type {1}."); + public static final ErrorType errorType = new ErrorType("error.propertyGetError", "Unable to get the property {0} from type {1}."); public BeanPropertyGetException(Object bean, String property, Throwable cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertySetException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertySetException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertySetException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/BeanPropertySetException.java Sun Mar 11 12:03:06 2012 @@ -32,7 +32,7 @@ public class BeanPropertySetException ex */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.PropertySet", "The property {0} cannot be set on type {1}."); + public static final ErrorType errorType = new ErrorType("error.propertySetError", "The property {0} cannot be set on type {1}."); public BeanPropertySetException(Object bean, String property, Throwable cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileParseException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileParseException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileParseException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileParseException.java Sun Mar 11 12:03:06 2012 @@ -27,7 +27,7 @@ public class FileParseException extends */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.FileParseException", "The file {0} has an invalid format."); + public static final ErrorType errorType = new ErrorType("error.fileParseError", "The file {0} has an invalid format."); public FileParseException(String fileName, Exception cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileReadException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileReadException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileReadException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileReadException.java Sun Mar 11 12:03:06 2012 @@ -29,7 +29,7 @@ public class FileReadException extends E */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.FileReadException", "Error reading the file {0}. Message is: {1}."); + public static final ErrorType errorType = new ErrorType("error.fileReadError", "Error reading the file {0}. Message is: {1}."); public FileReadException(String fileName, IOException cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileWriteException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileWriteException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileWriteException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/FileWriteException.java Sun Mar 11 12:03:06 2012 @@ -29,7 +29,7 @@ public class FileWriteException extends */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.FileWriteException", "Error writing the file {0}. Message is: {1}."); + public static final ErrorType errorType = new ErrorType("error.fileWriteError", "Error writing the file {0}. Message is: {1}."); public FileWriteException(String fileName, IOException cause) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidArgumentException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidArgumentException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidArgumentException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidArgumentException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class InvalidArgumentException ex */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.invalidarg", "Invalid Argument {0} for parameter {1}."); + public static final ErrorType errorType = new ErrorType("error.invalidArgument", "Invalid Argument {0} for parameter {1}."); public InvalidArgumentException(String param, Object value) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidPropertyException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidPropertyException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidPropertyException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/InvalidPropertyException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class InvalidPropertyException ex */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.PropertyInvalid", "The property {0} is not valid. Current value is {1}."); + public static final ErrorType errorType = new ErrorType("error.propertyInvalid", "The property {0} is not valid. Current value is {1}."); public InvalidPropertyException(String property, Object value) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemExistsException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemExistsException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemExistsException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemExistsException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class ItemExistsException extends */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.itemexists", "The element {0} already exists."); + public static final ErrorType errorType = new ErrorType("error.itemExists", "The element {0} already exists."); public ItemExistsException(Object item) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemNotFoundException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemNotFoundException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemNotFoundException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ItemNotFoundException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class ItemNotFoundException exten */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.itemnotfound", "The element {0} was not found."); + public static final ErrorType errorType = new ErrorType("error.itemNotFound", "The element {0} was not found."); public ItemNotFoundException(Object item) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotImplementedException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotImplementedException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotImplementedException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotImplementedException.java Sun Mar 11 12:03:06 2012 @@ -27,7 +27,7 @@ public class NotImplementedException ext */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.notimplemented", "The function {0} is not implemented for type {1}."); + public static final ErrorType errorType = new ErrorType("error.notImplemented", "The function {0} is not implemented for type {1}."); public NotImplementedException(Object object, String functionName) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotSupportedException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotSupportedException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotSupportedException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/NotSupportedException.java Sun Mar 11 12:03:06 2012 @@ -27,7 +27,7 @@ public class NotSupportedException exten */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.notsupported", "The function {0} is not supported for type {1}."); + public static final ErrorType errorType = new ErrorType("error.notSupported", "The function {0} is not supported for type {1}."); public NotSupportedException(Object object, String functionName) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ObjectNotValidException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ObjectNotValidException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ObjectNotValidException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/ObjectNotValidException.java Sun Mar 11 12:03:06 2012 @@ -27,7 +27,7 @@ public class ObjectNotValidException ext */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.objectnotvalid", "The object of type {0} has not been initialized."); + public static final ErrorType errorType = new ErrorType("error.objectNotValid", "The object of type {0} has not been initialized."); public ObjectNotValidException(Object obj) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/PropertyReadOnlyException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/PropertyReadOnlyException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/PropertyReadOnlyException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/PropertyReadOnlyException.java Sun Mar 11 12:03:06 2012 @@ -27,7 +27,7 @@ public class PropertyReadOnlyException e */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.PropertyReadOnly", "The property {0} is read only."); + public static final ErrorType errorType = new ErrorType("error.propertyIsReadOnly", "The property {0} is read only."); public PropertyReadOnlyException(String property) { Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/UnexpectedReturnValueException.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/UnexpectedReturnValueException.java?rev=1299349&r1=1299348&r2=1299349&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/UnexpectedReturnValueException.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/UnexpectedReturnValueException.java Sun Mar 11 12:03:06 2012 @@ -28,7 +28,7 @@ public class UnexpectedReturnValueExcept */ private static final long serialVersionUID = 1L; - public static final ErrorType errorType = new ErrorType("error.UnexpectedReturnValueException", "Unexpected return value {0} for function {1}."); + public static final ErrorType errorType = new ErrorType("error.unexpectedReturnValue", "Unexpected return value {0} for function {1}."); public UnexpectedReturnValueException(Object value, String function) {