[jboss-cvs] JBossAS SVN: r90463 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/profileservice/testsecure and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2009-06-19 03:46:03 -0400 (Fri, 19 Jun 2009)
New Revision: 90463

Modified:
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureManagementView.java
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureProfileServiceBean.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/testsecure/ProfileServiceUnitTestCase.java
Log:
JBAS-7031, change security domain to jmx-console


Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java	2009-06-19 07:44:04 UTC (rev 90462)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java	2009-06-19 07:46:03 UTC (rev 90463)
@@ -47,9 +47,9 @@
  * @version $Revision$
  */
 @Stateless(name="SecureDeploymentManager")
- at SecurityDomain(value="profileservice", unauthenticatedPrincipal="nobody")
+ at SecurityDomain(value="jmx-console", unauthenticatedPrincipal="nobody")
 @Remote(DeploymentManager.class)
- at RolesAllowed({"Administrator"})
+ at RolesAllowed({"JBossAdmin"})
 public class SecureDeploymentManager implements DeploymentManager
 {
    static Logger log = Logger.getLogger(SecureManagementView.class);

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureManagementView.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureManagementView.java	2009-06-19 07:44:04 UTC (rev 90462)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureManagementView.java	2009-06-19 07:46:03 UTC (rev 90463)
@@ -47,9 +47,9 @@
  * @version $Revision$
  */
 @Stateless
- at SecurityDomain(value="profileservice", unauthenticatedPrincipal="nobody")
+ at SecurityDomain(value="jmx-console", unauthenticatedPrincipal="nobody")
 @Remote(ManagementView.class)
- at RolesAllowed({"Administrator"})
+ at RolesAllowed({"JBossAdmin"})
 public class SecureManagementView implements ManagementView
 {
    static Logger log = Logger.getLogger(SecureManagementView.class);

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureProfileServiceBean.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureProfileServiceBean.java	2009-06-19 07:44:04 UTC (rev 90462)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureProfileServiceBean.java	2009-06-19 07:46:03 UTC (rev 90463)
@@ -43,9 +43,9 @@
  * @version $Revision$
  */
 @Stateless(name="SecureProfileService")
- at SecurityDomain(value="profileservice", unauthenticatedPrincipal="nobody")
+ at SecurityDomain(value="jmx-console", unauthenticatedPrincipal="nobody")
 @Remote(ProfileService.class)
- at RolesAllowed({"Administrator"})
+ at RolesAllowed({"JBossAdmin"})
 public class SecureProfileServiceBean implements ProfileService
 {
    @Resource(mappedName="ProfileService")

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/testsecure/ProfileServiceUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/testsecure/ProfileServiceUnitTestCase.java	2009-06-19 07:44:04 UTC (rev 90462)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/testsecure/ProfileServiceUnitTestCase.java	2009-06-19 07:46:03 UTC (rev 90463)
@@ -61,8 +61,8 @@
    private static final String SECURE_MANAGEMENT_VIEW_JNDI_NAME = "SecureManagementView/remote";
    private static final String SECURE_DEPLOYMENT_MANAGER_JNDI_NAME = "SecureDeploymentManager/remote";
    
-   private static final String PROFILE_SERVICE_PRINCIPAL = "javaduke";
-   private static final String PROFILE_SERVICE_CREDENTIALS = "anotherduke";
+   private static final String PROFILE_SERVICE_PRINCIPAL = "admin";
+   private static final String PROFILE_SERVICE_CREDENTIALS = "admin";
 
    private LoginContext loginContext;
 
@@ -117,7 +117,7 @@
    public void testProfileKeys()
       throws Exception
    {
-      login("javaduke", "anotherduke".toCharArray());
+      login(PROFILE_SERVICE_PRINCIPAL, PROFILE_SERVICE_CREDENTIALS.toCharArray());
       ProfileService ps = getProfileService();
       Collection<ProfileKey> keys = ps.getProfileKeys();
       log.info("getProfileKeys: "+keys);
@@ -183,7 +183,7 @@
    public void testDefaultDSComponentCount()
       throws Exception
    {
-      login("javaduke", "anotherduke".toCharArray());
+      login(PROFILE_SERVICE_PRINCIPAL, PROFILE_SERVICE_CREDENTIALS.toCharArray());
       ManagementView mgtView = getManagementView();
       ComponentType type = new ComponentType("DataSource", "LocalTx");
       Set<ManagedComponent> comps = mgtView.getComponentsForType(type);