[jboss-cvs] JBoss Messaging SVN: r6981 - in trunk: examples/core/perf and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 22 03:10:46 EDT 2009


Author: timfox
Date: 2009-05-22 03:10:46 -0400 (Fri, 22 May 2009)
New Revision: 6981

Added:
   trunk/src/main/org/jboss/messaging/core/security/impl/JAASSecurityManager.java
Removed:
   trunk/src/main/org/jboss/messaging/integration/security/JAASSecurityManager.java
Modified:
   trunk/docs/user-manual/en/jar-dependencies.xml
   trunk/examples/core/perf/build.xml
   trunk/examples/core/perf/perf.properties
   trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
   trunk/examples/jms/jaas/src/org/jboss/jms/example/ExampleLoginModule.java
   trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
   trunk/src/main/org/jboss/messaging/integration/security/SecurityActions.java
   trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java
Log:
tweaks!

Modified: trunk/docs/user-manual/en/jar-dependencies.xml
===================================================================
--- trunk/docs/user-manual/en/jar-dependencies.xml	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/docs/user-manual/en/jar-dependencies.xml	2009-05-22 07:10:46 UTC (rev 6981)
@@ -34,12 +34,12 @@
                     </row>
                     <row>
                         <entry><link linkend="using-jms">jbm-jms.jar</link></entry>
-                        <entry>JBoss Messaging JMS wrappers</entry>
+                        <entry>JBoss Messaging JMS facade</entry>
                         <entry>jbm-core.jar, jboss-javaee.jar</entry>
                     </row>
                     <row>
                         <entry><link linkend="using-server">jbm-bootstrap.jar</link></entry>
-                        <entry>Standalone server support</entry>
+                        <entry>Classes to bootstrap JBM in the JBoss Microcontainer</entry>
                         <entry>jbm-core.jar and JBoss Micro Container</entry>
                     </row>
                     <row>
@@ -49,14 +49,14 @@
                     </row>
                     <row>
                         <entry><link linkend="security">jbm-jbossas-security.jar</link></entry>
-                        <entry>Classes used to start a standalone server</entry>
+                        <entry>Security Manager implementations for JAAS and JBoss AS</entry>
                         <entry>No dependencies if using <literal>JAAS</literal> or JBoss security
                             libraries if using <literal>JBossASSecurityManager</literal></entry>
                     </row>
                     <row>
                         <entry><link linkend="configuring-transports"
                             >jbm-transports.jar</link></entry>
-                        <entry>Socket and HTTP Transport plugins</entry>
+                        <entry>Implementation of the JBM transport provider SPI for Netty</entry>
                         <entry>netty.jar</entry>
                     </row>
                     <row>

Modified: trunk/examples/core/perf/build.xml
===================================================================
--- trunk/examples/core/perf/build.xml	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/examples/core/perf/build.xml	2009-05-22 07:10:46 UTC (rev 6981)
@@ -63,8 +63,8 @@
 
    <target name="runServer" depends="compile">
       <java classname="org.jboss.common.example.SpawnedJBMServer" fork="true" resultproperty="example-result">
-         <jvmarg value="-Xms512M"/>
-		   <jvmarg value="-Xmx512M"/>
+         <jvmarg value="-Xms2048M"/>
+		   <jvmarg value="-Xmx2048M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
 		   <jvmarg value="-XX:+UseFastAccessorMethods"/>

Modified: trunk/examples/core/perf/perf.properties
===================================================================
--- trunk/examples/core/perf/perf.properties	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/examples/core/perf/perf.properties	2009-05-22 07:10:46 UTC (rev 6981)
@@ -1,6 +1,6 @@
-num-messages=1000000
+num-messages=500000
 num-warmup-messages=50000
-message-size=0
+message-size=1000
 durable=false
 transacted=false
 batch-size=1000

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -135,6 +135,7 @@
       params.put(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME, 1024 * 1024);
 
       factory = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName(), params));
+      factory.setPreAcknowledge(true);
 
       factory.setAckBatchSize(perfParams.getBatchSize());
 

