portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/security/src/test repository_prefs.xml
Date Wed, 05 May 2004 18:31:49 GMT
taylor      2004/05/05 11:31:49

  Modified:    components/security/src/java/org/apache/jetspeed/security/impl
                        UserManagerImpl.java
               components/security/src/java repository_security.xml
               components/security/src/java/org/apache/jetspeed/security/om/impl
                        JetspeedCredentialImpl.java
                        JetspeedPrincipalImpl.java
                        JetspeedPermissionImpl.java
               components/security/src/java/org/apache/jetspeed/security/om
                        JetspeedPrincipal.java JetspeedPermission.java
                        JetspeedCredential.java
               components/security/src/test repository_prefs.xml
  Log:
  enable security component to work with Oracle database backend
  and be backward compatible with HSQL
  involved using BIGINT because of the way that OJB uses setObject on its JDBC objects
  also involved converting ints to longs, shorts to ints
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java
  
  Index: UserManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UserManagerImpl.java	25 Mar 2004 21:39:55 -0000	1.3
  +++ UserManagerImpl.java	5 May 2004 18:31:49 -0000	1.4
  @@ -67,7 +67,7 @@
           JetspeedUserPrincipal omUser = super.getJetspeedUserPrincipal(username);
           Collection credentials = omUser.getCredentials();
           // Create a new credential with the given password.
  -        short credentialType = 0;
  +        int credentialType = 0;
           JetspeedCredential omCredential = new JetspeedCredentialImpl(omUser.getPrincipalId(),
password, credentialType, null);
           if (log.isDebugEnabled())
               log.debug("Credential: " + omCredential.toString());
  
  
  
  1.4       +7 -7      jakarta-jetspeed-2/components/security/src/java/repository_security.xml
  
  Index: repository_security.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/repository_security.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- repository_security.xml	24 Apr 2004 19:05:54 -0000	1.3
  +++ repository_security.xml	5 May 2004 18:31:49 -0000	1.4
  @@ -26,7 +26,7 @@
       <field-descriptor
           name="principalId"
           column="principal_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  @@ -127,7 +127,7 @@
       <field-descriptor
           name="credentialId"
           column="credential_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  @@ -136,7 +136,7 @@
       <field-descriptor
           name="principalId"
           column="principal_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
       >
       </field-descriptor>
       <field-descriptor
  @@ -190,7 +190,7 @@
   	<field-descriptor
           name="principalId"
           column="principal_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  @@ -282,7 +282,7 @@
   	<field-descriptor
           name="principalId"
           column="principal_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  @@ -374,7 +374,7 @@
       <field-descriptor
           name="principalId"
           column="principal_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  @@ -438,7 +438,7 @@
       <field-descriptor
           name="permissionId"
           column="permission_id"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           indexed="true"
           autoincrement="true"
  
  
  
  1.2       +13 -13    jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedCredentialImpl.java
  
  Index: JetspeedCredentialImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedCredentialImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedCredentialImpl.java	10 Mar 2004 06:07:13 -0000	1.1
  +++ JetspeedCredentialImpl.java	5 May 2004 18:31:49 -0000	1.2
  @@ -40,7 +40,7 @@
        * @param type The type.
        * @param classname The classname.
        */
  -    public JetspeedCredentialImpl(int principalId, String value, short type, String classname)
  +    public JetspeedCredentialImpl(long principalId, String value, int type, String classname)
       {
           this.principalId = principalId;
           this.value = value;
  @@ -50,38 +50,38 @@
           this.modifiedDate = this.creationDate;
       }
   
  -    private int credentialId;
  +    private long credentialId;
   
       /**
        * @see org.apache.jetspeed.security.om.JetspeedCredential#getCredentialId()
        */
  -    public int getCredentialId()
  +    public long getCredentialId()
       {
           return this.credentialId;
       }
   
       /**
  -     * @see org.apache.jetspeed.security.om.JetspeedCredential#setCredentialId(int)
  +     * @see org.apache.jetspeed.security.om.JetspeedCredential#setCredentialId(long)
        */
  -    public void setCredentialId(int credentialId)
  +    public void setCredentialId(long credentialId)
       {
           this.credentialId = credentialId;
       }
   
  -    private int principalId;
  +    private long principalId;
   
       /**
        * @see org.apache.jetspeed.security.om.JetspeedCredential#getPrincipalId()
        */
  -    public int getPrincipalId()
  +    public long getPrincipalId()
       {
           return this.principalId;
       }
   
       /**
  -     * @see org.apache.jetspeed.security.om.JetspeedCredential#setPrincipalId(int)
  +     * @see org.apache.jetspeed.security.om.JetspeedCredential#setPrincipalId(long)
        */
  -    public void setPrincipalId(int principalId)
  +    public void setPrincipalId(long principalId)
       {
           this.principalId = principalId;
       }
  @@ -104,20 +104,20 @@
           this.value = value;
       }
   
  -    private short type;
  +    private int type;
   
       /**
        * @see org.apache.jetspeed.security.om.JetspeedCredential#getType()
        */
  -    public short getType()
  +    public int getType()
       {
           return this.type;
       }
   
       /**
  -     * @see org.apache.jetspeed.security.om.JetspeedCredential#setType(short)
  +     * @see org.apache.jetspeed.security.om.JetspeedCredential#setType(int)
        */
  -    public void setType(short type)
  +    public void setType(int type)
       {
           this.type = type;
       }
  
  
  
  1.2       +3 -3      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedPrincipalImpl.java
  
  Index: JetspeedPrincipalImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedPrincipalImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedPrincipalImpl.java	10 Mar 2004 06:07:13 -0000	1.1
  +++ JetspeedPrincipalImpl.java	5 May 2004 18:31:49 -0000	1.2
  @@ -53,12 +53,12 @@
           this.modifiedDate = this.creationDate;
       }
   
  -    private int principalId;
  +    private long principalId;
   
       /**
        * @see org.apache.jetspeed.security.om.JetspeedPrincipal#getPrincipalId()
        */
  -    public int getPrincipalId()
  +    public long getPrincipalId()
       {
           return this.principalId;
       }
  @@ -66,7 +66,7 @@
       /**
        * @see org.apache.jetspeed.security.om.JetspeedPrincipal#setPrincipalId(int)
        */
  -    public void setPrincipalId(int principalId)
  +    public void setPrincipalId(long principalId)
       {
           this.principalId = principalId;
       }
  
  
  
  1.2       +4 -4      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedPermissionImpl.java
  
  Index: JetspeedPermissionImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedPermissionImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedPermissionImpl.java	10 Mar 2004 06:07:13 -0000	1.1
  +++ JetspeedPermissionImpl.java	5 May 2004 18:31:49 -0000	1.2
  @@ -49,20 +49,20 @@
           this.modifiedDate = this.creationDate;
       }
   
  -    private int permissionId;
  +    private long permissionId;
   
       /**
        * @see org.apache.jetspeed.security.om.JetspeedPermission#getPermissionId()
        */
  -    public int getPermissionId()
  +    public long getPermissionId()
       {
           return this.permissionId;
       }
   
       /**
  -     * @see org.apache.jetspeed.security.om.JetspeedPermission#setPermissionId(int)
  +     * @see org.apache.jetspeed.security.om.JetspeedPermission#setPermissionId(long)
        */
  -    public void setPermissionId(int permissionId)
  +    public void setPermissionId(long permissionId)
       {
           this.permissionId = permissionId;
       }
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedPrincipal.java
  
  Index: JetspeedPrincipal.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedPrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedPrincipal.java	10 Mar 2004 06:07:13 -0000	1.1
  +++ JetspeedPrincipal.java	5 May 2004 18:31:49 -0000	1.2
  @@ -42,13 +42,13 @@
        * <p>Getter for the principal id.</p>
        * @return The principal id.
        */
  -    int getPrincipalId();
  +    long getPrincipalId();
   
       /**
        * <p>Setter for the principal id.</p>
        * @param principalId The principal id.
        */
  -    void setPrincipalId(int principalId);
  +    void setPrincipalId(long principalId);
   
       /**
        * <p>Getter for the principal classname.</p>
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedPermission.java
  
  Index: JetspeedPermission.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedPermission.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedPermission.java	10 Mar 2004 06:07:13 -0000	1.1
  +++ JetspeedPermission.java	5 May 2004 18:31:49 -0000	1.2
  @@ -42,13 +42,13 @@
        * <p>Getter for the permission id.</p>
        * @return The permission id.
        */
  -    int getPermissionId();
  +    long getPermissionId();
   
       /**
        * <p>Setter for the permission id.</p>
        * @param permissionId The permission id.
        */
  -    void setPermissionId(int permissionId);
  +    void setPermissionId(long permissionId);
   
       /**
        * <p>Getter for the permission classname.</p>
  
  
  
  1.3       +6 -6      jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedCredential.java
  
  Index: JetspeedCredential.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedCredential.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedCredential.java	25 Mar 2004 21:39:55 -0000	1.2
  +++ JetspeedCredential.java	5 May 2004 18:31:49 -0000	1.3
  @@ -41,25 +41,25 @@
        * <p>Getter for the credential id.</p>
        * @return The credential id.
        */
  -    int getCredentialId();
  +    long getCredentialId();
   
       /**
        * <p>Setter for the credential id.</p>
        * @param credentialId The credential id.
        */
  -    void setCredentialId(int credentialId);
  +    void setCredentialId(long credentialId);
   
       /**
        * <p>Getter for the principal id.</p>
        * @return The principal id.
        */
  -    int getPrincipalId();
  +    long getPrincipalId();
   
       /**
        * <p>Setter for the principal id.</p>
        * @param principalId The principal id.
        */
  -    void setPrincipalId(int principalId);
  +    void setPrincipalId(long principalId);
   
       /**
        * <p>Getter for the credential value.</p>
  @@ -81,7 +81,7 @@
        * </ul>
        * @return The credential type.
        */
  -    short getType();
  +    int getType();
   
       /**
        * <p>Setter for the credential type.</p>
  @@ -91,7 +91,7 @@
        * </ul>
        * @param type The credential type.
        */
  -    void setType(short type);
  +    void setType(int type);
   
       /**
        * <p>Getter for the principal classname.</p>
  
  
  
  1.3       +7 -7      jakarta-jetspeed-2/components/security/src/test/repository_prefs.xml
  
  Index: repository_prefs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/test/repository_prefs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- repository_prefs.xml	18 Mar 2004 19:33:32 -0000	1.2
  +++ repository_prefs.xml	5 May 2004 18:31:49 -0000	1.3
  @@ -25,7 +25,7 @@
       <field-descriptor
           name="nodeId"
           column="NODE_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           autoincrement="true"
       >
  @@ -33,7 +33,7 @@
       <field-descriptor
           name="parentNodeId"
           column="PARENT_NODE_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           nullable="true"
       >
       </field-descriptor>
  @@ -108,7 +108,7 @@
       <field-descriptor
           name="propertyKeyId"
           column="PROPERTY_KEY_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           autoincrement="true"
       >
  @@ -156,7 +156,7 @@
       <field-descriptor
           name="propertyValueId"
           column="PROPERTY_VALUE_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           primarykey="true"
           autoincrement="true"
       >
  @@ -164,14 +164,14 @@
       <field-descriptor
           name="nodeId"
           column="NODE_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           nullable="false"
       >
       </field-descriptor>
       <field-descriptor
           name="propertyKeyId"
           column="PROPERTY_KEY_ID"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           nullable="false"
       >
       </field-descriptor>
  @@ -192,7 +192,7 @@
       <field-descriptor
           name="longPropertyValue"
           column="LONG_VALUE"
  -        jdbc-type="INTEGER"
  +        jdbc-type="BIGINT"
           nullable="true"
       >
       </field-descriptor>
  
  
  

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


Mime
View raw message