[Babeldoc-devel] babeldoc/modules/sql/src/com/babeldoc/sql/user SqlOrganization.java,1.4,1.5 SqlUserFactory.java,1.4,1.5 SqlUserResourceFactory.java,1.3,1.4

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/user
In directory sc8-pr-cvs1:/tmp/cvs-serv6089/sql/src/com/babeldoc/sql/user

Modified Files:
	SqlOrganization.java SqlUserFactory.java 
	SqlUserResourceFactory.java 
Log Message:
Resources now are Configurable.  Added dbDriver configuration option to sql resources.  Lots of work on the resources - made things more logical from a SW POV.  Added Null scanner.

Index: SqlOrganization.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/user/SqlOrganization.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SqlOrganization.java	27 Jun 2003 02:05:59 -0000	1.4
--- SqlOrganization.java	15 Aug 2003 00:25:30 -0000	1.5
***************
*** 118,122 ****
  
    /**
!    * get the parent organization object -
     *
     * @return
--- 118,122 ----
  
    /**
!    * getChild the parent organization object -
     *
     * @return

Index: SqlUserFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/user/SqlUserFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SqlUserFactory.java	19 Jul 2003 15:32:28 -0000	1.4
--- SqlUserFactory.java	15 Aug 2003 00:25:30 -0000	1.5
***************
*** 100,116 ****
    public static final String RESOURCE_NAME = "resourceName";
  
!   /** constant: the name of the table when getting new keys */
    public static final String TABLE_ORG = "organization";
  
!   /** constant: the name of the table when getting new keys */
    public static final String TABLE_USER = "user";
  
!   /** constant:  the query to get the user by name */
    public static final String USER_GET_BY_NAME = "userGetByName";
  
!   /** constant:  the query to get the user by id */
    public static final String USER_GET_BY_ID = "userGetById";
  
!   /** constant:  the query to get the user by organization id */
    public static final String USER_GET_BY_ORG_ID = "userGetByOrgId";
  
--- 100,116 ----
    public static final String RESOURCE_NAME = "resourceName";
  
!   /** constant: the name of the table when getting new getChildrenNameSet */
    public static final String TABLE_ORG = "organization";
  
!   /** constant: the name of the table when getting new getChildrenNameSet */
    public static final String TABLE_USER = "user";
  
!   /** constant:  the query to getChild the user by name */
    public static final String USER_GET_BY_NAME = "userGetByName";
  
!   /** constant:  the query to getChild the user by id */
    public static final String USER_GET_BY_ID = "userGetById";
  
!   /** constant:  the query to getChild the user by organization id */
    public static final String USER_GET_BY_ORG_ID = "userGetByOrgId";
  
***************
*** 121,128 ****
    public static final String USER_DELETE = "userDelete";
  
!   /** constant:  get a named organization */
    public static final String ORG_GET_BY_NAME = "orgGetByName";
  
!   /** constant:  get an organization */
    public static final String ORG_GET_BY_ID = "orgGetById";
  
--- 121,128 ----
    public static final String USER_DELETE = "userDelete";
  
!   /** constant:  getChild a named organization */
    public static final String ORG_GET_BY_NAME = "orgGetByName";
  
!   /** constant:  getChild an organization */
    public static final String ORG_GET_BY_ID = "orgGetById";
  
***************
*** 165,169 ****
    /**
     * construct a sql user factory connect to the configuration service and then
!    * get the resource.
     */
    public SqlUserFactory() {
--- 165,169 ----
    /**
     * construct a sql user factory connect to the configuration service and then
!    * getChild the resource.
     */
    public SqlUserFactory() {
***************
*** 225,229 ****
  
    /**
!    * Get organization object. get a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.
--- 225,229 ----
  
    /**
!    * Get organization object. getChild a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.
***************
*** 278,282 ****
     * for the resource in a certain order.
     *
!    * @param org the org to get preference
     * @param key
     *
--- 278,282 ----
     * for the resource in a certain order.
     *
!    * @param org the org to getChild preference
     * @param key
     *
***************
*** 325,329 ****
  
    /**
!    * Get user context object. get a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.
--- 325,329 ----
  
    /**
!    * Get user context object. getChild a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.
***************
*** 383,387 ****
  
    /**
!    * Get user context object. get a user context object for the named user.
     * This opject is by default unauthenticated.
     *
--- 383,387 ----
  
    /**
!    * Get user context object. getChild a user context object for the named user.
     * This opject is by default unauthenticated.
     *
***************
*** 410,414 ****
     * resource in a certain order.  Returns null if no preference is found.
     *
!    * @param user the user to get preference
     * @param key the reference to the preference
     *
--- 410,414 ----
     * resource in a certain order.  Returns null if no preference is found.
     *
!    * @param user the user to getChild preference
     * @param key the reference to the preference
     *
***************
*** 794,798 ****
     * Dlete the preference string for the organization.
     *
!    * @param org the org to get preference
     * @param key the preference name
     *
--- 794,798 ----
     * Dlete the preference string for the organization.
     *
!    * @param org the org to getChild preference
     * @param key the preference name
     *
***************
*** 910,914 ****
  
    /**
!    * using md5, get a hash for the string.
     *
     * @param string
--- 910,914 ----
  
    /**
!    * using md5, getChild a hash for the string.
     *
     * @param string
***************
*** 939,943 ****
  
    /**
!    * Get organization object. get a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.
--- 939,943 ----
  
    /**
!    * Get organization object. getChild a user context object for the named user.
     * This object is by default unauthenticated.  If the user is not found, the
     * context object is null.

Index: SqlUserResourceFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/user/SqlUserResourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlUserResourceFactory.java	27 Jun 2003 02:05:59 -0000	1.3
--- SqlUserResourceFactory.java	15 Aug 2003 00:25:30 -0000	1.4
***************
*** 108,115 ****
    public static final String RES_GET_BY_ID = "resGetById";
  
!   /** constant: get user id for resource */
    public static final String RES_GET_USER_FOR_RES = "resGetUserForRes";
  
!   /** constant: get org id for resource */
    public static final String RES_GET_ORG_FOR_RES = "resGetOrgForRes";
  
--- 108,115 ----
    public static final String RES_GET_BY_ID = "resGetById";
  
!   /** constant: getChild user id for resource */
    public static final String RES_GET_USER_FOR_RES = "resGetUserForRes";
  
!   /** constant: getChild org id for resource */
    public static final String RES_GET_ORG_FOR_RES = "resGetOrgForRes";
  
***************
*** 430,434 ****
    /**
     * Get a an array of resources id corresponding to the parts of the resource
!    * tree. This is a very useful feature that will get used subsequently
     *
     * @param connection the connection
--- 430,434 ----
    /**
     * Get a an array of resources id corresponding to the parts of the resource
!    * tree. This is a very useful feature that will getChild used subsequently
     *
     * @param connection the connection
***************
*** 487,491 ****
    /**
     * Get a an array of resources id corresponding to the parts of the resource
!    * tree. This is a very useful feature that will get used subsequently
     *
     * @param userResource the resource
--- 487,491 ----
    /**
     * Get a an array of resources id corresponding to the parts of the resource
!    * tree. This is a very useful feature that will getChild used subsequently
     *
     * @param userResource the resource