Modified: trunk/examples/jms/jaas/src/org/jboss/jms/example/ExampleLoginModule.java
===================================================================
--- trunk/examples/jms/jaas/src/org/jboss/jms/example/ExampleLoginModule.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/examples/jms/jaas/src/org/jboss/jms/example/ExampleLoginModule.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -33,7 +33,7 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.jboss.messaging.integration.security.JAASSecurityManager;
+import org.jboss.messaging.core.security.impl.JAASSecurityManager;
 import org.jboss.security.SimpleGroup;
 
 /**

Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -97,7 +97,7 @@
       String name = node.getAttributes().getNamedItem("name").getNodeValue();
       String address = null;
       String filterString = null;
-      boolean durable = false;
+      boolean durable = true;
 
       NodeList children = node.getChildNodes();
 

Copied: trunk/src/main/org/jboss/messaging/core/security/impl/JAASSecurityManager.java (from rev 6980, trunk/src/main/org/jboss/messaging/integration/security/JAASSecurityManager.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/impl/JAASSecurityManager.java	                        (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/JAASSecurityManager.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -0,0 +1,311 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.core.security.impl;
+
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.security.CheckType;
+import org.jboss.messaging.core.security.JBMSecurityManager;
+import org.jboss.messaging.core.security.Role;
+import org.jboss.messaging.core.server.MessagingComponent;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * This implementation delegates to the JAAS security interfaces.
+ * 
+ * The {@link Subject} returned by the login context is expecting to have a {@link Group} with the <code>Roles</code> name
+ * containing a set of {@link Principal} for each role of the user.
+ * 
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ * @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="on at ibis.odessa.ua">Oleg Nitz</a>
+ * @author Scott.Stark at jboss.org
+ */
+public class JAASSecurityManager implements JBMSecurityManager, MessagingComponent
+{
+   private static final Logger log = Logger.getLogger(JAASSecurityManager.class);
+
+   // Static --------------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   private boolean trace = log.isTraceEnabled();
+
+   private String configurationName;
+
+   private boolean started;
+
+   private CallbackHandler callbackHandler;
+
+   private Configuration config;
+
+   // JBMSecurityManager implementation -----------------------------
+
+   public boolean validateUser(final String user, final String password)
+   {
+      try
+      {
+         getAuthenticatedSubject(user, password);
+         return true;
+      }
+      catch (LoginException e1)
+      {
+         return false;
+      }
+   }
+
+   public boolean validateUserAndRole(final String user,
+                                      final String password,
+                                      final Set<Role> roles,
+                                      final CheckType checkType)
+   {
+      Subject localSubject = null;
+      try
+      {
+         localSubject = getAuthenticatedSubject(user, password);
+      }
+      catch (LoginException e1)
+      {
+         return false;
+      }
+
+      boolean authenticated = true;
+
+      if (localSubject != null)
+      {
+         Set<Principal> rolePrincipals = getRolePrincipals(checkType, roles);
+
+         // authenticated = realmMapping.doesUserHaveRole(principal, rolePrincipals);
+
+         boolean hasRole = false;
+         // check that the caller is authenticated to the current thread
+
+         // Check the caller's roles
+         Group subjectRoles = getSubjectRoles(localSubject);
+         if (subjectRoles != null)
+         {
+            Iterator<Principal> iter = rolePrincipals.iterator();
+            while (!hasRole && iter.hasNext())
+            {
+               Principal role = iter.next();
+               hasRole = subjectRoles.isMember(role);
+            }
+         }
+
+         authenticated = hasRole;
+
+         if (trace)
+         {
+            log.trace("user " + user + (authenticated ? " is " : " is NOT ") + "authorized");
+         }
+      }
+      return authenticated;
+   }
+   
+   public void addRole(String user, String role)
+   {
+      // NO-OP
+   }
+
+   public void addUser(String user, String password)
+   {
+      // NO-OP
+   }
+
+   public void removeRole(String user, String role)
+   {
+      // NO-OP
+   }
+
+   public void removeUser(String user)
+   {
+      // NO-OP
+   }
+
+   public void setDefaultUser(String username)
+   {
+      // NO-OP
+   }
+
+   // MessagingComponent implementation -----------------------------
+
+   /**
+    * lifecycle method, needs to be called
+    *
+    * @throws Exception
+    */
+   public synchronized void start() throws Exception
+   {
+      if (started)
+      {
+         return;
+      }
+
+      started = true;
+   }
+
+   public synchronized void stop()
+   {
+      if (!started)
+      {
+         return;
+      }
+      started = false;
+   }
+
+   public synchronized boolean isStarted()
+   {
+      return started;
+   }
+
+   private Subject getAuthenticatedSubject(final String user, final String password) throws LoginException
+   {
+      SimplePrincipal principal = user == null ? null : new SimplePrincipal(user);
+
+      char[] passwordChars = null;
+
+      if (password != null)
+      {
+         passwordChars = password.toCharArray();
+      }
+
+      Subject subject = new Subject();
+
+      if (user != null)
+      {
+         subject.getPrincipals().add(principal);
+      }
+      subject.getPrivateCredentials().add(passwordChars);
+
+      LoginContext lc = new LoginContext(configurationName, subject, callbackHandler, config);
+      lc.login();
+      return lc.getSubject();
+   }
+
+   private Group getSubjectRoles(Subject subject)
+   {
+      Set<Group> subjectGroups = subject.getPrincipals(Group.class);
+      Iterator<Group> iter = subjectGroups.iterator();
+      Group roles = null;
+      while (iter.hasNext())
+      {
+         Group grp = iter.next();
+         String name = grp.getName();
+         if (name.equals("Roles"))
+         {
+            roles = grp;
+         }
+      }
+      return roles;
+   }
+
+   private Set<Principal> getRolePrincipals(final CheckType checkType, final Set<Role> roles)
+   {
+      Set<Principal> principals = new HashSet<Principal>();
+      for (Role role : roles)
+      {
+         if (checkType.hasRole(role))
+         {
+            principals.add(new SimplePrincipal(role.getName()));
+         }
+      }
+      return principals;
+   }
+
+   // Public --------------------------------------------------------
+
+   public void setConfigurationName(String configurationName)
+   {
+      this.configurationName = configurationName;
+   }
+
+   public void setCallbackHandler(CallbackHandler handler)
+   {
+      this.callbackHandler = handler;
+   }
+
+   public void setConfiguration(Configuration config)
+   {
+      this.config = config;
+   }
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+
+   public static class SimplePrincipal implements Principal, java.io.Serializable
+   {
+      private static final long serialVersionUID = 1L;
+
+      private String name;
+
+      public SimplePrincipal(String name)
+      {
+         this.name = name;
+      }
+
+      /** Compare this SimplePrincipal's name against another Principal
+      @return true if name equals another.getName();
+       */
+      public boolean equals(Object another)
+      {
+         if (!(another instanceof Principal))
+            return false;
+         String anotherName = ((Principal)another).getName();
+         boolean equals = false;
+         if (name == null)
+            equals = anotherName == null;
+         else
+            equals = name.equals(anotherName);
+         return equals;
+      }
+
+      public int hashCode()
+      {
+         return (name == null ? 0 : name.hashCode());
+      }
+
+      public String toString()
+      {
+         return name;
+      }
+
+      public String getName()
+      {
+         return name;
+      }
+   }
+
+   
+
+}

