empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1070406 [1/2] - in /incubator/empire-db/trunk: empire-db-codegen/src/main/java/org/apache/empire/db/codegen/ empire-db-codegen/src/test/java/org/apache/empire/db/codegen/ empire-db-examples/empire-db-example-advanced/src/main/java/org/apac...
Date Mon, 14 Feb 2011 08:35:35 GMT
Author: doebele
Date: Mon Feb 14 08:35:33 2011
New Revision: 1070406

URL: http://svn.apache.org/viewvc?rev=1070406&view=rev
Log:
EMPIREDB-97
Contribution from Eike Kettner on Feb 14th 2011

Added:
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/db/SerializeTest.java   (with props)
Modified:
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java
    incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/db/SampleDB.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/db/SampleDB.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDBException.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleDB.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleRecord.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleTable.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/DepartmentRecord.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/EmployeeRecord.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/EmpireException.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorInfo.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBIndex.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTableColumn.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConvertExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBDecodeExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBFuncExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExprEx.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/order/DBOrderByExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/set/DBSetExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBCommandOracle.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDataDictionnary.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleRowNumExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleSYSDatabase.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/EmpireExceptionTest.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ErrorsTest.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/db/CompanyDB.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/db/DBCommandTest.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/db/MockDriver.java

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java Mon Feb 14 08:35:33 2011
@@ -18,18 +18,6 @@
  */
 package org.apache.empire.db.codegen;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.data.DataType;
@@ -41,6 +29,18 @@ import org.apache.empire.db.DBTableColum
 import org.apache.empire.db.DBView;
 import org.apache.empire.db.DBView.DBViewColumn;
 import org.apache.empire.db.codegen.util.DBUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class is used to create a in memory DBDatabase of a given SQLConnection
