You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/09/12 19:07:39 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/db/map DatabaseMap.java TableMap.java

mpoeschl    01/09/12 10:07:39

  Modified:    src/java/org/apache/turbine/util/db IDGeneratorFactory.java
               src/java/org/apache/turbine/util/db/adapter DB.java
                        DBHypersonicSQL.java DBInformix.java
                        DBInstantDB.java DBInterbase.java DBMM.java
                        DBNone.java DBOracle.java DBPostgres.java
                        DBSapDB.java DBSybase.java DBWeblogic.java
               src/java/org/apache/turbine/util/db/map DatabaseMap.java
                        TableMap.java
  Log:
  fix javadoc warnings
  
  Revision  Changes    Path
  1.2       +6 -8      jakarta-turbine-2/src/java/org/apache/turbine/util/db/IDGeneratorFactory.java
  
  Index: IDGeneratorFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/IDGeneratorFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IDGeneratorFactory.java	2001/08/20 02:57:53	1.1
  +++ IDGeneratorFactory.java	2001/09/12 17:07:38	1.2
  @@ -58,17 +58,16 @@
   import org.apache.turbine.util.db.map.IDMethod;
   
   /**
  - * A factory which instantiates {@link
  - * org.apache.torque.oid.IdGenerator} implementations.
  + * A factory which instantiates {@link IdGenerator} implementations.
    *
    * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
  - * @version $Id: IDGeneratorFactory.java,v 1.1 2001/08/20 02:57:53 brekke Exp $
  + * @version $Id: IDGeneratorFactory.java,v 1.2 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class IDGeneratorFactory
   {
       /**
        * The list of ID generation method types which have associated
  -     * {@link org.apache.torque.oid.IdGenerator} implementations.
  +     * {@link IdGenerator} implementations.
        */
       public static final String[] ID_GENERATOR_METHODS =
       {
  @@ -76,10 +75,9 @@
       };
   
       /**
  -     * Factory method which instantiates {@link
  -     * org.apache.torque.oid.IdGenerator} implementations based on the
  -     * return value of the provided adapter's {@link
  -     * org.apache.torque.adapter.DB#getIDMethodType()} method.
  +     * Factory method which instantiates {@link IdGenerator} implementations
  +     * based on the return value of the provided adapter's {@link
  +     * DB#getIDMethodType()} method.
        * Returns <code>null</code> for unknown types.
        *
        * @param dbAdapter The type of adapter to create an ID generator
  
  
  
  1.3       +2 -3      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DB.java
  
  Index: DB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DB.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DB.java	2001/08/20 02:49:31	1.2
  +++ DB.java	2001/09/12 17:07:38	1.3
  @@ -102,7 +102,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DB.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DB.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public abstract class DB implements Serializable, IDMethod
   {
  @@ -232,8 +232,7 @@
       public abstract char getStringDelimiter();
   
       /**
  -     * Returns the constant from the {@link
  -     * org.apache.torque.adapter.IDMethod} interface denoting which
  +     * Returns the constant from the {@see IDMethod} interface denoting which
        * type of primary key generation method this type of RDBMS uses.
        */
       public abstract String getIDMethodType();
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBHypersonicSQL.java
  
  Index: DBHypersonicSQL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBHypersonicSQL.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBHypersonicSQL.java	2001/08/20 02:49:31	1.2
  +++ DBHypersonicSQL.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -65,7 +65,7 @@
    *
    * @author <a href="mailto:celkins@scardini.com">Christopher Elkins</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBHypersonicSQL.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBHypersonicSQL.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBHypersonicSQL
       extends DB
  @@ -150,7 +150,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -158,7 +158,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInformix.java
  
  Index: DBInformix.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInformix.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBInformix.java	2001/08/20 02:49:31	1.2
  +++ DBInformix.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -65,7 +65,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:bpm@ec-group.com">Brian P Millett</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBInformix.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBInformix.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBInformix
       extends DB
  @@ -114,7 +114,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -122,7 +122,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInstantDB.java
  
  Index: DBInstantDB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInstantDB.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBInstantDB.java	2001/08/20 02:49:31	1.2
  +++ DBInstantDB.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -68,7 +68,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBInstantDB.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBInstantDB.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBInstantDB
       extends DB
  @@ -147,7 +147,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -155,7 +155,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInterbase.java
  
  Index: DBInterbase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBInterbase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBInterbase.java	2001/08/20 02:49:31	1.2
  +++ DBInterbase.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -64,7 +64,7 @@
    *
    * @author <a href="mailto:frank@opticode.co.za">Frank Conradie</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBInterbase.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBInterbase.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBInterbase
       extends DB
  @@ -116,7 +116,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -124,7 +124,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBMM.java
  
  Index: DBMM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBMM.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBMM.java	2001/08/20 02:49:31	1.2
  +++ DBMM.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -72,7 +72,7 @@
    * @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBMM.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBMM.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBMM
       extends DB
  @@ -117,7 +117,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -129,7 +129,7 @@
        * inserted, which in this case is <code>SELECT
        * LAST_INSERT_ID()</code>.
        *
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBNone.java
  
  Index: DBNone.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBNone.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBNone.java	2001/08/20 02:49:31	1.2
  +++ DBNone.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBNone.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBNone.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBNone
       extends DB
  @@ -139,7 +139,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -147,7 +147,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +8 -8      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBOracle.java
  
  Index: DBOracle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBOracle.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBOracle.java	2001/08/20 02:49:31	1.2
  +++ DBOracle.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -69,7 +69,7 @@
    * @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBOracle.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBOracle.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBOracle
       extends DB
  @@ -114,7 +114,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -132,7 +132,7 @@
        * @param sequenceName The name of the sequence (should be of type
        * <code>String</code>).
        * @return SQL to retreive the next database key.
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL()
  +     * @see DB#getIDMethodSQL(Object)
        */
       public String getIDMethodSQL(Object sequenceName)
       {
  @@ -206,7 +206,7 @@
       *
       * @return false.
       */
  -    
  +
       public boolean escapeText()
       {
           return false;
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBPostgres.java
  
  Index: DBPostgres.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBPostgres.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBPostgres.java	2001/08/20 02:49:31	1.2
  +++ DBPostgres.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -66,7 +66,7 @@
    *
    * @author <a href="mailto:hakan42@gmx.de">Hakan Tandogan</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBPostgres.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBPostgres.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBPostgres
       extends DB
  @@ -129,12 +129,12 @@
       {
            return AUTO_INCREMENT;
       }
  - 
  +
       /**
        * @param name The name of the field (should be of type
        * <code>String</code>).
        * @return SQL to retreive the next database key.
  -     * @see org.apache.turbine.util.db.adapter.DB#getIDMethodSQL()
  +     * @see org.apache.turbine.util.db.adapter.DB#getIDMethodSQL(Object)
        */
       public String getIDMethodSQL(Object name)
       {
  
  
  
  1.3       +8 -8      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBSapDB.java
  
  Index: DBSapDB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBSapDB.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBSapDB.java	2001/08/20 02:49:31	1.2
  +++ DBSapDB.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -68,7 +68,7 @@
    *
    * @author <a href="mailto:dave.polito@planetcad.com">Dave Polito</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBSapDB.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBSapDB.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBSapDB
       extends DB
  @@ -113,7 +113,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -131,7 +131,7 @@
        * @param sequenceName The name of the sequence (should be of type
        * <code>String</code>).
        * @return SQL to retreive the next database key.
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL()
  +     * @see DB#getIDMethodSQL(Object)
        */
       public String getIDMethodSQL(Object sequenceName)
       {
  @@ -167,7 +167,7 @@
       *
       * @return false.
       */
  -    
  +
       public boolean escapeText()
       {
           return false;
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBSybase.java
  
  Index: DBSybase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBSybase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBSybase.java	2001/08/20 02:49:31	1.2
  +++ DBSybase.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -69,7 +69,7 @@
    *
    * @author <a href="mailto:ekkerbj@netscape.net">Jeff Brekke</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBSybase.java,v 1.2 2001/08/20 02:49:31 brekke Exp $
  + * @version $Id: DBSybase.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBSybase
       extends DB
  @@ -114,7 +114,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -126,7 +126,7 @@
        * per-session basis from the global variable
        * <code>@@identity</code>).
        *
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object unused)
       {
  
  
  
  1.3       +7 -7      jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBWeblogic.java
  
  Index: DBWeblogic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/adapter/DBWeblogic.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBWeblogic.java	2001/08/20 02:49:32	1.2
  +++ DBWeblogic.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -66,7 +66,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DBWeblogic.java,v 1.2 2001/08/20 02:49:32 brekke Exp $
  + * @version $Id: DBWeblogic.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DBWeblogic
       extends DB
  @@ -146,7 +146,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodType()
  +     * @see DB#getIDMethodType()
        */
       public String getIDMethodType()
       {
  @@ -154,7 +154,7 @@
       }
   
       /**
  -     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
  +     * @see DB#getIDMethodSQL(Object obj)
        */
       public String getIDMethodSQL(Object obj)
       {
  
  
  
  1.3       +6 -6      jakarta-turbine-2/src/java/org/apache/turbine/util/db/map/DatabaseMap.java
  
  Index: DatabaseMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/map/DatabaseMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DatabaseMap.java	2001/08/20 02:49:32	1.2
  +++ DatabaseMap.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -66,7 +66,7 @@
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DatabaseMap.java,v 1.2 2001/08/20 02:49:32 brekke Exp $
  + * @version $Id: DatabaseMap.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
   public class DatabaseMap
   {
  @@ -271,7 +271,7 @@
   
       /**
        * Get a type of id generator.  Valid values are listed in the
  -     * {@link org.apache.torque.adapter.IDMethod} interface.
  +     * {@see IDMethod} interface.
        *
        * @param type a <code>String</code> value
        * @return an <code>IdGenerator</code> value
  
  
  
  1.3       +12 -13    jakarta-turbine-2/src/java/org/apache/turbine/util/db/map/TableMap.java
  
  Index: TableMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/map/TableMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TableMap.java	2001/08/20 02:49:32	1.2
  +++ TableMap.java	2001/09/12 17:07:38	1.3
  @@ -25,13 +25,13 @@
    *    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 Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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 Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -66,7 +66,7 @@
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: TableMap.java,v 1.2 2001/08/20 02:49:32 brekke Exp $
  + * @version $Id: TableMap.java,v 1.3 2001/09/12 17:07:38 mpoeschl Exp $
    */
    public class TableMap implements IDMethod
    {
  @@ -249,18 +249,18 @@
       {
           return primaryKeyMethod;
       }
  -    
  +
       /**
        * Get the value of idGenerator.
        * @return value of idGenerator.
        */
  -    public IdGenerator getIdGenerator() 
  +    public IdGenerator getIdGenerator()
       {
           return getDatabaseMap().getIdGenerator(primaryKeyMethod);
       }
   
       /**
  -     * Get the information used to generate a primary key 
  +     * Get the information used to generate a primary key
        *
        * @return An Object.
        */
  @@ -491,8 +491,7 @@
   
       /**
        * Sets the method used to generate a key for this table.  Valid
  -     * values are as specified in the {@link
  -     * org.apache.torque.adapter.IDMethod} interface.
  +     * values are as specified in the {@see IDMethod} interface.
        *
        * @param method The ID generation method type name.
        */
  @@ -516,7 +515,7 @@
       }
   
       /**
  -     * Sets the sequence information needed to generate a key 
  +     * Sets the sequence information needed to generate a key
        *
        * @deprecated.  Use setPrimaryKeyMethodInfo
        */
  @@ -526,9 +525,9 @@
       }
   
       /**
  -     * Sets the pk information needed to generate a key 
  +     * Sets the pk information needed to generate a key
        *
  -     * @param. pkInfo information needed to generate a key 
  +     * @param. pkInfo information needed to generate a key
        */
       public void setPrimaryKeyMethodInfo(Object pkInfo)
       {
  
  
  

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