Deleted: trunk/src/main/org/jboss/messaging/integration/security/JAASSecurityManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/security/JAASSecurityManager.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/src/main/org/jboss/messaging/integration/security/JAASSecurityManager.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -1,311 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.integration.security;
-
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.security.CheckType;
-import org.jboss.messaging.core.security.JBMSecurityManager;
-import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.core.server.MessagingComponent;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * This implementation delegates to the JAAS security interfaces.
- * 
- * The {@link Subject} returned by the login context is expecting to have a {@link Group} with the <code>Roles</code> name
- * containing a set of {@link Principal} for each role of the user.
- * 
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
- * @author <a href="on at ibis.odessa.ua">Oleg Nitz</a>
- * @author Scott.Stark at jboss.org
- */
-public class JAASSecurityManager implements JBMSecurityManager, MessagingComponent
-{
-   private static final Logger log = Logger.getLogger(JAASSecurityManager.class);
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private boolean trace = log.isTraceEnabled();
-
-   private String configurationName;
-
-   private boolean started;
-
-   private CallbackHandler callbackHandler;
-
-   private Configuration config;
-
-   // JBMSecurityManager implementation -----------------------------
-
-   public boolean validateUser(final String user, final String password)
-   {
-      try
-      {
-         getAuthenticatedSubject(user, password);
-         return true;
-      }
-      catch (LoginException e1)
-      {
-         return false;
-      }
-   }
-
-   public boolean validateUserAndRole(final String user,
-                                      final String password,
-                                      final Set<Role> roles,
-                                      final CheckType checkType)
-   {
-      Subject localSubject = null;
-      try
-      {
-         localSubject = getAuthenticatedSubject(user, password);
-      }
-      catch (LoginException e1)
-      {
-         return false;
-      }
-
-      boolean authenticated = true;
-
-      if (localSubject != null)
-      {
-         Set<Principal> rolePrincipals = getRolePrincipals(checkType, roles);
-
-         // authenticated = realmMapping.doesUserHaveRole(principal, rolePrincipals);
-
-         boolean hasRole = false;
-         // check that the caller is authenticated to the current thread
-
-         // Check the caller's roles
-         Group subjectRoles = getSubjectRoles(localSubject);
-         if (subjectRoles != null)
-         {
-            Iterator<Principal> iter = rolePrincipals.iterator();
-            while (!hasRole && iter.hasNext())
-            {
-               Principal role = iter.next();
-               hasRole = subjectRoles.isMember(role);
-            }
-         }
-
-         authenticated = hasRole;
-
-         if (trace)
-         {
-            log.trace("user " + user + (authenticated ? " is " : " is NOT ") + "authorized");
-         }
-      }
-      return authenticated;
-   }
-   
-   public void addRole(String user, String role)
-   {
-      // NO-OP
-   }
-
-   public void addUser(String user, String password)
-   {
-      // NO-OP
-   }
-
-   public void removeRole(String user, String role)
-   {
-      // NO-OP
-   }
-
-   public void removeUser(String user)
-   {
-      // NO-OP
-   }
-
-   public void setDefaultUser(String username)
-   {
-      // NO-OP
-   }
-
-   // MessagingComponent implementation -----------------------------
-
-   /**
-    * lifecycle method, needs to be called
-    *
-    * @throws Exception
-    */
-   public synchronized void start() throws Exception
-   {
-      if (started)
-      {
-         return;
-      }
-
-      started = true;
-   }
-
-   public synchronized void stop()
-   {
-      if (!started)
-      {
-         return;
-      }
-      started = false;
-   }
-
-   public synchronized boolean isStarted()
-   {
-      return started;
-   }
-
-   private Subject getAuthenticatedSubject(final String user, final String password) throws LoginException
-   {
-      SimplePrincipal principal = user == null ? null : new SimplePrincipal(user);
-
-      char[] passwordChars = null;
-
-      if (password != null)
-      {
-         passwordChars = password.toCharArray();
-      }
-
-      Subject subject = new Subject();
-
-      if (user != null)
-      {
-         subject.getPrincipals().add(principal);
-      }
-      subject.getPrivateCredentials().add(passwordChars);
-
-      LoginContext lc = new LoginContext(configurationName, subject, callbackHandler, config);
-      lc.login();
-      return lc.getSubject();
-   }
-
-   private Group getSubjectRoles(Subject subject)
-   {
-      Set<Group> subjectGroups = subject.getPrincipals(Group.class);
-      Iterator<Group> iter = subjectGroups.iterator();
-      Group roles = null;
-      while (iter.hasNext())
-      {
-         Group grp = iter.next();
-         String name = grp.getName();
-         if (name.equals("Roles"))
-         {
-            roles = grp;
-         }
-      }
-      return roles;
-   }
-
-   private Set<Principal> getRolePrincipals(final CheckType checkType, final Set<Role> roles)
-   {
-      Set<Principal> principals = new HashSet<Principal>();
-      for (Role role : roles)
-      {
-         if (checkType.hasRole(role))
-         {
-            principals.add(new SimplePrincipal(role.getName()));
-         }
-      }
-      return principals;
-   }
-
-   // Public --------------------------------------------------------
-
-   public void setConfigurationName(String configurationName)
-   {
-      this.configurationName = configurationName;
-   }
-
-   public void setCallbackHandler(CallbackHandler handler)
-   {
-      this.callbackHandler = handler;
-   }
-
-   public void setConfiguration(Configuration config)
-   {
-      this.config = config;
-   }
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-   public static class SimplePrincipal implements Principal, java.io.Serializable
-   {
-      private static final long serialVersionUID = 1L;
-
-      private String name;
-
-      public SimplePrincipal(String name)
-      {
-         this.name = name;
-      }
-
-      /** Compare this SimplePrincipal's name against another Principal
-      @return true if name equals another.getName();
-       */
-      public boolean equals(Object another)
-      {
-         if (!(another instanceof Principal))
-            return false;
-         String anotherName = ((Principal)another).getName();
-         boolean equals = false;
-         if (name == null)
-            equals = anotherName == null;
-         else
-            equals = name.equals(anotherName);
-         return equals;
-      }
-
-      public int hashCode()
-      {
-         return (name == null ? 0 : name.hashCode());
-      }
-
-      public String toString()
-      {
-         return name;
-      }
-
-      public String getName()
-      {
-         return name;
-      }
-   }
-
-   
-
-}

