db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/odmg ObjectEnvelope.java
Date Wed, 25 Feb 2004 11:03:48 GMT
arminw      2004/02/25 03:03:48

  Modified:    src/java/org/odmg ODMGRuntimeException.java
                        ClassNotPersistenceCapableException.java
               src/java/org/apache/ojb/odmg ObjectEnvelope.java
  Log:
  fix bug I made, now use a valid constructor
  
  Revision  Changes    Path
  1.2       +1 -82     db-ojb/src/java/org/odmg/ODMGRuntimeException.java
  
  Index: ODMGRuntimeException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/odmg/ODMGRuntimeException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ODMGRuntimeException.java	17 Jun 2002 18:16:38 -0000	1.1
  +++ ODMGRuntimeException.java	25 Feb 2004 11:03:48 -0000	1.2
  @@ -1,82 +1 @@
  -package org.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/>.
  - */
  -
  -/**
  - * This is the base class for all RuntimeExceptions thrown by an ODMG implementation.
  - * @author	David Jordan (as Java Editor of the Object Data Management Group)
  - * @version ODMG 3.0
  - */
  -
  -public class ODMGRuntimeException extends RuntimeException
  -{
  -
  -    /**
  -     * Construct an instance of the exception.
  -     */
  -    public ODMGRuntimeException()
  -    {
  -        super();
  -    }
  -
  -    /**
  -     * Construct an instance of the exception with the specified message.
  -     * @param	msg	The message associated with the exception.
  -     */
  -    public ODMGRuntimeException(String msg)
  -    {
  -        super(msg);
  -    }
  -}
  +package org.odmg;

import org.apache.ojb.broker.OJBRuntimeException;


/* ====================================================================
* 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/>.
*/

/**
 * This is the base class for all RuntimeExceptions thrown by an ODMG implementation.
* @author	David Jordan (as Java Editor of the Object Data Management Group)
 * @version ODMG
3.0
 */
public class ODMGRuntimeException extends RuntimeException
{
    public ODMGRuntimeException()
   {
    }

    public ODMGRuntimeException(String msg)
    {
        super(msg);
    }
}

  \ No newline at end of file
  
  
  
  1.2       +1 -82     db-ojb/src/java/org/odmg/ClassNotPersistenceCapableException.java
  
  Index: ClassNotPersistenceCapableException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/odmg/ClassNotPersistenceCapableException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassNotPersistenceCapableException.java	17 Jun 2002 18:16:38 -0000	1.1
  +++ ClassNotPersistenceCapableException.java	25 Feb 2004 11:03:48 -0000	1.2
  @@ -1,82 +1 @@
  -package org.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/>.
  - */
  -
  -/**
  - * This exception is thrown when the implementation cannot make an object persistent because
of the type of the object.
  - * @author	David Jordan (as Java Editor of the Object Data Management Group)
  - * @version ODMG 3.0
  - */
  -
  -public class ClassNotPersistenceCapableException extends ODMGRuntimeException
  -{
  -
  -    /**
  -     * Construct an instance of the exception.
  -     */
  -    public ClassNotPersistenceCapableException()
  -    {
  -        super();
  -    }
  -
  -    /**
  -     * Construct an instance of the exception.
  -     * @param	msg	A string providing a description of the exception.
  -     */
  -    public ClassNotPersistenceCapableException(String msg)
  -    {
  -        super(msg);
  -    }
  -}
  +package org.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/>.
*/

/**
 * This exception is thrown when the implementation cannot make an object persistent
because of the type of the object.
 * @author	David Jordan (as Java Editor of the Object Data
Management Group)
 * @version ODMG 3.0
 */
public class ClassNotPersistenceCapableException
extends ODMGRuntimeException
{
    public ClassNotPersistenceCapableException()
    {
   
}

    public ClassNotPersistenceCapableException(String msg)
    {
        super(msg);
 
  }
}

  \ No newline at end of file
  
  
  
  1.29      +2 -1      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ObjectEnvelope.java	25 Feb 2004 01:22:55 -0000	1.28
  +++ ObjectEnvelope.java	25 Feb 2004 11:03:48 -0000	1.29
  @@ -378,7 +378,8 @@
           catch(PersistenceBrokerException ex)
           {
               LoggerFactory.getDefaultLogger().error("ObjectEnvelope: ", ex);
  -            throw new ODMGRuntimeException("Unexpected error while check existence of "
+ myObj, ex);
  +            throw new ODMGRuntimeException("Unexpected error while check existence of "
  +                    + myObj + ", exception was "+ ex);
           }
           if(needsInsert)
           {
  
  
  

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


Mime
View raw message