[jboss-cvs] jboss-jms/src/main/org/jboss/jms/server/security ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/27 15:01:55

  Modified:    src/main/org/jboss/jms/server/security 
                        SecurityMetadataStore.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.6       +5 -16     jboss-jms/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityMetadataStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- SecurityMetadataStore.java	19 Apr 2006 19:33:36 -0000	1.5
  +++ SecurityMetadataStore.java	27 Jul 2006 19:01:55 -0000	1.6
  @@ -27,7 +27,6 @@
   import java.util.Set;
   
   import javax.jms.JMSSecurityException;
  -import javax.jms.JMSException;
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
   import javax.security.auth.Subject;
  @@ -38,7 +37,6 @@
   import org.jboss.security.RealmMapping;
   import org.jboss.security.SimplePrincipal;
   import org.jboss.security.SubjectSecurityManager;
  -import org.jboss.jms.util.MessagingJMSException;
   import org.w3c.dom.Element;
   
   /**
  @@ -49,9 +47,9 @@
    * @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    *
  - * $Id: SecurityMetadataStore.java,v 1.5 2006/04/19 19:33:36 ovidiu Exp $
  + * $Id: SecurityMetadataStore.java,v 1.6 2006/07/27 19:01:55 timfox Exp $
    */
   public class SecurityMetadataStore implements SecurityManager
   {
  @@ -119,20 +117,11 @@
         return m;
      }
   
  -   public void setSecurityConfig(boolean isQueue, String destName, Element conf) throws JMSException
  +   public void setSecurityConfig(boolean isQueue, String destName, Element conf) throws Exception
      {
         if (trace) { log.trace("adding security configuration for " + (isQueue ? "queue " : "topic ") + destName); }
   
  -      SecurityMetadata m = null;
  -
  -      try
  -      {
  -         m = new SecurityMetadata(conf);
  -      }
  -      catch(Exception e)
  -      {
  -         throw new MessagingJMSException("Cannot create security metadata", e);
  -      }
  +      SecurityMetadata m = new SecurityMetadata(conf);
   
         if (isQueue)
         {
  @@ -144,7 +133,7 @@
         }
      }
   
  -   public void clearSecurityConfig(boolean isQueue, String name) throws JMSException
  +   public void clearSecurityConfig(boolean isQueue, String name) throws Exception
      {
         if (trace) { log.trace("clearing security configuration for " + (isQueue ? "queue " : "topic ") + name); }