@@ -51,9 +51,12 @@ import org.apache.empire.db.codegen.util
 public class CodeGenParser extends ErrorObject {
 
 	public static class InMemoryDatabase extends DBDatabase {
+        private static final long serialVersionUID = 1L;
 	}
 	
 	public static class InMemoryView extends DBView {
+    private final static long serialVersionUID = 1L;
+
 		public InMemoryView(String name, DBDatabase db) {
 			super(name, db);
 		}

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java Mon Feb 14 08:35:33 2011
@@ -99,7 +99,7 @@ public class CodeGenWriter {
 				new CommonsLogLogChute());
 		if(config.getTemplateFolder() == null){
 			engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
-			engine.setProperty("classpath." + VelocityEngine.RESOURCE_LOADER + ".class", ClasspathResourceLoader.class.getName());
+			engine.setProperty("classpath." + RuntimeConstants.RESOURCE_LOADER + ".class", ClasspathResourceLoader.class.getName());
 			config.setTemplateFolder("templates");
 		}else{
 			File templateFolder = new File(config.getTemplateFolder());

Modified: incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java Mon Feb 14 08:35:33 2011
@@ -37,14 +37,14 @@ public class CodeGenTest
 	}
 
     @Test
+    @SuppressWarnings("serial")
     public void testCodeGen()
     {
         CodeGenConfig config = new CodeGenConfig();
         config.init("testconfig.xml", true);
         CodeGenWriter codeGen = new CodeGenWriter(config);
         
-        DBDatabase db = new DBDatabase()
-        {
+        DBDatabase db = new DBDatabase() {
         };
         
         List<File> files = codeGen.generateCodeFiles(db);

Modified: incubator/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/incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java Mon Feb 14 08:35:33 2011
@@ -47,11 +47,15 @@ import org.apache.empire.db.DBView;
  */
 public class SampleAdvDB extends DBDatabase
 {
+    private final static long serialVersionUID = 1L;
+
     /**
      * This class represents the definition of the Departments table.
      */
     public static class Departments extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+
         public final DBTableColumn C_DEPARTMENT_ID;
         public final DBTableColumn C_NAME;
         public final DBTableColumn C_HEAD;
@@ -82,6 +86,8 @@ public class SampleAdvDB extends DBDatab
      */
     public static class Employees extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn C_EMPLOYEE_ID;
         public final DBTableColumn C_SALUTATION;
         public final DBTableColumn C_FIRSTNAME;
@@ -137,6 +143,8 @@ public class SampleAdvDB extends DBDatab
      */
     public static class EmployeeDepartmentHistory extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn C_EMPLOYEE_ID;
         public final DBTableColumn C_DEPARTMENT_ID;
         public final DBTableColumn C_DATE_FROM;
@@ -159,6 +167,8 @@ public class SampleAdvDB extends DBDatab
      */
     public static class EmployeeDepSinceView extends DBView
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBViewColumn C_EMPLOYEE_ID;
         public final DBViewColumn C_MAX_DATE_FROM;
         
@@ -199,6 +209,8 @@ public class SampleAdvDB extends DBDatab
      */
     public static class EmployeeInfoView extends DBView
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBViewColumn C_EMPLOYEE_ID;
         public final DBViewColumn C_CURRENT_DEP_ID;
         public final DBViewColumn C_NAME_AND_DEP;

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java Mon Feb 14 08:35:33 2011
@@ -43,11 +43,15 @@ import org.apache.empire.db.DBTableColum
  */
 public class SampleDB extends DBDatabase
 {
+    private final static long serialVersionUID = 1L;
+
     /**
      * This class represents the definition of the Departments table.
      */
     public static class Departments extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn DEPARTMENT_ID;
         public final DBTableColumn NAME;
         public final DBTableColumn HEAD;
@@ -78,6 +82,8 @@ public class SampleDB extends DBDatabase
      */
     public static class Employees extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn EMPLOYEE_ID;
         public final DBTableColumn SALUTATION;
         public final DBTableColumn FIRSTNAME;

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/db/SampleDB.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/db/SampleDB.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/db/SampleDB.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/db/SampleDB.java Mon Feb 14 08:35:33 2011
@@ -42,11 +42,15 @@ import org.apache.empire.db.DBTableColum
  */
 public class SampleDB extends DBDatabase
 {
+    private final static long serialVersionUID = 1L;
+
     /**
      * This class represents the definition of the Departments table.
      */
     public static class Departments extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn DEPARTMENT_ID;
         public final DBTableColumn NAME;
         public final DBTableColumn HEAD;
@@ -77,6 +81,8 @@ public class SampleDB extends DBDatabase
      */
     public static class Employees extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn EMPLOYEE_ID;
         public final DBTableColumn SALUTATION;
         public final DBTableColumn FIRSTNAME;

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/db/SampleDB.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/db/SampleDB.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/db/SampleDB.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/db/SampleDB.java Mon Feb 14 08:35:33 2011
@@ -43,11 +43,16 @@ import org.apache.empire.db.DBTableColum
  */
 public class SampleDB extends DBDatabase
 {
+    private final static long serialVersionUID = 1L;
+
     /**
      * This class represents the definition of the Departments table.
      */
     public static class Departments extends DBTable
     {
+
+        private final static long serialVersionUID = 1L;
+
         public final DBTableColumn DEPARTMENT_ID;
         public final DBTableColumn NAME;
         public final DBTableColumn HEAD;
@@ -78,6 +83,8 @@ public class SampleDB extends DBDatabase
      */
     public static class Employees extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public final DBTableColumn EMPLOYEE_ID;
         public final DBTableColumn SALUTATION;
         public final DBTableColumn FIRSTNAME;

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDBException.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDBException.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDBException.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDBException.java Mon Feb 14 08:35:33 2011
@@ -28,10 +28,7 @@ import org.springframework.dao.Uncategor
  */
 public class EmpireDBException extends UncategorizedDataAccessException {
 
-    /**
-     * Comment for <code>serialVersionUID</code>
-     */
-    private static final long serialVersionUID = 7451019261510054061L;
+    private static final long serialVersionUID = 1L;
 
     public EmpireDBException(String msg, Throwable cause) {
         super(msg, cause);

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleDB.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleDB.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleDB.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleDB.java Mon Feb 14 08:35:33 2011
@@ -29,6 +29,8 @@ import org.apache.empire.struts2.websamp
 
 public class SampleDB extends DBDatabase
 {
+    private final static long serialVersionUID = 1L;
+  
     // Static Access
     public static SampleDB getInstance()
     {

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleRecord.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleRecord.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleRecord.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleRecord.java Mon Feb 14 08:35:33 2011
@@ -24,6 +24,8 @@ import org.apache.empire.struts2.websamp
 
 public class SampleRecord extends DBRecord
 {
+    private final static long serialVersionUID = 1L;
+  
     // DBRecord members
     protected SampleContext context;
     

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleTable.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleTable.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleTable.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/SampleTable.java Mon Feb 14 08:35:33 2011
@@ -31,6 +31,7 @@ import org.apache.empire.db.DBTableColum
  */
 public class SampleTable extends DBTable
 {
+    private final static long serialVersionUID = 1L;
     public final String MESSAGE_KEY_PREFIX = "!field.title.";
     
     public SampleTable(String name, DBDatabase db)

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/DepartmentRecord.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/DepartmentRecord.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/DepartmentRecord.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/DepartmentRecord.java Mon Feb 14 08:35:33 2011
@@ -24,6 +24,8 @@ import org.apache.empire.struts2.websamp
 
 public class DepartmentRecord extends SampleRecord
 {
+    private final static long serialVersionUID = 1L;
+  
     public static final SampleDB.Departments T = SampleDB.getInstance().T_DEPARTMENTS;  
 
     // Department Record

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/EmployeeRecord.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/EmployeeRecord.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/EmployeeRecord.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/db/records/EmployeeRecord.java Mon Feb 14 08:35:33 2011
@@ -28,6 +28,8 @@ import org.apache.empire.struts2.websamp
 
 public class EmployeeRecord extends SampleRecord
 {
+    private final static long serialVersionUID = 1L;
+  
     public static final SampleDB.Employees T = SampleDB.getInstance().T_EMPLOYEES;  
  
     /*

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java Mon Feb 14 08:35:33 2011
@@ -18,10 +18,7 @@
  */
 package org.apache.empire.struts2.jsp.controls;
 
-import java.util.Locale;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang.xwork.StringEscapeUtils;
 import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.ErrorType;
 import org.apache.empire.commons.Options;
@@ -31,7 +28,10 @@ import org.apache.empire.struts2.action.
 import org.apache.empire.struts2.html.HtmlTagDictionary;
 import org.apache.empire.struts2.html.HtmlWriter;
 import org.apache.empire.struts2.html.HtmlWriter.HtmlTag;
-import org.apache.commons.lang.xwork.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Locale;
 
 
 public abstract class InputControl
@@ -137,7 +137,10 @@ public abstract class InputControl
         {
             return errSource;
         }
-        
+        public String getErrorMessage()
+        {
+            return null;
+        }
     }
 
     /**
@@ -263,8 +266,8 @@ public abstract class InputControl
      * to the data type of the supplied column
      * 
      * @param value the value string from the request
-     * @param the user locale 
-     * @param the column for which the value is supplied 
+     * @param locale the user locale
+     * @param column the column for which the value is supplied
      * 
      * @return the parsed value
      */
@@ -278,7 +281,7 @@ public abstract class InputControl
      * previously been parsed 
      * 
      * @param value the parsed object value
-     * @param the column for which the value should be validated  
+     * @param column the column for which the value should be validated
      * @param s the unparsed value string. In case of an error this should be forwarded to the error function. 
      * 
      * @return the parsed value

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java Mon Feb 14 08:35:33 2011
@@ -86,7 +86,6 @@ public class ActionErrorsTag extends Emp
     
     // ------- render helpers -------
     
-    @SuppressWarnings("null")
     private void renderAllErrors(HtmlWriter w, ActionErrorProvider provider)
     {
         // Get errors

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/EmpireException.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/EmpireException.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/EmpireException.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/EmpireException.java Mon Feb 14 08:35:33 2011
@@ -18,9 +18,12 @@
  */
 package org.apache.empire;
 
+import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.ErrorType;
 
+import java.io.Serializable;
+
 /**
  * This exception type is used for all empire errors.<br>
  * Exceptions will only be thrown if exceptions are enabled in the ErrorObject.
@@ -31,24 +34,26 @@ public final class EmpireException exten
     private static final long serialVersionUID = 1L;
     
     private final ErrorType errorType;
-    private final ErrorObject errorObject; 
+    private final ErrorInfo errorObject;
+    private final String errorObjectClassname;
     
     /**
      * creates an empire exception from an error object.
      * @param errorObject
      */
-    public EmpireException(final ErrorObject errorObject)
+    public EmpireException(final ErrorInfo errorObject)
     {
         super(errorObject.getErrorMessage());
         // init
         this.errorType = errorObject.getErrorType();
-        this.errorObject = errorObject;
+        this.errorObject = new ErrorInfoImpl(errorObject);
+        this.errorObjectClassname = errorObject.getClass().getName();
     }
     
     @Override
     public String toString()
     {   // Return Object class name and error message
-        return errorObject.getClass().getName() + ": " + getMessage();
+        return errorObjectClassname + ": " + getMessage();
     }
 
     /**
@@ -64,8 +69,69 @@ public final class EmpireException exten
     /**
      * @return the object that caused the error
      */
-    public ErrorObject getErrorObject()
+    public ErrorInfo getErrorObject()
     {
         return errorObject;
     }
+
+    /**
+     * A serializable version of {@link ErrorInfo}.
+     */
+    private static class ErrorInfoImpl implements ErrorInfo, Serializable {
+        private static final long serialVersionUID = 1L;
+        
+        private final boolean hasError;
+        private final ErrorType errorType;
+        private final Serializable[] errorParams;
+        private final String errorSource;
+        private final String errorMessage;
+
+        /**
+         * Copy ctor.
+         * @param errorInfo
+         */
+        ErrorInfoImpl(ErrorInfo errorInfo) {
+            this.hasError = errorInfo.hasError();
+            this.errorType = errorInfo.getErrorType();
+            Object[] params = errorInfo.getErrorParams();
+            if (params != null) {
+                this.errorParams = new Serializable[params.length];
+                for (int i=0; i<params.length; i++) {
+                  Object p = params[i];
+                  if (p == null) {
+                      this.errorParams[i] = null;
+                  } else if (p instanceof Serializable) {
+                      Serializable serializable = (Serializable) p;
+                      this.errorParams[i] = serializable;
+                  } else {
+                      this.errorParams[i] = p.toString();
+                  }
+                }
+            } else {
+                this.errorParams = null;
+            }
+            this.errorSource = errorInfo.getErrorSource();
+            this.errorMessage = errorInfo.getErrorMessage();
+        }
+
+        public boolean hasError() {
+            return hasError;
+        }
+
+        public ErrorType getErrorType() {
+            return errorType;
+        }
+
+        public Object[] getErrorParams() {
+            return errorParams;
+        }
+
+        public String getErrorSource() {
+            return errorSource;
+        }
+
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+    }
 }

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorInfo.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorInfo.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorInfo.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorInfo.java Mon Feb 14 08:35:33 2011
@@ -51,5 +51,11 @@ public interface ErrorInfo
    * @return the error message or null if no error has been set.
    */
   String getErrorSource();
-  
+
+  /**
+   * Returns the message associated with the last error.
+   *
+   * @return the error message or an empty string if no error has been set.
+   */
+  String getErrorMessage();
 }
\ No newline at end of file

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java Mon Feb 14 08:35:33 2011
@@ -18,12 +18,12 @@
  */
 package org.apache.empire.commons;
 
-import java.text.MessageFormat;
-import java.util.WeakHashMap;
-
+import org.apache.empire.EmpireException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.empire.EmpireException;
+
+import java.text.MessageFormat;
+import java.util.WeakHashMap;
 
 
 /**
@@ -220,11 +220,6 @@ public abstract class ErrorObject implem
         internalSetError(Errors.None, null, null);
     }
     
-    /**
-     * Returns the message associated with the last error.
-     * 
-     * @return the error message or an empty string if no error has been set.
-     */
     public final String getErrorMessage()
     {
         return getMessage(this);

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java Mon Feb 14 08:35:33 2011
@@ -21,6 +21,8 @@ package org.apache.empire.commons;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+
 /**
  * The ErrorType class defines a type of error.
  * In order to define an error you need to provide an ErrorKey and a MessagePattern.
@@ -32,8 +34,9 @@ import org.slf4j.LoggerFactory;
  * The MessagePattern must be formated according to the {@link java.text.MessageFormat} rules.
  * <P>
  */
-public class ErrorType
+public class ErrorType implements Serializable
 {
+    private static final long serialVersionUID = 1L;
     private static final Logger log = LoggerFactory.getLogger(ErrorType.class);
 
     private final String key;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java Mon Feb 14 08:35:33 2011
@@ -19,13 +19,13 @@
 package org.apache.empire.db;
 
 // Java
-import java.util.Set;
-
 import org.apache.empire.commons.Options;
 import org.apache.empire.data.Column;
 import org.apache.empire.db.expr.set.DBSetExpr;
 import org.w3c.dom.Element;
 
+import java.util.Set;
+
 
 /**
  * This is the base class for all database columns that have a physical representation.
@@ -42,6 +42,8 @@ import org.w3c.dom.Element;
 public abstract class DBColumn extends DBColumnExpr
     implements Column
 {
+    private final static long serialVersionUID = 1L;
+  
     // Predefined column attributes 
 
     /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java Mon Feb 14 08:35:33 2011
@@ -19,10 +19,6 @@
 package org.apache.empire.db;
 
 // java
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.empire.commons.Attributes;
 import org.apache.empire.commons.OptionEntry;
 import org.apache.empire.commons.Options;
@@ -44,6 +40,10 @@ import org.apache.empire.db.expr.compare
 import org.apache.empire.db.expr.order.DBOrderByExpr;
 import org.w3c.dom.Element;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * This class is the base class for all expressions that represent a single value.
@@ -52,6 +52,8 @@ import org.w3c.dom.Element;
 public abstract class DBColumnExpr extends DBExpr
     implements ColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     // Predefined column expression attributes
     public static final String DBCOLATTR_TITLE     = "title";
     public static final String DBCOLATTR_TYPE      = "type";

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java Mon Feb 14 08:35:33 2011
@@ -18,11 +18,11 @@
  */
 package org.apache.empire.db;
 
+import org.apache.empire.db.expr.order.DBOrderByExpr;
+
 import java.util.ArrayList;
 import java.util.Set;
 
-import org.apache.empire.db.expr.order.DBOrderByExpr;
-
 /**
  * This class is used for building up a partition of a SQL-Command.
  * It handles the insert from a specified key word between two DBCommandExpr objects.
@@ -32,6 +32,8 @@ import org.apache.empire.db.expr.order.D
  */
 public class DBCombinedCmd extends DBCommandExpr
 {
+   private final static long serialVersionUID = 1L;
+  
    // Members
    protected DBCommandExpr left;
    protected DBCommandExpr right;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java Mon Feb 14 08:35:33 2011
@@ -18,16 +18,6 @@
  */
 package org.apache.empire.db;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.EmpireException;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.data.DataType;
@@ -36,6 +26,16 @@ import org.apache.empire.db.expr.compare
 import org.apache.empire.db.expr.join.DBJoinExpr;
 import org.apache.empire.db.expr.join.DBJoinExprEx;
 import org.apache.empire.db.expr.set.DBSetExpr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
 
 
 /**
@@ -46,8 +46,11 @@ import org.apache.empire.db.expr.set.DBS
 public abstract class DBCommand extends DBCommandExpr
     implements Cloneable
 {
+    private final static long serialVersionUID = 1L;
+
     public static final class DBCommandParam extends DBExpr
     {
+        private final static long serialVersionUID = 1L;
         protected DBCommand cmd;
         protected DataType  type;
         protected Object    value;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java Mon Feb 14 08:35:33 2011
@@ -19,17 +19,17 @@
 package org.apache.empire.db;
 
 // java
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.Options;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.expr.order.DBOrderByExpr;
 import org.w3c.dom.Element;
 
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 
 /**
  * This abstract class handles the creation of the SQL-Commands.
@@ -40,9 +40,12 @@ import org.w3c.dom.Element;
  */
 public abstract class DBCommandExpr extends DBExpr
 {
+    private final static long serialVersionUID = 1L;
+
     // Internal Classes
     protected static class DBCmdQuery extends DBRowSet
     {
+        private final static long serialVersionUID = 1L;
         private DBCommandExpr cmd;
 
         /**
@@ -161,6 +164,7 @@ public abstract class DBCommandExpr exte
      */
     protected static class DBCmdColumn extends DBColumn
     {
+        private final static long serialVersionUID = 1L;
         private DBColumnExpr expr;
 
         /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java Mon Feb 14 08:35:33 2011
@@ -18,6 +18,14 @@
  */
 package org.apache.empire.db;
 
+import org.apache.empire.commons.Errors;
+import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.commons.Options;
+import org.apache.empire.data.DataType;
+import org.apache.empire.db.expr.column.DBValueExpr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,14 +34,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.empire.commons.Errors;
-import org.apache.empire.commons.ObjectUtils;
-import org.apache.empire.commons.Options;
-import org.apache.empire.data.DataType;
-import org.apache.empire.db.expr.column.DBValueExpr;
-
 
 /**
  * This abstract class is the applicaton's interface for a particular database schema.
@@ -46,14 +46,16 @@ import org.apache.empire.db.expr.column.
  */
 public abstract class DBDatabase extends DBObject
 {
+    private final static long serialVersionUID = 1L;
+  
     /**
      * This class represents the database systems current date and time.
      * <P>
      * There is no need to use this class directly.<BR>
      * Instead you can use the constant {@link DBDatabase#SYSDATE}
      */
-    public static final class DBSystemDate 
-    {   
+    public static final class DBSystemDate
+    {
         // System Date Class for internal use
         private DBSystemDate() 
         { 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java Mon Feb 14 08:35:33 2011
@@ -18,6 +18,17 @@
  */
 package org.apache.empire.db;
 
+import org.apache.empire.commons.DateUtils;
+import org.apache.empire.commons.ErrorObject;
+import org.apache.empire.commons.Errors;
+import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.commons.StringUtils;
+import org.apache.empire.data.DataMode;
+import org.apache.empire.data.DataType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -31,23 +42,14 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.empire.commons.DateUtils;
-import org.apache.empire.commons.ErrorObject;
-import org.apache.empire.commons.Errors;
-import org.apache.empire.commons.ObjectUtils;
-import org.apache.empire.commons.StringUtils;
-import org.apache.empire.data.DataMode;
-import org.apache.empire.data.DataType;
-
-
 /**
  * The DBDatabaseDriver class is an abstract base class for all database drivers.
  * Its purpose is to handle everything that is - or might be - database vendor specific. 
  */
-public abstract class DBDatabaseDriver extends ErrorObject
+public abstract class DBDatabaseDriver extends ErrorObject implements Serializable
 {
+    private final static long serialVersionUID = 1L;
+  
     // sql-phrases
     public static final int SQL_NULL_VALUE       = 1;   // Oracle: null
     public static final int SQL_PARAMETER        = 2;   // Oracle: ?
@@ -132,6 +134,8 @@ public abstract class DBDatabaseDriver e
      */
     public static class DBSeqTable extends DBTable
     {
+        private final static long serialVersionUID = 1L;
+      
         public DBColumn C_SEQNAME;
         public DBColumn C_SEQVALUE;
         public DBColumn C_TIMESTAMP;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java Mon Feb 14 08:35:33 2011
@@ -19,14 +19,14 @@
 package org.apache.empire.db;
 
 // java
+import org.apache.empire.data.DataType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Collection;
 import java.util.Date;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.empire.data.DataType;
-
 
 /**
  * This abstract class is the base class for all database expression classes (e.g. DBAliasExpr or DBCalsExpr)
@@ -36,6 +36,8 @@ import org.apache.empire.data.DataType;
  */
 public abstract class DBExpr extends DBObject
 {
+    private final static long serialVersionUID = 1L;
+  
     // SQL Context Flags
     public static final long CTX_DEFAULT       = 7;  // Default: FullyQualified + Value
     public static final long CTX_ALL           = 15; // All Flags set (except exclusions)

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBIndex.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBIndex.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBIndex.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBIndex.java Mon Feb 14 08:35:33 2011
@@ -27,6 +27,8 @@ package org.apache.empire.db;
  */
 public class DBIndex extends DBObject
 {
+    private final static long serialVersionUID = 1L;
+  
     // Index Types
     // TODO convert to an enum?
     /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java Mon Feb 14 08:35:33 2011
@@ -19,12 +19,13 @@
 package org.apache.empire.db;
 
 // java.sql
-import java.sql.SQLException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.ErrorType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Serializable;
+import java.sql.SQLException;
 
 
 /**
@@ -33,8 +34,9 @@ import org.apache.empire.commons.ErrorTy
  * 
  *
  */
-public abstract class DBObject extends ErrorObject
+public abstract class DBObject extends ErrorObject implements Serializable
 {
+    private static final long serialVersionUID = 1L;
     // Logger
     private static final Logger log = LoggerFactory.getLogger(DBObject.class);
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java Mon Feb 14 08:35:33 2011
@@ -18,12 +18,6 @@
  */
 package org.apache.empire.db;
 
-import java.sql.Connection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.Options;
@@ -34,6 +28,12 @@ import org.apache.empire.db.expr.compare
 import org.apache.empire.db.expr.join.DBJoinExpr;
 import org.w3c.dom.Element;
 
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /**
  * This class can be used to wrap a query from a DBCommand and use it like a DBRowSet.<BR>
@@ -49,8 +49,11 @@ import org.w3c.dom.Element;
  */
 public class DBQuery extends DBRowSet
 {
+    private final static long serialVersionUID = 1L;
+
     public static class DBQueryColumn extends DBColumn
     {
+        private final static long serialVersionUID = 1L;
         protected DBColumnExpr expr;
 
         /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java Mon Feb 14 08:35:33 2011
@@ -18,6 +18,20 @@
  */
 package org.apache.empire.db;
 
+import org.apache.commons.beanutils.ConstructorUtils;
+import org.apache.empire.commons.Errors;
+import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.data.ColumnExpr;
+import org.apache.empire.data.DataType;
+import org.apache.empire.xml.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
@@ -29,17 +43,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.beanutils.ConstructorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.empire.commons.Errors;
-import org.apache.empire.commons.ObjectUtils;
-import org.apache.empire.data.ColumnExpr;
-import org.apache.empire.data.DataType;
-import org.apache.empire.xml.XMLUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
 
 /**
  * <P>
@@ -65,6 +68,8 @@ import org.w3c.dom.Element;
  */
 public class DBReader extends DBRecordData
 {
+    private final static long serialVersionUID = 1L;
+  
     public abstract class DBReaderIterator implements Iterator<DBRecordData>
     {
         protected int curCount = 0;
@@ -870,7 +875,13 @@ public class DBReader extends DBRecordDa
             openResultSets.remove(this);
         }
     }
-    
+
+    private void writeObject(ObjectOutputStream stream) throws IOException {
+        if (rset != null) {
+            throw new NotSerializableException(DBReader.class.getName() + " (due to attached ResultSet)");
+        }
+    }
+
     /**
      * copied from org.apache.commons.beanutils.ConstructorUtils since it's private there
      */

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Mon Feb 14 08:35:33 2011
@@ -18,15 +18,8 @@
  */
 package org.apache.empire.db;
 
-import java.lang.reflect.InvocationTargetException;
-import java.sql.Connection;
-import java.util.Collection;
-import java.util.List;
-
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtilsBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.Options;
@@ -34,9 +27,16 @@ import org.apache.empire.data.Column;
 import org.apache.empire.data.ColumnExpr;
 import org.apache.empire.data.Record;
 import org.apache.empire.xml.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Connection;
+import java.util.Collection;
+import java.util.List;
+
 
 /**
  * 
@@ -45,6 +45,8 @@ import org.w3c.dom.Element;
  */
 public class DBRecord extends DBRecordData implements Record, Cloneable
 {
+    private final static long serialVersionUID = 1L;
+  
     /*
      * TODO convert to an enum?
      */

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java Mon Feb 14 08:35:33 2011
@@ -18,21 +18,21 @@
  */
 package org.apache.empire.db;
 // XML
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.Date;
-
 import org.apache.commons.beanutils.BeanUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.DateUtils;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.ColumnExpr;
 import org.apache.empire.data.RecordData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Date;
+
 
 /**
  * This interface defines for the classes DDRecordSet and DBRecord.
@@ -43,6 +43,8 @@ import org.w3c.dom.Element;
 public abstract class DBRecordData extends DBObject
 	implements RecordData
 {
+    private final static long serialVersionUID = 1L;
+  
     // Logger
     protected static final Logger log = LoggerFactory.getLogger(DBRecordData.class);
     

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java Mon Feb 14 08:35:33 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.empire.db;
 
+import java.io.Serializable;
+
 /**
  * This class creates a DBReferene object for a foreing key relation.
  * 
@@ -25,10 +27,13 @@ package org.apache.empire.db;
  */
 public class DBRelation extends DBObject
 {
-	public static class DBReference
+  private final static long serialVersionUID = 1L;
+
+	public static class DBReference implements Serializable
 	{
+      private final static long serialVersionUID = 1L;
 	    private DBTableColumn sourceColumn;
-        private DBTableColumn targetColumn;
+      private DBTableColumn targetColumn;
 	    
 	    public DBReference(DBTableColumn sourceColumn, DBTableColumn targetColumn)
 	    {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Mon Feb 14 08:35:33 2011
@@ -18,16 +18,6 @@
  */
 package org.apache.empire.db;
 
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.StringUtils;
@@ -35,6 +25,16 @@ import org.apache.empire.data.Column;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBRelation.DBReference;
 import org.apache.empire.db.expr.column.DBCountExpr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -47,6 +47,8 @@ import org.apache.empire.db.expr.column.
  */
 public abstract class DBRowSet extends DBExpr
 {
+    private final static long serialVersionUID = 1L;
+
     /**
      * This class is used to set the auto generated key of a record if the database does not support sequences.
      * It is used with the executeSQL function and only required for insert statements

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java Mon Feb 14 08:35:33 2011
@@ -19,16 +19,16 @@
 package org.apache.empire.db;
 
 // java
+import org.apache.empire.commons.Errors;
+import org.apache.empire.data.DataMode;
+import org.apache.empire.data.DataType;
+
 import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.empire.commons.Errors;
-import org.apache.empire.data.DataMode;
-import org.apache.empire.data.DataType;
-
 
 /**
  * This class represent one table of the database.
@@ -39,6 +39,7 @@ import org.apache.empire.data.DataType;
  */
 public class DBTable extends DBRowSet implements Cloneable
 {
+    private final static long serialVersionUID = 1L;
     private static AtomicInteger tableCount  = new AtomicInteger(0);
     private final String   name;
     private String         alias;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTableColumn.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTableColumn.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTableColumn.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTableColumn.java Mon Feb 14 08:35:33 2011
@@ -19,18 +19,18 @@
 package org.apache.empire.db;
 
 // Java
-import java.sql.Connection;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import org.apache.empire.commons.Attributes;
 import org.apache.empire.commons.Errors;
-import org.apache.empire.data.DataType;
 import org.apache.empire.data.DataMode;
+import org.apache.empire.data.DataType;
 import org.apache.empire.xml.XMLUtil;
 import org.w3c.dom.Element;
 
+import java.sql.Connection;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 
 /**
  * This class represent one column of a table.
@@ -41,6 +41,8 @@ import org.w3c.dom.Element;
  */
 public class DBTableColumn extends DBColumn
 {
+    private final static long serialVersionUID = 1L;
+
     // Column Information
     protected DataType  type;
     protected double    size;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java Mon Feb 14 08:35:33 2011
@@ -36,8 +36,12 @@ import org.w3c.dom.Element;
  */
 public abstract class DBView extends DBRowSet
 {
+    private final static long serialVersionUID = 1L;
+
     public static class DBViewColumn extends DBColumn
     {
+        private final static long serialVersionUID = 1L;
+      
         protected final DBColumnExpr expr;
         protected final DBColumn     updateColumn;
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java Mon Feb 14 08:35:33 2011
@@ -40,7 +40,6 @@ import org.apache.empire.db.DBSQLScript;
 import org.apache.empire.db.DBTable;
 import org.apache.empire.db.DBTableColumn;
 import org.apache.empire.db.DBView;
-import org.apache.empire.db.oracle.DBDatabaseDriverOracle.BooleanType;
 
 
 /**
@@ -50,13 +49,15 @@ import org.apache.empire.db.oracle.DBDat
  */
 public class DBDatabaseDriverDerby extends DBDatabaseDriver
 {
-	
-	private BooleanType booleanType = BooleanType.NUMBER;
+	private final static long serialVersionUID = 1L;
+  
     /**
      * Defines the Derby command type.
      */ 
     public static class DBCommandDerby extends DBCommand
     {
+        private final static long serialVersionUID = 1L;
+      
         public DBCommandDerby(DBDatabase db)
         {
             super(db);
@@ -162,9 +163,9 @@ public class DBDatabaseDriverDerby exten
         switch (type)
         {   // return support info 
             case CREATE_SCHEMA: return true;
-            case SEQUENCES:     return useSequenceTable;    
+            case SEQUENCES:     return useSequenceTable;
+            default:            return false;
         }
-        return false;
     }
     
     /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java Mon Feb 14 08:35:33 2011
@@ -36,6 +36,8 @@ import org.w3c.dom.Element;
  */
 public abstract class DBAbstractFuncExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected final DBColumnExpr expr;
     protected final DBColumn     updateColumn; // optional
     protected final boolean      isAggregate;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java Mon Feb 14 08:35:33 2011
@@ -19,15 +19,17 @@
 package org.apache.empire.db.expr.column;
 
 // Java
-import java.util.*;
-// XML
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
 import org.apache.empire.db.DBDatabase;
 import org.apache.empire.db.DBDatabaseDriver;
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
+
+import java.util.Set;
+
+// XML
 
 
 /**
@@ -39,6 +41,8 @@ import org.w3c.dom.*;
  */
 public class DBAliasExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final DBColumnExpr expr;
     private final String       alias;
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java Mon Feb 14 08:35:33 2011
@@ -19,8 +19,6 @@
 package org.apache.empire.db.expr.column;
 
 // Java
-import java.util.Set;
-
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
@@ -28,6 +26,8 @@ import org.apache.empire.db.DBDatabase;
 import org.apache.empire.db.DBExpr;
 import org.w3c.dom.Element;
 
+import java.util.Set;
+
 
 /**
  * This class is used for performing calculations in SQL<br>
@@ -40,6 +40,8 @@ import org.w3c.dom.Element;
  */
 public class DBCalcExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final DBColumnExpr expr;
     private final String       op;
     private final Object       value;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java Mon Feb 14 08:35:33 2011
@@ -18,8 +18,6 @@
  */
 package org.apache.empire.db.expr.column;
 
-import java.util.Set;
-
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
@@ -28,6 +26,8 @@ import org.apache.empire.db.expr.compare
 import org.apache.empire.xml.XMLUtil;
 import org.w3c.dom.Element;
 
+import java.util.Set;
+
 /**
  * This class is used to add the "case when ?=A then X else Y end" statement to the SQL-Command.
  * <P>
@@ -38,6 +38,8 @@ import org.w3c.dom.Element;
  */
 public class DBCaseExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final DBCompareExpr compExpr;
     private final DBColumnExpr  trueExpr;
     private final DBColumnExpr  elseExpr;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java Mon Feb 14 08:35:33 2011
@@ -19,9 +19,6 @@
 package org.apache.empire.db.expr.column;
 
 // Java
-import java.text.MessageFormat;
-import java.util.Set;
-
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
@@ -31,6 +28,9 @@ import org.apache.empire.db.DBExpr;
 import org.apache.empire.xml.XMLUtil;
 import org.w3c.dom.Element;
 
+import java.text.MessageFormat;
+import java.util.Set;
+
 
 /**
  * This class is used for performing string concatenation in SQL<br>
@@ -41,6 +41,8 @@ import org.w3c.dom.Element;
  */
 public class DBConcatExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected final DBColumnExpr left;
     protected final Object       right;
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConvertExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConvertExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConvertExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConvertExpr.java Mon Feb 14 08:35:33 2011
@@ -33,6 +33,8 @@ import org.apache.empire.db.DBDatabaseDr
  */
 public class DBConvertExpr extends DBAbstractFuncExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final Object format;
     
     /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java Mon Feb 14 08:35:33 2011
@@ -19,8 +19,6 @@
 package org.apache.empire.db.expr.column;
 
 // Java
-import java.util.Set;
-
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
@@ -29,6 +27,8 @@ import org.apache.empire.db.DBRowSet;
 import org.apache.empire.xml.XMLUtil;
 import org.w3c.dom.Element;
 
+import java.util.Set;
+
 
 /**
  * This class is used to add the "count" statement to the SQL-Command.
@@ -40,6 +40,8 @@ import org.w3c.dom.Element;
  */
 public class DBCountExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final DBRowSet rowset;
     private final DBColumnExpr column;
     private final boolean distinct;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBDecodeExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBDecodeExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBDecodeExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBDecodeExpr.java Mon Feb 14 08:35:33 2011
@@ -18,10 +18,6 @@
  */
 package org.apache.empire.db.expr.column;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
@@ -29,6 +25,10 @@ import org.apache.empire.db.DBColumnExpr
 import org.apache.empire.db.DBDatabaseDriver;
 import org.apache.empire.db.DBExpr;
 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * This class is used to decode a set of keys to the corresponding target values.
  * For most drivers this will be performed by the "case ? when A then X else Y end" statement.
@@ -40,6 +40,8 @@ import org.apache.empire.db.DBExpr;
  */
 public class DBDecodeExpr extends DBAbstractFuncExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     private final Map<?,?>  valueMap;
     private final Object    elseExpr;
     

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBFuncExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBFuncExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBFuncExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBFuncExpr.java Mon Feb 14 08:35:33 2011
@@ -38,6 +38,8 @@ import org.apache.empire.db.DBColumnExpr
  */
 public class DBFuncExpr extends DBAbstractFuncExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected final int          phrase;
     protected final Object[]     params;
     protected String             template;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java Mon Feb 14 08:35:33 2011
@@ -19,8 +19,6 @@
 package org.apache.empire.db.expr.column;
 
 // Java
-import java.util.Set;
-
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
@@ -29,6 +27,8 @@ import org.apache.empire.db.DBDatabaseDr
 import org.apache.empire.xml.XMLUtil;
 import org.w3c.dom.Element;
 
+import java.util.Set;
+
 
 /**
  * This class is used for declaring constant values in SQL.
@@ -40,6 +40,8 @@ import org.w3c.dom.Element;
  */
 public class DBValueExpr extends DBColumnExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     public final DBDatabase   db;
     public final Object       value;
     public final DataType     type;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java Mon Feb 14 08:35:33 2011
@@ -34,6 +34,8 @@ import org.apache.empire.db.DBDatabase;
  */
 public class DBCompareAndOrExpr extends DBCompareExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected final DBCompareExpr left;
     protected final DBCompareExpr right;
     protected final boolean       or;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java Mon Feb 14 08:35:33 2011
@@ -19,14 +19,14 @@
 package org.apache.empire.db.expr.compare;
 
 // java
-import java.util.Set;
-
 import org.apache.empire.db.DBCmpType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
 import org.apache.empire.db.DBDatabase;
 import org.apache.empire.db.DBExpr;
 
+import java.util.Set;
+
 
 /**
  * This class is used for defining filter constraints based on a column expression in SQL<br>
@@ -42,6 +42,8 @@ import org.apache.empire.db.DBExpr;
  */
 public class DBCompareColExpr extends DBCompareExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected final DBColumnExpr expr;
     protected final DBCmpType    cmpop;
     protected Object value;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareExpr.java Mon Feb 14 08:35:33 2011
@@ -27,6 +27,8 @@ import org.apache.empire.db.DBExpr;
  */
 public abstract class DBCompareExpr extends DBExpr
 {
+  private final static long serialVersionUID = 1L;
+  
 	public abstract boolean isMutuallyExclusive(DBCompareExpr other);
 
 	/**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java Mon Feb 14 08:35:33 2011
@@ -18,11 +18,11 @@
  */
 package org.apache.empire.db.expr.compare;
 
-import java.util.Set;
-
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBDatabase;
 
+import java.util.Set;
+
 
 /**
  * This class is used for defining filter constraints based on a column expression in SQL<br>
@@ -34,6 +34,8 @@ import org.apache.empire.db.DBDatabase;
  */
 public class DBCompareNotExpr extends DBCompareExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     public final DBCompareExpr expr;
 
     /**

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java Mon Feb 14 08:35:33 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.empire.db.expr.compare;
 
-import java.util.Set;
-
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBCommand;
 import org.apache.empire.db.DBCommandExpr;
 import org.apache.empire.db.DBDatabase;
 
+import java.util.Set;
+
 
 /**
  * This class is used for building up the SQL-Command for the EXISTS syntax.
@@ -34,6 +34,8 @@ import org.apache.empire.db.DBDatabase;
  */
 public class DBExistsExpr extends DBCompareExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     public final DBCommandExpr cmd;
     public final DBCompareExpr compareExpr;
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java Mon Feb 14 08:35:33 2011
@@ -18,8 +18,6 @@
  */
 package org.apache.empire.db.expr.join;
 
-import java.util.*;
-
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBColumnExpr;
 import org.apache.empire.db.DBDatabase;
@@ -28,6 +26,7 @@ import org.apache.empire.db.DBJoinType;
 import org.apache.empire.db.DBRowSet;
 import org.apache.empire.db.expr.compare.DBCompareExpr;
 
+import java.util.Set;
 
 /**
  * This class is used for building a join expression of an SQL statement.
@@ -39,6 +38,8 @@ import org.apache.empire.db.expr.compare
  */
 public class DBJoinExpr extends DBExpr
 {
+    private final static long serialVersionUID = 1L;
+  
     protected DBColumnExpr  left;
     protected DBColumnExpr  right;
     protected DBJoinType    type;

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExprEx.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExprEx.java?rev=1070406&r1=1070405&r2=1070406&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExprEx.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExprEx.java Mon Feb 14 08:35:33 2011
@@ -35,6 +35,7 @@ import org.apache.empire.db.expr.compare
  */
 public class DBJoinExprEx extends DBJoinExpr
 {
+    private final static long serialVersionUID = 1L;
     private final DBCompareExpr cmp;
     
     private static DBColumnExpr findFirstColumn(DBCompareExpr expr)



Mime
View raw message