mikeh       01/05/23 11:53:34

  Modified:    src/java/org/apache/turbine/om BaseObject.java ComboKey.java
               src/java/org/apache/turbine/om/security TurbineGroup.java
                        TurbinePermission.java TurbineUser.java
               src/java/org/apache/turbine/om/security/peer GroupPeer.java
                        PermissionPeer.java RolePeer.java
                        RolePermissionPeer.java TurbineUserPeer.java
                        UserGroupRolePeer.java UserPeer.java
  Log:
  fix columns that spill over 80 chars.
  
  Revision  Changes    Path
  1.27      +6 -5      jakarta-turbine/src/java/org/apache/turbine/om/BaseObject.java
  
  Index: BaseObject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/BaseObject.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- BaseObject.java   2001/05/05 18:00:44     1.26
  +++ BaseObject.java   2001/05/23 18:52:33     1.27
  @@ -63,7 +63,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
  - * @version $Id: BaseObject.java,v 1.26 2001/05/05 18:00:44 jvanzyl Exp $
  + * @version $Id: BaseObject.java,v 1.27 2001/05/23 18:52:33 mikeh Exp $
    */
   public abstract class BaseObject implements Persistent, Serializable
   {
  @@ -302,10 +302,11 @@
       /**
        * Saves the object. Must be overridden if called.
        */
  +    private static String errMsg = "method must be overridden if called";
       public void save()
           throws Exception
       {
  -        throw new Error("BaseObject.save: method must be overridden if called");
  +        throw new Error("BaseObject.save: " + errMsg); 
       }
   
       /**
  @@ -318,7 +319,7 @@
        */
       public Object getByName(String field)
       {
  -        throw new Error("BaseObject.getByName: method must be overridden if 
called");
  +        throw new Error("BaseObject.getByName: " + errMsg); 
       }
   
       /**
  @@ -328,7 +329,7 @@
        */
       public Object getByPeerName(String name)
       {
  -        throw new Error("BaseObject.getByPeerName: method must be overridden if 
called");
  +        throw new Error("BaseObject.getByPeerName: " + errMsg); 
       }
   
       /**
  @@ -338,7 +339,7 @@
        */
       public Object getByPosition(int pos)
       {
  -        throw new Error("BaseObject.getByPosition: method must be overridden if 
called");
  +        throw new Error("BaseObject.getByPosition: " + errMsg);
       }
   
       /**
  
  
  
  1.11      +6 -8      jakarta-turbine/src/java/org/apache/turbine/om/ComboKey.java
  
  Index: ComboKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/ComboKey.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ComboKey.java     2001/03/29 19:02:32     1.10
  +++ ComboKey.java     2001/05/23 18:52:36     1.11
  @@ -144,12 +144,13 @@
       /**
        * Sets the internal representation using a String array.  
        */
  +    private static String errMsg = 
  +        "This method cannot be used with an uninitialized ComboKey";
       public void setValue(String[] keys) throws TurbineException
       {
           if ( this.key == null ) 
           {
  -            throw new TurbineException(
  -                "This method cannot be used with an uninitialized ComboKey");
  +            throw new TurbineException(errMsg);
               /*
               this.key = new SimpleKey[keys.length];            
               for ( int i=0; i<keys.length; i++ ) 
  @@ -164,8 +165,7 @@
               {
                   if ( this.key[i] == null && keys[i] != null ) 
                   {
  -                    throw new TurbineException(
  -                        "This method cannot be used with an uninitialized 
ComboKey");
  +                    throw new TurbineException(errMsg);
                       // this.key[i] = new SimpleKey( keys[i] );
                   }
                   else 
  @@ -204,8 +204,7 @@
   
           if ( this.key == null ) 
           {
  -            throw new TurbineException(
  -                "This method cannot be used with an uninitialized ComboKey");
  +            throw new TurbineException(errMsg);
               /*
               this.key = new SimpleKey[tmpKeys.size()];            
               for ( int i=0; i<this.key.length; i++ ) 
  @@ -220,8 +219,7 @@
               {
                   if ( this.key[i] == null && tmpKeys.get(i) != null ) 
                   {
  -                    throw new TurbineException(
  -                        "This method cannot be used with an uninitialized 
ComboKey");
  +                    throw new TurbineException(errMsg);
                       // this.key[i] = new SimpleKey( (String)tmpKeys.get(i) );
                   }
                   else 
  
  
  
  1.6       +4 -3      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineGroup.java
  
  Index: TurbineGroup.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineGroup.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TurbineGroup.java 2001/05/20 14:45:15     1.5
  +++ TurbineGroup.java 2001/05/23 18:52:47     1.6
  @@ -67,12 +67,13 @@
    * 
    * <a name="global">
    * <p> Certain Roles that the Users may have in the system may are not related
  - * to any specific resource nor entity. They are assigned within a special group 
  - * named 'global' that can be referenced in the code as {@link #GLOBAL_GROUP_NAME}.
  + * to any specific resource nor entity. 
  + * They are assigned within a special group named 'global' that can be 
  + * referenced in the code as {@link #GLOBAL_GROUP_NAME}.
    * <br>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
  - * @version $Id: TurbineGroup.java,v 1.5 2001/05/20 14:45:15 jvanzyl Exp $
  + * @version $Id: TurbineGroup.java,v 1.6 2001/05/23 18:52:47 mikeh Exp $
    */
   public class TurbineGroup extends SecurityObject implements Group
   {
  
  
  
  1.4       +2 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbinePermission.java
  
  Index: TurbinePermission.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbinePermission.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TurbinePermission.java    2001/05/05 18:00:45     1.3
  +++ TurbinePermission.java    2001/05/23 18:52:49     1.4
  @@ -66,7 +66,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: TurbinePermission.java,v 1.3 2001/05/05 18:00:45 jvanzyl Exp $
  + * @version $Id: TurbinePermission.java,v 1.4 2001/05/23 18:52:49 mikeh Exp $
    */
   public class TurbinePermission extends SecurityObject implements Permission
   {
  @@ -94,7 +94,7 @@
        * @param name The name of the new Permission.
        * @return An object representing the new Permission.
        * @throws TurbineSecurityException if the Permission could not be created.
  -     * @deprecated Please use the createPermission method in TurbineSecurity now.
  +     * @deprecated Please use the createPermission method in TurbineSecurity.
        */
       public static Permission create( String name )
           throws TurbineSecurityException
  
  
  
  1.23      +3 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineUser.java
  
  Index: TurbineUser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineUser.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- TurbineUser.java  2001/05/05 18:00:45     1.22
  +++ TurbineUser.java  2001/05/23 18:52:52     1.23
  @@ -79,7 +79,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
  - * @version $Id: TurbineUser.java,v 1.22 2001/05/05 18:00:45 jvanzyl Exp $
  + * @version $Id: TurbineUser.java,v 1.23 2001/05/23 18:52:52 mikeh Exp $
    */
   public class TurbineUser extends SecurityObject implements User
   {
  @@ -651,7 +651,8 @@
           }
           catch ( Exception e )
           {
  -            org.apache.turbine.util.Log.error("TurbineUser.valueUnbobund(): 
"+e.getMessage());
  +            org.apache.turbine.util.Log.error("TurbineUser.valueUnbobund(): " +
  +                                              e.getMessage());
               org.apache.turbine.util.Log.error(e);
   
               // To prevent messages being lost in case the logging system
  
  
  
  1.13      +3 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
  
  Index: GroupPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- GroupPeer.java    2001/05/20 15:05:32     1.12
  +++ GroupPeer.java    2001/05/23 18:53:05     1.13
  @@ -81,11 +81,12 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
  - * @version $Id: GroupPeer.java,v 1.12 2001/05/20 15:05:32 jvanzyl Exp $
  + * @version $Id: GroupPeer.java,v 1.13 2001/05/23 18:53:05 mikeh Exp $
    */
   public class GroupPeer extends BasePeer
   {
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder mapBuilder = 
  +        (TurbineMapBuilder) getMapBuilder();
   
       /** The table name for this peer. */
       private static final String TABLE_NAME = mapBuilder.getTableGroup();
  
  
  
  1.14      +13 -7     
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
  
  Index: PermissionPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PermissionPeer.java       2001/05/12 00:33:35     1.13
  +++ PermissionPeer.java       2001/05/23 18:53:07     1.14
  @@ -83,26 +83,30 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: PermissionPeer.java,v 1.13 2001/05/12 00:33:35 mpoeschl Exp $
  + * @version $Id: PermissionPeer.java,v 1.14 2001/05/23 18:53:07 mikeh Exp $
    */
   public class PermissionPeer extends BasePeer
   {
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder mapBuilder = 
  +        (TurbineMapBuilder) getMapBuilder();
   
       /** The table name for this peer. */
       private static final String TABLE_NAME = mapBuilder.getTablePermission();
   
       /** The column name for the permission id field. */
  -    public static final String PERMISSION_ID = 
mapBuilder.getPermission_PermissionId();
  +    public static final String PERMISSION_ID = 
  +        mapBuilder.getPermission_PermissionId();
   
       /** The column name for the name field. */
       public static final String NAME = mapBuilder.getPermission_Name();
   
       /** The column name for the ObjectData field */
  -    public static final String OBJECTDATA = mapBuilder.getPermission_ObjectData();
  +    public static final String OBJECTDATA = 
  +        mapBuilder.getPermission_ObjectData();
   
       /** The Oracle sequence name for this peer. */
  -    private static final String SEQUENCE_NAME = mapBuilder.getSequencePermission();
  +    private static final String SEQUENCE_NAME = 
  +        mapBuilder.getSequencePermission();
   
   
       /**
  @@ -135,8 +139,10 @@
           throws Exception
       {
           Criteria criteria = new Criteria();
  -        criteria.add(RolePermissionPeer.ROLE_ID, 
((TurbineRole)role).getPrimaryKey());
  -        criteria.addJoin(RolePermissionPeer.PERMISSION_ID, 
PermissionPeer.PERMISSION_ID);
  +        criteria.add(RolePermissionPeer.ROLE_ID, 
  +                     ((TurbineRole)role).getPrimaryKey());
  +        criteria.addJoin(RolePermissionPeer.PERMISSION_ID, 
  +                         PermissionPeer.PERMISSION_ID);
           return retrieveSet(criteria);
       }
   
  
  
  
  1.14      +9 -5      
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java
  
  Index: RolePeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- RolePeer.java     2001/05/12 00:33:35     1.13
  +++ RolePeer.java     2001/05/23 18:53:11     1.14
  @@ -85,11 +85,12 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: RolePeer.java,v 1.13 2001/05/12 00:33:35 mpoeschl Exp $
  + * @version $Id: RolePeer.java,v 1.14 2001/05/23 18:53:11 mikeh Exp $
    */
   public class RolePeer extends BasePeer
   {
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder mapBuilder = 
  +        (TurbineMapBuilder) getMapBuilder();
   
       /** The table name for this peer. */
       private static final String TABLE_NAME = mapBuilder.getTableRole();
  @@ -144,9 +145,11 @@
           UserPeer up = ((DBSecurityService)TurbineSecurity.getService())
               .getUserPeerInstance();
           
  -        criteria.add(up.getFullColumnName(UserPeer.USERNAME), user.getUserName());
  +        criteria.add(up.getFullColumnName(UserPeer.USERNAME), 
  +                                          user.getUserName());
           criteria.add(GroupPeer.NAME, group.getName());
  -        criteria.addJoin(up.getFullColumnName(UserPeer.USER_ID), 
UserGroupRolePeer.USER_ID);
  +        criteria.addJoin(up.getFullColumnName(UserPeer.USER_ID), 
  +                         UserGroupRolePeer.USER_ID);
   
           criteria.addJoin(GroupPeer.GROUP_ID, UserGroupRolePeer.GROUP_ID);
           criteria.addJoin(UserGroupRolePeer.ROLE_ID, RolePeer.ROLE_ID);
  @@ -260,7 +263,8 @@
           Vector results = BasePeer.doSelect(criteria);
           if(results.size() > 1)
           {
  -            throw new DataBackendException("Multiple roles named 
'"+role.getName()+"' exist!");
  +            throw new DataBackendException("Multiple roles named '" + 
  +                role.getName() + "' exist!");
           }
           return (results.size()==1);
       }
  
  
  
  1.6       +9 -5      
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
  
  Index: RolePermissionPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RolePermissionPeer.java   2001/05/05 18:04:47     1.5
  +++ RolePermissionPeer.java   2001/05/23 18:53:13     1.6
  @@ -68,20 +68,24 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
  - * @version $Id: RolePermissionPeer.java,v 1.5 2001/05/05 18:04:47 jvanzyl Exp $
  + * @version $Id: RolePermissionPeer.java,v 1.6 2001/05/23 18:53:13 mikeh Exp $
    */
   public class RolePermissionPeer extends BasePeer
   {
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder mapBuilder = 
  +        (TurbineMapBuilder) getMapBuilder();
   
       /** The table name for this peer. */
  -    public static final String TABLE_NAME = mapBuilder.getTableRolePermission();
  +    public static final String TABLE_NAME = 
  +        mapBuilder.getTableRolePermission();
   
       /** The column name for the permission id field. */
  -    public static final String PERMISSION_ID = 
mapBuilder.getRolePermission_PermissionId();
  +    public static final String PERMISSION_ID = 
  +        mapBuilder.getRolePermission_PermissionId();
   
       /** The column name for the role id field. */
  -    public static final String ROLE_ID = mapBuilder.getRolePermission_RoleId();
  +    public static final String ROLE_ID = 
  +        mapBuilder.getRolePermission_RoleId();
   
   
       /**
  
  
  
  1.18      +23 -13    
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
  
  Index: TurbineUserPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- TurbineUserPeer.java      2001/05/12 00:33:35     1.17
  +++ TurbineUserPeer.java      2001/05/23 18:53:16     1.18
  @@ -84,12 +84,13 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: TurbineUserPeer.java,v 1.17 2001/05/12 00:33:35 mpoeschl Exp $
  + * @version $Id: TurbineUserPeer.java,v 1.18 2001/05/23 18:53:16 mikeh Exp $
    */
   public class TurbineUserPeer extends BasePeer implements UserPeer
   {
       /** The mapBuilder for this Peer. */
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder mapBuilder = 
  +        (TurbineMapBuilder) getMapBuilder();
   
       // column names
       /** The column name for the visitor id field. */
  @@ -117,10 +118,12 @@
       private static final String EMAIL_COLUMN = mapBuilder.getEmail();
   
       /** The column name for the confirm_value field. */
  -    private static final String CONFIRM_VALUE_COLUMN = mapBuilder.getConfirmValue();
  +    private static final String CONFIRM_VALUE_COLUMN = 
  +        mapBuilder.getConfirmValue();
   
       /** This is the value that is stored in the database for confirmed users. */
  -    public static final String CONFIRM_DATA = 
org.apache.turbine.om.security.User.CONFIRM_DATA;
  +    public static final String CONFIRM_DATA = 
  +        org.apache.turbine.om.security.User.CONFIRM_DATA;
   
       /** The column name for the visitor id field. */
       private static final String OBJECT_DATA_COLUMN = mapBuilder.getObjectData();
  @@ -157,7 +160,8 @@
       public static final String LAST_LOGIN = mapBuilder.getUser_LastLogin();
   
       /** The key name for the confirm_value field. */
  -    public static final String CONFIRM_VALUE = mapBuilder.getUser_ConfirmValue();
  +    public static final String CONFIRM_VALUE = 
  +        mapBuilder.getUser_ConfirmValue();
   
       /** The key name for the object_data field. */
       public static final String OBJECT_DATA = mapBuilder.getUser_ObjectData();
  @@ -169,13 +173,15 @@
       private static Schema schema = initTableSchema(TABLE_NAME);
   
       /** The columns. */
  -    private static com.workingdogs.village.Column[] columns = 
initTableColumns(schema);
  +    private static com.workingdogs.village.Column[] columns = 
  +        initTableColumns(schema);
   
       /** The names of the columns. */
       public static String[] columnNames = initColumnNames(columns);
   
       /** The keys for the criteria. */
  -    public static String[] criteriaKeys = initCriteriaKeys(TABLE_NAME, columnNames);
  +    public static String[] criteriaKeys = 
  +        initCriteriaKeys(TABLE_NAME, columnNames);
   
   
       /**
  @@ -314,12 +320,14 @@
               Record row = (Record)rows.elementAt(i);
               
               // FIXME!! use ObjectKey
  -            ((BaseObject)obj).setPrimaryKey( new 
NumberKey(row.getValue(idPosition).asBigDecimal()) );
  +            ((BaseObject)obj).setPrimaryKey(
  +                new NumberKey(row.getValue(idPosition).asBigDecimal()) );
   
               // Restore the Permanent Storage Hashtable.  First the
               // Hashtable is restored, then any explicit table columns
               // which should be included in the Hashtable are added.
  -            byte[] objectData = (byte[])row.getValue(objectDataPosition).asBytes();
  +            byte[] objectData; 
  +            objectData = (byte[])row.getValue(objectDataPosition).asBytes();
               Hashtable tempHash = (Hashtable)ObjectUtils.deserialize(objectData);
               if (tempHash == null)
               {
  @@ -328,8 +336,9 @@
   
               for( int j=0; j<columnNames.length; j++ )
               {
  -                if ( ! ( columnNames[j].equalsIgnoreCase( USER_ID_COLUMN )
  -                         ||  columnNames[j].equalsIgnoreCase( OBJECT_DATA_COLUMN ) 
))
  +                if ( ! ( columnNames[j].equalsIgnoreCase(USER_ID_COLUMN )
  +                         || columnNames[j].equalsIgnoreCase(OBJECT_DATA_COLUMN))
  +                   )
                   {
                       Object obj2 = null;
                       Value value = row.getValue(j+1);
  @@ -342,7 +351,7 @@
                       if (value.isLong()) obj2 = new Long(value.asLong());
                       if (value.isDouble()) obj2 = new Double(value.asDouble());
                       if (value.isFloat()) obj2 = new Float(value.asFloat());
  -                    if (value.isBoolean()) obj2 = new Boolean(value.asBoolean());
  +                    if (value.isBoolean())obj2 = new Boolean(value.asBoolean());
                       if (value.isString()) obj2 = value.asString();
                       if (value.isTime()) obj2 = value.asTime();
                       if (value.isTimestamp()) obj2 = value.asTimestamp();
  @@ -394,7 +403,8 @@
           Vector results = BasePeer.doSelect(criteria);
           if(results.size() > 1)
           {
  -            throw new DataBackendException("Multiple users named 
'"+user.getUserName()+"' exist!");
  +            throw new DataBackendException("Multiple users named '" + 
  +                user.getUserName() + "' exist!");
           }
           return (results.size()==1);
       }
  
  
  
  1.8       +3 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
  
  Index: UserGroupRolePeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- UserGroupRolePeer.java    2001/05/20 15:05:32     1.7
  +++ UserGroupRolePeer.java    2001/05/23 18:53:18     1.8
  @@ -65,12 +65,13 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: UserGroupRolePeer.java,v 1.7 2001/05/20 15:05:32 jvanzyl Exp $
  + * @version $Id: UserGroupRolePeer.java,v 1.8 2001/05/23 18:53:18 mikeh Exp $
    */
   public class UserGroupRolePeer extends BasePeer
   {
       /** The map builder for this Peer. */
  -    private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder) 
getMapBuilder();
  +    private static final TurbineMapBuilder 
  +        mapBuilder = (TurbineMapBuilder) getMapBuilder();
   
       /** The table name for this peer. */
       public static final String TABLE_NAME = mapBuilder.getTableUserGroupRole();
  
  
  
  1.3       +4 -4      
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserPeer.java
  
  Index: UserPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserPeer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserPeer.java     2001/03/25 21:04:25     1.2
  +++ UserPeer.java     2001/05/23 18:53:20     1.3
  @@ -61,7 +61,7 @@
    * the default User implementation and it's related Peer class.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Leandro Rodrigo Saad Cruz</a>  
  - * @version $Id: UserPeer.java,v 1.2 2001/03/25 21:04:25 jvanzyl Exp $
  + * @version $Id: UserPeer.java,v 1.3 2001/05/23 18:53:20 mikeh Exp $
    */
   public interface UserPeer 
   { 
  @@ -69,13 +69,13 @@
       public static String USERNAME = "LOGIN_NAME";
   
       /** The key name for the username field. */
  -    public static String USER_ID = "USER_ID";                                       
                     
  +    public static String USER_ID = "USER_ID";
   
       /**
        *          
        * Returns the full name of a column.   
  -     *                                                                              
                               
  +     * 
        * @return A String with the full name of the column.            
        */          
  -    public String getFullColumnName(String name);                                   
            
  +    public String getFullColumnName(String name);
   }  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to