avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server DBRequestContext.java User.java
Date Mon, 19 Nov 2001 10:20:25 GMT
hammant     01/11/19 02:20:25

  Modified:    apps/db/src/java/org/apache/avalon/db/data Cataloged.java
               apps/db/src/java/org/apache/avalon/db/data/impl
                        AbstractDelegatedQueryable.java
                        AbstractQueryable.java
               apps/db/src/java/org/apache/avalon/db/persistence/store
                        StorePersistence.java
               apps/db/src/java/org/apache/avalon/db/server
                        DBRequestContext.java
  Added:       apps/db/src/java/org/apache/avalon/db/data Catalog.java
                        User.java
  Removed:     apps/db/src/java/org/apache/avalon/db/server User.java
  Log:
  Enhancements to Catalog
  
  Revision  Changes    Path
  1.2       +3 -3      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Cataloged.java
  
  Index: Cataloged.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Cataloged.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Cataloged.java	2001/11/12 15:09:04	1.1
  +++ Cataloged.java	2001/11/19 10:20:25	1.2
  @@ -15,16 +15,16 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version * $Revision: 1.1 $
  + * @version * $Revision: 1.2 $
    */
   public interface Cataloged extends Serializable {
   
       /**
  -     * Method getCatalogName
  +     * Method getCatalog
        *
        *
        * @return
        *
        */
  -    String getCatalogName();
  +    Catalog getCatalog();
   }
  
  
  
  1.1                  jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Catalog.java
  
  Index: Catalog.java
  ===================================================================
  
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE file.
   */
  package org.apache.avalon.db.data;
  
  public interface Catalog  {
  
      String getName();
      boolean isSystemCatalog();
  }
  
  
  
  1.1                  jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/User.java
  
  Index: User.java
  ===================================================================
  
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE file.
   */
  package org.apache.avalon.db.data;
  
  public interface User  {
  
      String getName();
      String getID();
  
  }
  
  
  
  1.3       +7 -6      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedQueryable.java
  
  Index: AbstractDelegatedQueryable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedQueryable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractDelegatedQueryable.java	2001/11/12 15:09:04	1.2
  +++ AbstractDelegatedQueryable.java	2001/11/19 10:20:25	1.3
  @@ -14,6 +14,7 @@
   import org.apache.avalon.db.data.Column;
   import org.apache.avalon.db.data.Row;
   import org.apache.avalon.db.data.RowListener;
  +import org.apache.avalon.db.data.Catalog;
   
   import java.util.Vector;
   import java.util.Iterator;
  @@ -25,12 +26,12 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public abstract class AbstractDelegatedQueryable extends AbstractNameable implements Queryable
{
   
       private AbstractQueryable mAbstractQueryable;
  -    protected String mCatalogName;
  +    protected Catalog mCatalog;
   
       /**
        * Constructor AbstractDelegatedQueryable
  @@ -45,12 +46,12 @@
           mAbstractQueryable = rowAbstractQueryable;
       }
   
  -    public String getCatalogName() {
  -        return mCatalogName;
  +    public Catalog getCatalog() {
  +        return mCatalog;
       }
   
  -    public void setCatalogName(String catalogName) {
  -        mCatalogName = catalogName;
  +    public void setCatalog(Catalog catalog) {
  +        mCatalog = catalog;
       }
   
       /**
  
  
  
  1.8       +7 -6      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractQueryable.java
  
  Index: AbstractQueryable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractQueryable.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractQueryable.java	2001/11/18 20:47:20	1.7
  +++ AbstractQueryable.java	2001/11/19 10:20:25	1.8
  @@ -14,6 +14,7 @@
   import org.apache.avalon.db.data.Column;
   import org.apache.avalon.db.data.Row;
   import org.apache.avalon.db.data.RowListener;
  +import org.apache.avalon.db.data.Catalog;
   
   import java.util.Vector;
   import java.util.Iterator;
  @@ -26,14 +27,14 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public abstract class AbstractQueryable extends AbstractNameable implements Queryable {
   
       protected Column[] mColumns;
       protected Vector mRows = new Vector();
       protected transient Vector mListeners = new Vector();
  -    protected String mCatalogName = "?";
  +    protected Catalog mCatalog;
   
       /**
        * Constructor AbstractQueryable
  @@ -48,12 +49,12 @@
           mColumns = columns;
       }
   
  -    public String getCatalogName() {
  -        return mCatalogName;
  +    public Catalog getCatalog() {
  +        return mCatalog;
       }
   
  -    public void setCatalogName(String catalogName) {
  -        mCatalogName = catalogName;
  +    public void setCatalog(Catalog catalog) {
  +        mCatalog = catalog;
       }
   
       public Collection getRows() {
  
  
  
  1.14      +2 -2      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
  
  Index: StorePersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StorePersistence.java	2001/11/19 08:39:17	1.13
  +++ StorePersistence.java	2001/11/19 10:20:25	1.14
  @@ -28,7 +28,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public class StorePersistence extends NoPersistence implements RowListener {
   
  @@ -112,7 +112,7 @@
       }
   
       private void persist(Queryable queryable) {
  -        String path = queryable.getCatalogName() + "/" + queryable.getName();
  +        String path = queryable.getCatalog().getName() + "/" + queryable.getName();
           mObjectRepository.put(path,queryable);
       }
   
  
  
  
  1.2       +2 -0      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/DBRequestContext.java
  
  Index: DBRequestContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/DBRequestContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DBRequestContext.java	2001/11/19 09:03:02	1.1
  +++ DBRequestContext.java	2001/11/19 10:20:25	1.2
  @@ -8,6 +8,8 @@
    */
   package org.apache.avalon.db.server;
   
  +import org.apache.avalon.db.data.User;
  +
   public interface DBRequestContext  {
   
       User getUser();
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message