Modified: trunk/src/main/org/jboss/messaging/integration/security/SecurityActions.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/security/SecurityActions.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/src/main/org/jboss/messaging/integration/security/SecurityActions.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -28,10 +28,9 @@
 
 import javax.security.auth.Subject;
 
-import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextAssociation;
 import org.jboss.security.SecurityContextFactory;
-import org.jboss.security.SecurityContext;
 
 
 /** A collection of privileged actions for this package

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -30,10 +30,10 @@
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.security.JBMSecurityManager;
 import org.jboss.messaging.core.security.Role;
+import org.jboss.messaging.core.security.impl.JAASSecurityManager;
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.core.server.Queue;
 import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.integration.security.JAASSecurityManager;
 import org.jboss.messaging.tests.util.ServiceTestBase;
 import org.jboss.messaging.utils.SimpleString;
 import org.jboss.security.SimpleGroup;

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java	2009-05-22 06:43:54 UTC (rev 6980)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java	2009-05-22 07:10:46 UTC (rev 6981)
@@ -24,7 +24,7 @@
 
 import org.jboss.messaging.core.security.CheckType;
 import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.integration.security.JAASSecurityManager;
+import org.jboss.messaging.core.security.impl.JAASSecurityManager;
 import org.jboss.messaging.tests.util.UnitTestCase;
 import org.jboss.security.SimpleGroup;
 




More information about the jboss-cvs-commits mailing list