Author: borges Date: 2011-09-26 08:49:52 -0400 (Mon, 26 Sep 2011) New Revision: 11428 Removed: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java Modified: branches/HORNETQ-720_Replication/ branches/HORNETQ-720_Replication/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java Log: merge from trunk Property changes on: branches/HORNETQ-720_Replication ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:10878-11402 + /trunk:10878-11427 Modified: branches/HORNETQ-720_Replication/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2011-09-26 12:10:11 UTC (rev 11427) +++ branches/HORNETQ-720_Replication/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2011-09-26 12:49:52 UTC (rev 11428) @@ -99,7 +99,7 @@ public static final String NETTY_CONNECTOR_FACTORY = NettyConnectorFactory.class.getCanonicalName(); - protected static final String CLUSTER_PASSWORD = "HornetQ"; + protected static final String CLUSTER_PASSWORD = "UnitTestsClusterPassword"; // Attributes ---------------------------------------------------- Deleted: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java 2011-09-26 12:10:11 UTC (rev 11427) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java 2011-09-26 12:49:52 UTC (rev 11428) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005-2009, 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.hornetq.tests.integration.cluster.failover; - -/** - * A NettyFileStorageDiscoveryClusterWithBackupFailoverTest - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * - */ -public class NettyFileStorageDiscoveryClusterWithBackupFailoverTest extends DiscoveryClusterWithBackupFailoverTest -{ - @Override - protected boolean isNetty() - { - return true; - } -} \ No newline at end of file Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2011-09-26 12:10:11 UTC (rev 11427) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2011-09-26 12:49:52 UTC (rev 11428) @@ -24,6 +24,7 @@ import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; +import org.hornetq.tests.util.UnitTestCase; /** * A SecurityManagementTest @@ -58,9 +59,7 @@ */ public void testSendManagementMessageWithClusterAdminUser() throws Exception { - doSendManagementMessage(ConfigurationImpl.DEFAULT_CLUSTER_USER, - ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD, - true); + doSendManagementMessage(ConfigurationImpl.DEFAULT_CLUSTER_USER, UnitTestCase.CLUSTER_PASSWORD, true); } public void testSendManagementMessageWithAdminRole() throws Exception Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2011-09-26 12:10:11 UTC (rev 11427) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2011-09-26 12:49:52 UTC (rev 11428) @@ -63,6 +63,7 @@ protected HornetQServer setupAndStartHornetQServer() throws Exception { Configuration conf = createBasicConfig(); + conf.setClusterPassword(ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD); conf.setSecurityEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); HornetQServer server = HornetQServers.newHornetQServer(conf, false);