You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by th...@apache.org on 2003/12/29 17:12:53 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/propertyEditors EditableTreeNodeWithProperties.java

thma        2003/12/29 08:12:53

  Modified:    src/java/org/apache/ojb/broker/metadata Tag: OJB_BRANCH_1_0
                        JdbcType.java ConnectionPoolDescriptor.java
                        AttributeDescriptorBase.java
                        ProcedureDescriptor.java ObjectCacheDescriptor.java
                        DeleteProcedureDescriptor.java
                        ConnectionRepository.java DescriptorRepository.java
                        UpdateProcedureDescriptor.java IndexDescriptor.java
                        DescriptorBase.java InsertProcedureDescriptor.java
                        FieldHelper.java SequenceDescriptor.java
                        ArgumentDescriptor.java
                        JdbcConnectionDescriptor.java FieldDescriptor.java
                        ClassDescriptor.java
               src/java/org/apache/ojb/broker/metadata/fieldaccess Tag:
                        OJB_BRANCH_1_0 PersistentFieldPrivilegedImpl.java
                        PersistentField.java
               src/java/org/apache/ojb/odmg/collections Tag: OJB_BRANCH_1_0
                        DMapImpl.java DMapEntry.java DListEntry.java
                        DListImpl.java DSetImpl.java DListEntry_2.java
               src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel
                        Tag: OJB_BRANCH_1_0 DBMetaTableNode.java
                        DBMetaColumnNode.java DBMetaRootNode.java
                        DatabaseMetaDataTreeModel.java
                        DBMetaSchemaNode.java DBMetaCatalogNode.java
               src/java/org/apache/ojb/broker/accesslayer/conversions Tag:
                        OJB_BRANCH_1_0 FieldConversion.java
               src/java/org/apache/ojb/broker/platforms Tag: OJB_BRANCH_1_0
                        PlatformDb2Impl.java PlatformMsSQLServerImpl.java
               src/java/org/apache/ojb/broker/query Tag: OJB_BRANCH_1_0
                        Criteria.java SelectionCriteria.java Query.java
                        AbstractQueryImpl.java
               src/java/org/apache/ojb/broker/accesslayer Tag:
                        OJB_BRANCH_1_0 PkIterator.java RowReader.java
                        IndirectionHandler.java PkEnumeration.java
               src/java/org/apache/ojb/broker/util/pooling Tag:
                        OJB_BRANCH_1_0 PoolInfo.java PoolConfiguration.java
               src/java/org/apache/ojb/odmg/states Tag: OJB_BRANCH_1_0
                        ModificationState.java
               src/java/org/apache/ojb/broker/util Tag: OJB_BRANCH_1_0
                        GUID.java ObjectModification.java
               src/java/org/apache/ojb/broker Tag: OJB_BRANCH_1_0
                        VirtualProxy.java PBKey.java Identity.java
                        ManageableCollection.java
               src/java/org/apache/ojb/odmg Tag: OJB_BRANCH_1_0
                        NamedRootsEntry.java ObjectEnvelope.java
                        TransactionAware.java
               src/java/org/apache/ojb/broker/util/logging Tag:
                        OJB_BRANCH_1_0 Logger.java
               src/java/org/apache/ojb/soda Tag: OJB_BRANCH_1_0
                        QueryImpl.java
               src/java/org/apache/ojb/odmg/locking Tag: OJB_BRANCH_1_0
                        LockEntry.java
               src/java/org/apache/ojb/broker/util/sequence Tag:
                        OJB_BRANCH_1_0 HighLowSequence.java
               src/java/org/apache/ojb/tools/mapping/reversedb2/propertyEditors
                        Tag: OJB_BRANCH_1_0
                        EditableTreeNodeWithProperties.java
  Log:
  add serialVersionUIDs to serializable classes,
  I guess I missed some, so I will recheck against Armins list later
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcType.java
  
  Index: JdbcType.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcType.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- JdbcType.java	9 Dec 2003 19:24:02 -0000	1.2
  +++ JdbcType.java	29 Dec 2003 16:12:51 -0000	1.2.2.1
  @@ -19,6 +19,7 @@
    */
   public interface JdbcType extends Serializable
   {
  +	static final long serialVersionUID = -4280495525316102302L;
       /**
        * Intern used flag.
        */
  
  
  
  1.9.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionPoolDescriptor.java
  
  Index: ConnectionPoolDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionPoolDescriptor.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- ConnectionPoolDescriptor.java	31 Jan 2003 17:03:32 -0000	1.9
  +++ ConnectionPoolDescriptor.java	29 Dec 2003 16:12:51 -0000	1.9.2.1
  @@ -73,6 +73,7 @@
    */
   public class ConnectionPoolDescriptor extends PoolConfiguration implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = -3071461685659671879L;
       private Class connectionFactory;
   
       public ConnectionPoolDescriptor()
  
  
  
  1.12.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeDescriptorBase.java
  
  Index: AttributeDescriptorBase.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeDescriptorBase.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- AttributeDescriptorBase.java	9 Dec 2003 17:19:58 -0000	1.12
  +++ AttributeDescriptorBase.java	29 Dec 2003 16:12:51 -0000	1.12.2.1
  @@ -68,6 +68,7 @@
    */
   public class AttributeDescriptorBase extends DescriptorBase implements Serializable
   {
  +	static final long serialVersionUID = -818671542770428043L;
       protected PersistentField m_PersistentField = null;
       protected ClassDescriptor m_ClassDescriptor = null;
   
  
  
  
  1.3.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ProcedureDescriptor.java
  
  Index: ProcedureDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ProcedureDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ProcedureDescriptor.java	2 Nov 2003 15:09:02 -0000	1.3
  +++ ProcedureDescriptor.java	29 Dec 2003 16:12:51 -0000	1.3.2.1
  @@ -72,6 +72,7 @@
    */
   public abstract class ProcedureDescriptor extends DescriptorBase implements Serializable
   {
  +	static final long serialVersionUID = -8228331122289787173L;
   
       //---------------------------------------------------------------
       /**
  
  
  
  1.1.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java
  
  Index: ObjectCacheDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- ObjectCacheDescriptor.java	17 Sep 2003 22:41:07 -0000	1.1
  +++ ObjectCacheDescriptor.java	29 Dec 2003 16:12:51 -0000	1.1.2.1
  @@ -22,6 +22,7 @@
    */
   public class ObjectCacheDescriptor implements Serializable, XmlCapable, AttributeContainer
   {
  +	static final long serialVersionUID = 2583853027407750053L;
       private Class objectCache;
       private Properties configurationProperties;
   
  
  
  
  1.1.2.1   +1 -0      db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java
  
  Index: DeleteProcedureDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- DeleteProcedureDescriptor.java	9 Sep 2003 19:02:30 -0000	1.1
  +++ DeleteProcedureDescriptor.java	29 Dec 2003 16:12:51 -0000	1.1.2.1
  @@ -74,6 +74,7 @@
       extends ProcedureDescriptor
       implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = -1265854095889157172L;
   
       //---------------------------------------------------------------
       /**
  
  
  
  1.9.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java
  
  Index: ConnectionRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- ConnectionRepository.java	12 May 2003 09:18:06 -0000	1.9
  +++ ConnectionRepository.java	29 Dec 2003 16:12:51 -0000	1.9.2.1
  @@ -21,6 +21,7 @@
    */
   public class ConnectionRepository implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = -5581126412817848887L;
       private static Logger log = LoggerFactory.getLogger(ConnectionRepository.class);
   
       private HashMap jcdMap;
  
  
  
  1.41.2.2  +3 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java
  
  Index: DescriptorRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java,v
  retrieving revision 1.41.2.1
  retrieving revision 1.41.2.2
  diff -u -r1.41.2.1 -r1.41.2.2
  --- DescriptorRepository.java	19 Dec 2003 17:38:13 -0000	1.41.2.1
  +++ DescriptorRepository.java	29 Dec 2003 16:12:51 -0000	1.41.2.2
  @@ -86,6 +86,8 @@
   public final class DescriptorRepository extends DescriptorBase
           implements Serializable, XmlCapable, IsolationLevels
   {
  +	static final long serialVersionUID = -1556339982311359524L;
  +	
       /**
        * The version identifier of the Repository.
        * Used to validate repository.xml against the dtd.
  
  
  
  1.1.2.1   +1 -0      db-ojb/src/java/org/apache/ojb/broker/metadata/UpdateProcedureDescriptor.java
  
  Index: UpdateProcedureDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/UpdateProcedureDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- UpdateProcedureDescriptor.java	9 Sep 2003 19:02:30 -0000	1.1
  +++ UpdateProcedureDescriptor.java	29 Dec 2003 16:12:51 -0000	1.1.2.1
  @@ -74,6 +74,7 @@
       extends ProcedureDescriptor
       implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = 1319547080310130251L;
   
       //---------------------------------------------------------------
       /**
  
  
  
  1.7.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/IndexDescriptor.java
  
  Index: IndexDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/IndexDescriptor.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- IndexDescriptor.java	2 May 2003 18:19:49 -0000	1.7
  +++ IndexDescriptor.java	29 Dec 2003 16:12:51 -0000	1.7.2.1
  @@ -66,6 +66,7 @@
    */
   public class IndexDescriptor implements XmlCapable, Serializable
   {
  +	static final long serialVersionUID = -1722513568634970108L;
       private String name;
       private boolean unique;
       private Vector indexColumns = new Vector();
  
  
  
  1.4.2.1   +2 -0      db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorBase.java
  
  Index: DescriptorBase.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorBase.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- DescriptorBase.java	11 Jul 2003 07:42:04 -0000	1.4
  +++ DescriptorBase.java	29 Dec 2003 16:12:51 -0000	1.4.2.1
  @@ -65,6 +65,8 @@
    */
   class DescriptorBase implements AttributeContainer, Serializable
   {
  +	static final long serialVersionUID = 713914612744155925L;
  +	
       /** holds user defined attributes */
       private Map attributeMap = null;
   
  
  
  
  1.1.2.1   +1 -0      db-ojb/src/java/org/apache/ojb/broker/metadata/InsertProcedureDescriptor.java
  
  Index: InsertProcedureDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/InsertProcedureDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- InsertProcedureDescriptor.java	9 Sep 2003 19:02:30 -0000	1.1
  +++ InsertProcedureDescriptor.java	29 Dec 2003 16:12:51 -0000	1.1.2.1
  @@ -74,6 +74,7 @@
       extends ProcedureDescriptor
       implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = -3808311052971075269L;
   
       //---------------------------------------------------------------
       /**
  
  
  
  1.1.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/FieldHelper.java
  
  Index: FieldHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- FieldHelper.java	16 Dec 2002 18:19:08 -0000	1.1
  +++ FieldHelper.java	29 Dec 2003 16:12:51 -0000	1.1.2.1
  @@ -62,6 +62,7 @@
    */
   public class FieldHelper implements java.io.Serializable
   {
  +	static final long serialVersionUID = -297186561855340166L;
       public String name;
       public boolean isAscending;
   
  
  
  
  1.6.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java
  
  Index: SequenceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- SequenceDescriptor.java	17 Oct 2003 14:53:46 -0000	1.6
  +++ SequenceDescriptor.java	29 Dec 2003 16:12:51 -0000	1.6.2.1
  @@ -22,6 +22,7 @@
    */
   public class SequenceDescriptor implements Serializable, XmlCapable, AttributeContainer
   {
  +	static final long serialVersionUID = -5161713731380949398L;
       private JdbcConnectionDescriptor jcd;
       private Class sequenceManagerClass;
       private Properties configurationProperties;
  
  
  
  1.2.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ArgumentDescriptor.java
  
  Index: ArgumentDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ArgumentDescriptor.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ArgumentDescriptor.java	9 Dec 2003 17:19:58 -0000	1.2
  +++ ArgumentDescriptor.java	29 Dec 2003 16:12:51 -0000	1.2.2.1
  @@ -72,7 +72,7 @@
    */
   public final class ArgumentDescriptor extends DescriptorBase implements XmlCapable, Serializable
   {
  -
  +	static final long serialVersionUID = 5205304260023247711L;
       private static final int SOURCE_NULL = 0;
       private static final int SOURCE_FIELD = 1;
       private static final int SOURCE_VALUE = 2;
  
  
  
  1.26.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java
  
  Index: JdbcConnectionDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java,v
  retrieving revision 1.26
  retrieving revision 1.26.2.1
  diff -u -r1.26 -r1.26.2.1
  --- JdbcConnectionDescriptor.java	17 Sep 2003 22:41:07 -0000	1.26
  +++ JdbcConnectionDescriptor.java	29 Dec 2003 16:12:51 -0000	1.26.2.1
  @@ -76,6 +76,7 @@
    */
   public class JdbcConnectionDescriptor extends DescriptorBase implements Serializable, XmlCapable
   {
  +	static final long serialVersionUID = -600900924512028960L;
       private Logger logger = LoggerFactory.getLogger(JdbcConnectionDescriptor.class);
   
       private String m_jcdAlias;
  
  
  
  1.31.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
  
  Index: FieldDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- FieldDescriptor.java	9 Dec 2003 17:19:58 -0000	1.31
  +++ FieldDescriptor.java	29 Dec 2003 16:12:51 -0000	1.31.2.1
  @@ -79,6 +79,7 @@
    */
   public class FieldDescriptor extends AttributeDescriptorBase implements XmlCapable, Serializable
   {
  +	static final long serialVersionUID = 7865777758296851949L;
       public static final String ACCESS_ANONYMOUS = RepositoryElements.TAG_ACCESS_ANONYMOUS;
       public static final String ACCESS_READONLY = RepositoryElements.TAG_ACCESS_READONLY;
       public static final String ACCESS_READWRITE = RepositoryElements.TAG_ACCESS_READWRITE;
  
  
  
  1.75.2.2  +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
  
  Index: ClassDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
  retrieving revision 1.75.2.1
  retrieving revision 1.75.2.2
  diff -u -r1.75.2.1 -r1.75.2.2
  --- ClassDescriptor.java	19 Dec 2003 17:38:13 -0000	1.75.2.1
  +++ ClassDescriptor.java	29 Dec 2003 16:12:51 -0000	1.75.2.2
  @@ -109,6 +109,7 @@
       extends DescriptorBase
       implements Serializable, XmlCapable, IsolationLevels
   {
  +	static final long serialVersionUID = -5212253607374173965L;
       public static final String OJB_CONCRETE_CLASS = "ojbConcreteClass";
       private static final Class[] NO_PARAMS = {};
   
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +3 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldPrivilegedImpl.java
  
  Index: PersistentFieldPrivilegedImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldPrivilegedImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- PersistentFieldPrivilegedImpl.java	20 Aug 2003 19:40:52 -0000	1.6
  +++ PersistentFieldPrivilegedImpl.java	29 Dec 2003 16:12:52 -0000	1.6.2.1
  @@ -167,6 +167,7 @@
       //************************************************************
       private class SetAccessibleAction implements PrivilegedAction, Serializable
       {
  +		static final long serialVersionUID = 8152025069698028050L;
           public Object run()
           {
               getField().setAccessible(true);
  @@ -176,6 +177,7 @@
   
       private class UnsetAccessibleAction implements PrivilegedAction, Serializable
       {
  +		static final long serialVersionUID = -2284913657454430305L;
           public Object run()
           {
               getField().setAccessible(false);
  
  
  
  1.4.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentField.java
  
  Index: PersistentField.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentField.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- PersistentField.java	9 Dec 2003 17:19:58 -0000	1.4
  +++ PersistentField.java	29 Dec 2003 16:12:52 -0000	1.4.2.1
  @@ -64,6 +64,7 @@
    */
   public interface PersistentField extends Serializable
   {
  +	static final long serialVersionUID = 2264055340260883472L;
   	public Class getDeclaringClass();
   	public String getName();
   	public Class getType();
  
  
  
  No                   revision
  No                   revision
  1.17.2.1  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
  
  Index: DMapImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- DMapImpl.java	12 Dec 2003 18:36:17 -0000	1.17
  +++ DMapImpl.java	29 Dec 2003 16:12:52 -0000	1.17.2.1
  @@ -78,7 +78,7 @@
   
   public class DMapImpl extends AbstractMap implements DMap, Serializable
   {
  -    // private Logger log = LoggerFactory.getLogger(DMapImpl.class);
  +	static final long serialVersionUID = 7048246616243056480L;
       private int id = -1;
       private ManageableHashSet entries;
       private int size = 0;
  
  
  
  1.14.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
  
  Index: DMapEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- DMapEntry.java	12 Dec 2003 18:36:17 -0000	1.14
  +++ DMapEntry.java	29 Dec 2003 16:12:52 -0000	1.14.2.1
  @@ -78,6 +78,7 @@
   
   public class DMapEntry implements java.util.Map.Entry, Serializable
   {
  +	static final long serialVersionUID = 4382757889982004339L;
       private Logger log = LoggerFactory.getLogger(DMapEntry.class);
       private int id;
       private int dmapId;
  
  
  
  1.21.2.1  +2 -0      db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java
  
  Index: DListEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- DListEntry.java	12 Dec 2003 18:36:17 -0000	1.21
  +++ DListEntry.java	29 Dec 2003 16:12:52 -0000	1.21.2.1
  @@ -75,6 +75,8 @@
    */
   public class DListEntry implements Serializable
   {
  +	static final long serialVersionUID = -3280555665769116060L;
  +	
       protected int id = 0;
       protected int dlistId = 0;
       protected DListImpl m_dList;
  
  
  
  1.23.2.1  +1 -0      db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
  
  Index: DListImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java,v
  retrieving revision 1.23
  retrieving revision 1.23.2.1
  diff -u -r1.23 -r1.23.2.1
  --- DListImpl.java	12 Dec 2003 18:36:17 -0000	1.23
  +++ DListImpl.java	29 Dec 2003 16:12:52 -0000	1.23.2.1
  @@ -93,6 +93,7 @@
   public class DListImpl extends java.util.AbstractList implements DList, DArray,
           ManageableCollection, java.io.Serializable
   {
  +	static final long serialVersionUID = -835415723401679339L;
       private Logger log = LoggerFactory.getLogger(DListImpl.class);
       /**
        * decide whether we can defer ID generation based on the type of persistentField we are using
  
  
  
  1.17.2.1  +1 -0      db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
  
  Index: DSetImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- DSetImpl.java	28 Nov 2003 14:39:59 -0000	1.17
  +++ DSetImpl.java	29 Dec 2003 16:12:52 -0000	1.17.2.1
  @@ -85,6 +85,7 @@
    */
   public class DSetImpl extends java.util.AbstractSet implements org.odmg.DSet, Serializable
   {
  +	static final long serialVersionUID = -4459673364598652639L;
       private Logger log = LoggerFactory.getLogger(DSetImpl.class);
       private int id = -1;
       private Vector elements;
  
  
  
  1.2.2.1   +3 -1      db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry_2.java
  
  Index: DListEntry_2.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry_2.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- DListEntry_2.java	13 Dec 2003 14:34:23 -0000	1.2
  +++ DListEntry_2.java	29 Dec 2003 16:12:52 -0000	1.2.2.1
  @@ -73,6 +73,8 @@
    */
   public class DListEntry_2 implements Serializable
   {
  +	static final long serialVersionUID = 5251476492626009907L;
  +	
       /*
       declare transient or do we adopt persistent object is serialzable?
       */
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +3 -2      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaTableNode.java
  
  Index: DBMetaTableNode.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaTableNode.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- DBMetaTableNode.java	8 Nov 2002 13:47:38 -0000	1.3
  +++ DBMetaTableNode.java	29 Dec 2003 16:12:52 -0000	1.3.2.1
  @@ -64,7 +64,8 @@
   public class DBMetaTableNode extends ReverseDbTreeNode
       implements java.io.Serializable
   {
  - 
  +	static final long serialVersionUID = 7091783312165332145L;
  +	
       /** Key for accessing the table name in the attributes Map */    
       public static final String ATT_TABLE_NAME = "Table Name";
       
  
  
  
  1.2.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaColumnNode.java
  
  Index: DBMetaColumnNode.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaColumnNode.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- DBMetaColumnNode.java	4 Sep 2002 16:06:23 -0000	1.2
  +++ DBMetaColumnNode.java	29 Dec 2003 16:12:52 -0000	1.2.2.1
  @@ -64,6 +64,7 @@
   public class DBMetaColumnNode extends ReverseDbTreeNode
       implements java.io.Serializable
   {
  +	static final long serialVersionUID = -7694494988930854647L;
   
       /** Key for accessing the column name in the attributes Map */       
       public static final String ATT_COLUMN_NAME = "Column Name";   
  
  
  
  1.3.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaRootNode.java
  
  Index: DBMetaRootNode.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaRootNode.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- DBMetaRootNode.java	8 Nov 2002 13:29:29 -0000	1.3
  +++ DBMetaRootNode.java	29 Dec 2003 16:12:52 -0000	1.3.2.1
  @@ -69,6 +69,7 @@
   public class DBMetaRootNode extends ReverseDbTreeNode
       implements java.io.Serializable
   {
  +	static final long serialVersionUID = 5002948511759554049L;
       /** Creates a new instance of DBMetaRootNode 
        *  @param pdbMeta DatabaseMetaData implementation where this node gets its data from.
        *  @param pdbMetaTreeModel The TreeModel this node is associated to.
  
  
  
  1.2.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DatabaseMetaDataTreeModel.java
  
  Index: DatabaseMetaDataTreeModel.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DatabaseMetaDataTreeModel.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- DatabaseMetaDataTreeModel.java	4 Sep 2002 16:04:54 -0000	1.2
  +++ DatabaseMetaDataTreeModel.java	29 Dec 2003 16:12:52 -0000	1.2.2.1
  @@ -71,6 +71,7 @@
   public class DatabaseMetaDataTreeModel extends javax.swing.tree.DefaultTreeModel
       implements java.io.Serializable
   {
  +	static final long serialVersionUID = -8045409456918534509L;
       transient private java.sql.DatabaseMetaData dbMetadata;
       /** Creates a new instance of DatabaseMetaDataTreeModel. The
        * model represents the metadata specified by pdbMetadata
  
  
  
  1.3.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaSchemaNode.java
  
  Index: DBMetaSchemaNode.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaSchemaNode.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- DBMetaSchemaNode.java	8 Nov 2002 13:47:38 -0000	1.3
  +++ DBMetaSchemaNode.java	29 Dec 2003 16:12:52 -0000	1.3.2.1
  @@ -66,6 +66,7 @@
   public class DBMetaSchemaNode extends ReverseDbTreeNode
       implements java.io.Serializable
   {
  +	static final long serialVersionUID = 2430983502951445144L;
       /** Key for accessing the schema name in the attributes Map */
       public static final String ATT_SCHEMA_NAME = "Schema Name";
       /** Creates a new instance of DBMetaSchemaNode 
  
  
  
  1.3.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaCatalogNode.java
  
  Index: DBMetaCatalogNode.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/dbmetatreemodel/DBMetaCatalogNode.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- DBMetaCatalogNode.java	8 Nov 2002 13:47:38 -0000	1.3
  +++ DBMetaCatalogNode.java	29 Dec 2003 16:12:52 -0000	1.3.2.1
  @@ -66,6 +66,7 @@
   public class DBMetaCatalogNode extends ReverseDbTreeNode
       implements java.io.Serializable
   {
  +	static final long serialVersionUID = -2455228985120104948L;
       /** Attribute key for the accessing the catalog name */
       public static final String ATT_CATALOG_NAME = "Catalog Name";
   
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +3 -1      db-ojb/src/java/org/apache/ojb/broker/accesslayer/conversions/FieldConversion.java
  
  Index: FieldConversion.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/conversions/FieldConversion.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- FieldConversion.java	21 Sep 2002 15:39:53 -0000	1.3
  +++ FieldConversion.java	29 Dec 2003 16:12:52 -0000	1.3.2.1
  @@ -73,6 +73,8 @@
    */
   public interface FieldConversion extends Serializable
   {
  +	static final long serialVersionUID = 2692919097691347845L;
  +	
       /** convert a Java object to its SQL pendant, used for insert & update*/
       public abstract Object javaToSql(Object source) throws ConversionException;
   
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +10 -6     db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformDb2Impl.java
  
  Index: PlatformDb2Impl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformDb2Impl.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- PlatformDb2Impl.java	9 Dec 2003 22:48:20 -0000	1.7
  +++ PlatformDb2Impl.java	29 Dec 2003 16:12:52 -0000	1.7.2.1
  @@ -98,9 +98,13 @@
       {
           return "drop sequence " + sequenceName;
       }
  -
  -    public String getLastInsertIdentityQuery(String tableName)
  -    {
  -        return "values IDENTITY_VAL_LOCAL() fetch first row only";
  -    }
  +  
  +	public String getLastInsertIdentityQuery(String tableName)
  +	{
  +		// matthias.roth@impart.ch
  +		// the function is used by the org.apache.ojb.broker.util.sequence.SequenceManagerNativeImpl
  +		// this call must be made before commit the insert cammand, so you
  +		// must turn off autocommit by seting the useAutoCommit="2"
  +		return "select IDENTITY_VAL_LOCAL() from sysibm.sysdummy1";
  +	}
   }
  
  
  
  1.4.2.1   +10 -1     db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformMsSQLServerImpl.java
  
  Index: PlatformMsSQLServerImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformMsSQLServerImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- PlatformMsSQLServerImpl.java	2 Apr 2003 22:56:36 -0000	1.4
  +++ PlatformMsSQLServerImpl.java	29 Dec 2003 16:12:52 -0000	1.4.2.1
  @@ -96,4 +96,13 @@
               throw new PlatformException(e);
           }
       }
  +    
  +	 public String getLastInsertIdentityQuery(String tableName)
  +	 {
  +		// matthias.roth@impart.ch
  +		// the function is used by the org.apache.ojb.broker.util.sequence.SequenceManagerNativeImpl
  +		// this call must be made before commit the insert cammand, so you
  +		// must turn off autocommit by setting the useAutoCommit="2"
  +	 	return "SELECT @@IDENTITY AS id FROM "+tableName;
  +	 }    
   }
  
  
  
  No                   revision
  No                   revision
  1.35.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java
  
  Index: Criteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -r1.35 -r1.35.2.1
  --- Criteria.java	10 Dec 2003 21:27:44 -0000	1.35
  +++ Criteria.java	29 Dec 2003 16:12:52 -0000	1.35.2.1
  @@ -84,6 +84,7 @@
    */
   public class Criteria implements java.io.Serializable
   {
  +	static final long serialVersionUID = 7384550404778187808L;
   	public final static int OR = 0;
   	public final static int AND = 1;
   	public final static int NONE = 9;
  
  
  
  1.12.2.1  +3 -1      db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java
  
  Index: SelectionCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- SelectionCriteria.java	13 Sep 2003 14:33:57 -0000	1.12
  +++ SelectionCriteria.java	29 Dec 2003 16:12:52 -0000	1.12.2.1
  @@ -69,6 +69,8 @@
    */
   public abstract class SelectionCriteria implements java.io.Serializable
   {
  +	static final long serialVersionUID = -5194901539702756536L;
  +	
       protected static final String EQUAL = " = ";
       protected static final String NOT_EQUAL = " <> ";
       protected static final String GREATER = " > ";
  
  
  
  1.14.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/query/Query.java
  
  Index: Query.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Query.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- Query.java	8 Dec 2003 17:56:12 -0000	1.14
  +++ Query.java	29 Dec 2003 16:12:52 -0000	1.14.2.1
  @@ -83,6 +83,7 @@
    */
   public interface Query extends java.io.Serializable
   {
  +	static final long serialVersionUID = 7616997212439931319L;
       public static final int NO_START_AT_INDEX = 0;
       public static final int NO_END_AT_INDEX = 0;
       public static final boolean SCROLLABLE = true;
  
  
  
  1.11.2.1  +2 -1      db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java
  
  Index: AbstractQueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- AbstractQueryImpl.java	26 Nov 2003 17:33:09 -0000	1.11
  +++ AbstractQueryImpl.java	29 Dec 2003 16:12:52 -0000	1.11.2.1
  @@ -65,6 +65,7 @@
    */
   public abstract class AbstractQueryImpl implements Query, Serializable
   {
  +	static final long serialVersionUID = -6265085604410295816L;
       private int m_startAtIndex = Query.NO_START_AT_INDEX;
       private int m_endAtIndex = Query.NO_END_AT_INDEX;
       private int m_fullSize = 0;
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkIterator.java
  
  Index: PkIterator.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkIterator.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- PkIterator.java	19 Jan 2003 12:23:34 -0000	1.4
  +++ PkIterator.java	29 Dec 2003 16:12:52 -0000	1.4.2.1
  @@ -63,7 +63,7 @@
    */
   public class PkIterator implements Iterator, Serializable
   {
  -
  +	static final long serialVersionUID = 1906110293623601724L;
       private Enumeration internalEnum;
   
       public PkIterator(Enumeration enum)
  
  
  
  1.6.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReader.java
  
  Index: RowReader.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReader.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- RowReader.java	2 May 2003 12:24:32 -0000	1.6
  +++ RowReader.java	29 Dec 2003 16:12:52 -0000	1.6.2.1
  @@ -64,6 +64,7 @@
    */
   public interface RowReader extends Serializable
   {
  +	static final long serialVersionUID = -1283322922537162249L;
       /**
        * materialize a single object from the values of the Map row.
        * the implementor of this class must not care for materializing
  
  
  
  1.21.2.1  +3 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/IndirectionHandler.java
  
  Index: IndirectionHandler.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/IndirectionHandler.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- IndirectionHandler.java	28 Oct 2003 21:21:19 -0000	1.21
  +++ IndirectionHandler.java	29 Dec 2003 16:12:52 -0000	1.21.2.1
  @@ -83,6 +83,7 @@
    */
   public class IndirectionHandler implements InvocationHandler, Serializable
   {
  +	static final long serialVersionUID = -1993879565033755826L;
       private static Logger log = LoggerFactory.getLogger(IndirectionHandler.class);
       /**
        * reference to the used PersistenceBroker
  @@ -271,7 +272,7 @@
               // so we use the hashCode of the handler instead of the realSubject's one
               if ("hashCode".equals(methodName))
               {
  -                return new Integer(hashCode());
  +                return new Integer(id.hashCode());
               }
   
               // handle toString differently for non-materialized proxies
  
  
  
  1.14.2.1  +2 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkEnumeration.java
  
  Index: PkEnumeration.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkEnumeration.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- PkEnumeration.java	9 Dec 2003 17:19:59 -0000	1.14
  +++ PkEnumeration.java	29 Dec 2003 16:12:52 -0000	1.14.2.1
  @@ -79,7 +79,7 @@
    */
   public class PkEnumeration implements Enumeration, Serializable
   {
  -
  +	static final long serialVersionUID = -834955711995869884L;
       protected boolean hasCalledCheck = false;
       protected boolean hasNext = false;
   
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/util/pooling/PoolInfo.java
  
  Index: PoolInfo.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/pooling/PoolInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- PoolInfo.java	26 Apr 2003 23:18:24 -0000	1.3
  +++ PoolInfo.java	29 Dec 2003 16:12:53 -0000	1.3.2.1
  @@ -76,6 +76,7 @@
    */
   public class PoolInfo implements Serializable //, Configurable
   {
  +	static final long serialVersionUID = 3932509165776646636L;
       private int maxActive = DEFAULT_MAX_ACTIVE;
       private int maxIdle = DEFAULT_MAX_IDLE;
       private long maxWait = DEFAULT_MAX_WAIT;
  
  
  
  1.4.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/util/pooling/PoolConfiguration.java
  
  Index: PoolConfiguration.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/pooling/PoolConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- PoolConfiguration.java	6 Dec 2003 15:54:56 -0000	1.4
  +++ PoolConfiguration.java	29 Dec 2003 16:12:53 -0000	1.4.2.1
  @@ -76,6 +76,7 @@
    */
   public class PoolConfiguration extends Properties implements Serializable //, Configurable
   {
  +	static final long serialVersionUID = -3850488378321541047L;
       public static final String EMPTY = "";
       //*****************************************************
       // constants
  
  
  
  No                   revision
  No                   revision
  1.8.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java
  
  Index: ModificationState.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- ModificationState.java	13 Nov 2003 14:52:40 -0000	1.8
  +++ ModificationState.java	29 Dec 2003 16:12:53 -0000	1.8.2.1
  @@ -66,7 +66,8 @@
    */
   public abstract class ModificationState extends Object implements Serializable
   {
  -
  +	static final long serialVersionUID = 4182870857709997816L;
  +	
       public ModificationState()
       {
       }
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/util/GUID.java
  
  Index: GUID.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/GUID.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- GUID.java	1 Aug 2002 18:10:46 -0000	1.4
  +++ GUID.java	29 Dec 2003 16:12:53 -0000	1.4.2.1
  @@ -70,6 +70,7 @@
    */
   public class GUID implements Serializable
   {
  +	static final long serialVersionUID = -6163239155380515945L;
       /**
        * holds the hostname of the local machine.
        */
  
  
  
  1.3.2.1   +5 -4      db-ojb/src/java/org/apache/ojb/broker/util/ObjectModification.java
  
  Index: ObjectModification.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ObjectModification.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ObjectModification.java	12 Jul 2003 16:17:23 -0000	1.3
  +++ ObjectModification.java	29 Dec 2003 16:12:53 -0000	1.3.2.1
  @@ -1,4 +1,4 @@
  -package org.apache.ojb.broker.util;
  +package org.apache.ojb.broker.util;
   
   /* ====================================================================
    * The Apache Software License, Version 1.1
  @@ -66,14 +66,15 @@
    */
   public interface ObjectModification extends java.io.Serializable
   {
  +	static final long serialVersionUID = -3208237880606252967L;
       /**
        * returns true if the underlying Object needs an INSERT statement.
        * else Returns false.
        */
  -    public boolean needsInsert();
  +    public boolean needsInsert();
       /**
        * returns true if the underlying Object needs an UPDATE statement.
        * else Returns false.
        */
       public boolean needsUpdate();
  -}
  +}
  
  
  
  No                   revision
  No                   revision
  1.9.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/VirtualProxy.java
  
  Index: VirtualProxy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/VirtualProxy.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- VirtualProxy.java	9 Dec 2003 17:19:57 -0000	1.9
  +++ VirtualProxy.java	29 Dec 2003 16:12:53 -0000	1.9.2.1
  @@ -76,6 +76,7 @@
    */
   public abstract class VirtualProxy implements java.io.Serializable
   {
  +	static final long serialVersionUID = -3999451313262635171L;
       /**
        * reference to the IndirectionHandler that encapsulates the delegation mechanism
        */
  
  
  
  1.6.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/PBKey.java
  
  Index: PBKey.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/PBKey.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- PBKey.java	9 May 2003 10:17:24 -0000	1.6
  +++ PBKey.java	29 Dec 2003 16:12:53 -0000	1.6.2.1
  @@ -13,6 +13,7 @@
    */
   public class PBKey implements Cloneable, Serializable
   {
  +	static final long serialVersionUID = -8858811398162391578L;
       private final String jcdAlias;
       private final String user;
       private final String password;
  
  
  
  1.28.2.2  +2 -1      db-ojb/src/java/org/apache/ojb/broker/Identity.java
  
  Index: Identity.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/Identity.java,v
  retrieving revision 1.28.2.1
  retrieving revision 1.28.2.2
  diff -u -r1.28.2.1 -r1.28.2.2
  --- Identity.java	20 Dec 2003 10:15:36 -0000	1.28.2.1
  +++ Identity.java	29 Dec 2003 16:12:53 -0000	1.28.2.2
  @@ -87,6 +87,7 @@
    */
   public class Identity implements Serializable
   {
  +	static final long serialVersionUID = 3182285550574178710L;
       /**
        * the top-level Class of the identified object<br>
        * ie: an Interface
  
  
  
  1.4.2.1   +3 -2      db-ojb/src/java/org/apache/ojb/broker/ManageableCollection.java
  
  Index: ManageableCollection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/ManageableCollection.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- ManageableCollection.java	9 Apr 2003 08:57:48 -0000	1.4
  +++ ManageableCollection.java	29 Dec 2003 16:12:53 -0000	1.4.2.1
  @@ -68,7 +68,8 @@
    */
   public interface ManageableCollection extends java.io.Serializable
   {
  -
  +	static final long serialVersionUID = -4324379872849598226L;
  +	
       /**
        * add a single Object to the Collection. This method is used during reading Collection elements
        * from the database. Thus it is is save to cast anObject to the underlying element type of the
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +1 -0      db-ojb/src/java/org/apache/ojb/odmg/NamedRootsEntry.java
  
  Index: NamedRootsEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/NamedRootsEntry.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- NamedRootsEntry.java	8 Apr 2003 20:19:29 -0000	1.4
  +++ NamedRootsEntry.java	29 Dec 2003 16:12:53 -0000	1.4.2.1
  @@ -63,6 +63,7 @@
    */
   public class NamedRootsEntry implements java.io.Serializable
   {
  +	static final long serialVersionUID = 6179717896336300342L;
   
       /**
        * the name under which an object is registered in the NamedRoots Map
  
  
  
  1.25.2.1  +1 -0      db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelope.java
  
  Index: ObjectEnvelope.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelope.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- ObjectEnvelope.java	12 Dec 2003 21:59:45 -0000	1.25
  +++ ObjectEnvelope.java	29 Dec 2003 16:12:53 -0000	1.25.2.1
  @@ -95,6 +95,7 @@
    */
   public class ObjectEnvelope implements ObjectModification, Serializable
   {
  +	static final long serialVersionUID = -829177767933340522L;
       /**
        * The objects modification state, e.g. Old and Clean
        */
  
  
  
  1.3.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/TransactionAware.java
  
  Index: TransactionAware.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionAware.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- TransactionAware.java	31 Oct 2003 11:08:27 -0000	1.3
  +++ TransactionAware.java	29 Dec 2003 16:12:53 -0000	1.3.2.1
  @@ -1 +1 @@
  -package org.apache.ojb.odmg;


/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" and
 *    "Apache ObjectRelationalBridge" must not be used to endorse or promote products
 *    derived from this software without prior written permission. For
 *    written permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    "Apache ObjectRelationalBridge", nor may "Apache" appear in their name, without
 *    prior written permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
import java.io.Serializable;

/**
 *
 * TransactionAware is an interface that can be implemented
 * to provide hooks into the Transaction interface provided
 * by ObJectRelationalBridge.
 * Only objects which have a write lock acquired on them can
 * participate in a transaction.
 * To kill a transaction, implement beforeCommit() and throw
 * a TransactionAbortedException.  This will force the entire
 * transaction to rollback.
 *
 * To rebuild an object after a rollback use the afterAbort()
 * call.  This is a good place to populate transient or other
 * variables.
 *
 * beforeAbort and afterCommit are there for informational
 * purposes.
 *
 * Here are some common ways you can expect this interface
 * to be called:
 *
 * Sucessful commit:
 * beforeCommit()
 * afterCommit()
 *
 * Transaction Failure (1):
 * beforeCommit()
 * beforeAbort()
 * afterAbort()
 *
 * Transaction Failure (2):
 * beforeAbort()
 * afterAbort()
 *
 * Commits and Aborts aren't directly provided to TransactionAware classes.
 * The idea is that Transactions are difficult to handle, and most of it
 * will be handled by ObjectSnapshot.  However, you use TransactionAware
 * to do one of two things, kill a transaction from happening, and clean
 * up after a rollback.
 *
 * @version $Id$
 */
public interface TransactionAware extends Serializable
{
    /**
     *
     * beforeCommit will give an object a chance to kill a
     * transaction before it is committed.
     * To kill a transaction, throw a new TransactionAbortedException.
     *
     */
    public void beforeCommit() throws org.odmg.TransactionAbortedException;

    /**
     *
     * afterCommit is called only after a successful commit has taken
     * place.
     *
     */
    public void afterCommit();

    /**
     *
     * beforeAbort is called before a transaction is aborted.
     *
     */
    public void beforeAbort();

    /**
     *
     * afterAbort will be called after a transaction has been aborted.
     * The values of fields which get persisted will have changed to
     * what they were at the begining of the transaction.  This method
     * should be overridden to reset any transient or non-persistent
     * fields.
     *
     */
    public void afterAbort();
}

  \ No newline at end of file
  +package org.apache.ojb.odmg;


/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" and
 *    "Apache ObjectRelationalBridge" must not be used to endorse or promote products
 *    derived from this software without prior written permission. For
 *    written permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    "Apache ObjectRelationalBridge", nor may "Apache" appear in their name, without
 *    prior written permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
import java.io.Serializable;

/**
 *
 * TransactionAware is an interface that can be implemented
 * to provide hooks into the Transaction interface provided
 * by ObJectRelationalBridge.
 * Only objects which have a write lock acquired on them can
 * participate in a transaction.
 * To kill a transaction, implement beforeCommit() and throw
 * a TransactionAbortedException.  This will force the entire
 * transaction to rollback.
 *
 * To rebuild an object after a rollback use the afterAbort()
 * call.  This is a good place to populate transient or other
 * variables.
 *
 * beforeAbort and afterCommit are there for informational
 * purposes.
 *
 * Here are some common ways you can expect this interface
 * to be called:
 *
 * Sucessful commit:
 * beforeCommit()
 * afterCommit()
 *
 * Transaction Failure (1):
 * beforeCommit()
 * beforeAbort()
 * afterAbort()
 *
 * Transaction Failure (2):
 * beforeAbort()
 * afterAbort()
 *
 * Commits and Aborts aren't directly provided to TransactionAware classes.
 * The idea is that Transactions are difficult to handle, and most of it
 * will be handled by ObjectSnapshot.  However, you use TransactionAware
 * to do one of two things, kill a transaction from happening, and clean
 * up after a rollback.
 *
 * @version $Id$
 */
public interface TransactionAware extends Serializable
{
	static final long serialVersionUID = 3690863289834166023L;
    /**
     *
     * beforeCommit will give an object a chance to kill a
     * transaction before it is committed.
     * To kill a transaction, throw a new TransactionAbortedException.
     *
     */
    public void beforeCommit() throws org.odmg.TransactionAbortedException;

    /**
     *
     * afterCommit is called only after a successful commit has taken
     * place.
     *
     */
    public void afterCommit();

    /**
     *
     * beforeAbort is called before a transaction is aborted.
     *
     */
    public void beforeAbort();

    /**
     *
     * afterAbort will be called after a transaction has been aborted.
     * The values of fields which get persisted will have changed to
     * what they were at the begining of the transaction.  This method
     * should be overridden to reset any transient or non-persistent
     * fields.
     *
     */
    public void afterAbort();
}

  \ No newline at end of file
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/logging/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/Logger.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- Logger.java	26 Oct 2003 17:19:57 -0000	1.5
  +++ Logger.java	29 Dec 2003 16:12:53 -0000	1.5.2.1
  @@ -1 +1 @@
  -package org.apache.ojb.broker.util.logging;

/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" and
 *    "Apache ObjectRelationalBridge" must not be used to endorse or promote products
 *    derived from this software without prior written permission. For
 *    written permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    "Apache ObjectRelationalBridge", nor may "Apache" appear in their name, without
 *    prior written permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */

import org.apache.ojb.broker.util.configuration.Configurable;

import java.io.Serializable;


/**
 * this interface defines the behaviour of a logging mechanism.
 * This API corresponds closely to the LOG4J Category Api.
 * By using this interface OJB remains free from Logger-Implementation
 * specific code.
 */
public interface Logger extends Serializable, Configurable
{
    /*
     * OJB loglevel constants. they corespond directly to LOG4J LogLevels.
     */
    public final static int DEBUG = 1;
    public final static int INFO = 2;
    public final static int WARN = 3;
    public final static int ERROR = 4;
    public final static int FATAL = 5;


    /**
     * generate a message for loglevel DEBUG
     * @param pObject the message Object
     */
    public void debug(Object pObject);

    /**
     * generate a message for loglevel INFO
     * @param pObject the message Object
     */
    public void info(Object pObject);

    /**
     * generate a message for loglevel WARN
     * @param pObject the message Object
     */
    public void warn(Object pObject);

    /**
     * generate a message for loglevel ERROR
     * @param pObject the message Object
     */
    public void error(Object pObject);

    /**
     * generate a message for loglevel FATAL
     * @param pObject the message Object
     */
    public void fatal(Object pObject);

    public void debug(Object message, Throwable obj);
    public void info(Object message, Throwable obj);
    public void warn(Object message, Throwable obj);
    public void error(Object message, Throwable obj);
    public void fatal(Object message, Throwable obj);

    public boolean isEnabledFor(int priority);
    public boolean isDebugEnabled();

    /**
     * returns the name of the logger isntance
     */
    public String getName();

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : DEBUG
     */
    public void safeDebug(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : DEBUG
     */
    public void safeDebug(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : INFO
     */
    public void safeInfo(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : INFO
     */
    public void safeInfo(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : WARN
     */
    public void safeWarn(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : WARN
     */
    public void safeWarn(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : ERROR
     */
    public void safeError(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : ERROR
     */
    public void safeError(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : FATAL
     */
    public void safeFatal(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : FATAL
     */
    public void safeFatal(String message, Object obj, Throwable t);
}
  \ No newline at end of file
  +package org.apache.ojb.broker.util.logging;

/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" and
 *    "Apache ObjectRelationalBridge" must not be used to endorse or promote products
 *    derived from this software without prior written permission. For
 *    written permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    "Apache ObjectRelationalBridge", nor may "Apache" appear in their name, without
 *    prior written permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */

import org.apache.ojb.broker.util.configuration.Configurable;

import java.io.Serializable;


/**
 * this interface defines the behaviour of a logging mechanism.
 * This API corresponds closely to the LOG4J Category Api.
 * By using this interface OJB remains free from Logger-Implementation
 * specific code.
 */
public interface Logger extends Serializable, Configurable
{
	static final long serialVersionUID = 1177329037874407180L;
    /*
     * OJB loglevel constants. they corespond directly to LOG4J LogLevels.
     */
    public final static int DEBUG = 1;
    public final static int INFO = 2;
    public final static int WARN = 3;
    public final static int ERROR = 4;
    public final static int FATAL = 5;


    /**
     * generate a message for loglevel DEBUG
     * @param pObject the message Object
     */
    public void debug(Object pObject);

    /**
     * generate a message for loglevel INFO
     * @param pObject the message Object
     */
    public void info(Object pObject);

    /**
     * generate a message for loglevel WARN
     * @param pObject the message Object
     */
    public void warn(Object pObject);

    /**
     * generate a message for loglevel ERROR
     * @param pObject the message Object
     */
    public void error(Object pObject);

    /**
     * generate a message for loglevel FATAL
     * @param pObject the message Object
     */
    public void fatal(Object pObject);

    public void debug(Object message, Throwable obj);
    public void info(Object message, Throwable obj);
    public void warn(Object message, Throwable obj);
    public void error(Object message, Throwable obj);
    public void fatal(Object message, Throwable obj);

    public boolean isEnabledFor(int priority);
    public boolean isDebugEnabled();

    /**
     * returns the name of the logger isntance
     */
    public String getName();

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : DEBUG
     */
    public void safeDebug(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : DEBUG
     */
    public void safeDebug(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : INFO
     */
    public void safeInfo(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : INFO
     */
    public void safeInfo(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : WARN
     */
    public void safeWarn(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : WARN
     */
    public void safeWarn(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : ERROR
     */
    public void safeError(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : ERROR
     */
    public void safeError(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : FATAL
     */
    public void safeFatal(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by obj.toString() implementations.
     * Log level used : FATAL
     */
    public void safeFatal(String message, Object obj, Throwable t);
}
  \ No newline at end of file
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/soda/QueryImpl.java
  
  Index: QueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/soda/QueryImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- QueryImpl.java	19 Feb 2003 22:10:13 -0000	1.4
  +++ QueryImpl.java	29 Dec 2003 16:12:53 -0000	1.4.2.1
  @@ -68,7 +68,7 @@
    */
   public class QueryImpl implements Query, Serializable
   {
  -
  +	static final long serialVersionUID = 7117766237756132776L;
   	private org.apache.ojb.broker.query.Query ojbQuery = null;
   	private int limitCount = -1;
       private PersistenceBroker broker;
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +1 -0      db-ojb/src/java/org/apache/ojb/odmg/locking/LockEntry.java
  
  Index: LockEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockEntry.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- LockEntry.java	2 May 2003 09:05:50 -0000	1.3
  +++ LockEntry.java	29 Dec 2003 16:12:53 -0000	1.3.2.1
  @@ -66,6 +66,7 @@
    */
   public class LockEntry implements Serializable
   {
  +	static final long serialVersionUID = 8060850552557793930L;
       /**
        * marks a Read Lock.
        */
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/broker/util/sequence/HighLowSequence.java
  
  Index: HighLowSequence.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/HighLowSequence.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- HighLowSequence.java	6 Nov 2003 01:38:16 -0000	1.7
  +++ HighLowSequence.java	29 Dec 2003 16:12:53 -0000	1.7.2.1
  @@ -68,6 +68,7 @@
    */
   public class HighLowSequence implements Serializable
   {
  +	static final long serialVersionUID = -2174468157880921393L;
       private String tableName;
       private String fieldName;
       private long maxKey;
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +2 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/propertyEditors/EditableTreeNodeWithProperties.java
  
  Index: EditableTreeNodeWithProperties.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/propertyEditors/EditableTreeNodeWithProperties.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- EditableTreeNodeWithProperties.java	4 Sep 2002 16:18:10 -0000	1.1
  +++ EditableTreeNodeWithProperties.java	29 Dec 2003 16:12:53 -0000	1.1.2.1
  @@ -81,6 +81,7 @@
       org.apache.ojb.tools.mapping.reversedb2.propertyEditors.PropertyEditorTarget,
       java.io.Serializable
   {
  +	static final long serialVersionUID = -8720549176372985715L;
   
       private java.util.HashMap hmAttributes = new java.util.HashMap();
       
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org