taylor      2004/07/18 21:32:07

  Modified:    src/java/org/apache/jetspeed/om/dbregistry
                        SecurityDbEntryPeer.java
  Log:
  - improved Registry Importer's error checking and logging
  - now handling dup keys, they can be optionally replaced or skipped
    use this setting in RegistryImport.properties
  
  services.RegistryImporter.replace.imported.entries = false
  
  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.6       +9 -7      
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbregistry/SecurityDbEntryPeer.java
  
  Index: SecurityDbEntryPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbregistry/SecurityDbEntryPeer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SecurityDbEntryPeer.java  15 Jul 2004 03:54:10 -0000      1.5
  +++ SecurityDbEntryPeer.java  19 Jul 2004 04:32:07 -0000      1.6
  @@ -241,6 +241,7 @@
       }
       
       public static void removeSecurityEntry(String entryName)
  +    throws RegistryException    
       {
           try
           {
  @@ -250,13 +251,13 @@
           }
           catch (TorqueException e)
           {
  -            e.printStackTrace();
               logger.error("Exception Removing Security Entry: " + entryName, e);
  -            // throw new RegistryException("Exception Removing Security Entry: " +  
entryName + ", " + e.toString());
  +            throw new RegistryException("Exception Removing Security Entry: " +  
entryName + ", " + e.toString());
           }
       }
   
       public static void removeSecurityEntryAccess(long id)
  +    throws RegistryException        
       {
           try
           {
  @@ -266,13 +267,13 @@
           }
           catch (TorqueException e)
           {
  -            e.printStackTrace();
               logger.error("Exception Removing Security Entry Accesses: " + id, e);
  -            // throw new RegistryException("Exception Removing Security Entry: " +  
entryName + ", " + e.toString());
  +            throw new RegistryException("Exception Removing Security Entry: " +  id 
+ ", " + e.toString());
           }
       }
       
       public static List fetchExtent()
  +    throws RegistryException
       {
           List extent = new ArrayList();         
           try
  @@ -286,8 +287,9 @@
           }
           catch (TorqueException e)
           {
  -            e.printStackTrace();
  -            logger.error("Exception Fetching Extent for Security", e);            
  +            String msg = "Exception Fetching Extent for Security ";
  +            logger.error(msg , e);
  +            throw new RegistryException(msg + e);
           }
           return extent;
       }
  
  
  

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

Reply via email to