Author: robbie
Date: Wed Jun 27 15:33:07 2012
New Revision: 1354578
URL: http://svn.apache.org/viewvc?rev=1354578&view=rev
Log:
merge changes from trunk up to r1348603
Modified:
qpid/branches/java-config-and-management/qpid/java/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/bin/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
(props changed)
Propchange: qpid/branches/java-config-and-management/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1347689-1348603
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1347689-1348603
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1347689-1348603
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1347689-1348603
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1347689-1348603
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Wed Jun 27 15:33:07 2012
@@ -87,6 +87,9 @@ public class ServerConfiguration extends
public static final String MGMT_CUSTOM_REGISTRY_SOCKET =
"management.custom-registry-socket";
public static final String MGMT_JMXPORT_REGISTRYSERVER =
"management.jmxport.registryServer";
public static final String MGMT_JMXPORT_CONNECTORSERVER =
"management.jmxport.connectorServer";
+ public static final String SECURITY_DEFAULT_AUTH_MANAGER =
"security.default-auth-manager";
+ public static final String
SECURITY_PORT_MAPPINGS_PORT_MAPPING_AUTH_MANAGER =
"security.port-mappings.port-mapping.auth-manager";
+ public static final String SECURITY_PORT_MAPPINGS_PORT_MAPPING_PORT =
"security.port-mappings.port-mapping.port";
public static final String STATUS_UPDATES = "status-updates";
public static final String ADVANCED_LOCALE = "advanced.locale";
public static final String CONNECTOR_AMQP10ENABLED =
"connector.amqp10enabled";
@@ -257,6 +260,13 @@ public class ServerConfiguration extends
throw new ConfigurationException(message);
}
+ String[] ports =
getConfig().getStringArray(SECURITY_PORT_MAPPINGS_PORT_MAPPING_PORT);
+ String[] authManagers =
getConfig().getStringArray(SECURITY_PORT_MAPPINGS_PORT_MAPPING_AUTH_MANAGER);
+ if (ports.length != authManagers.length)
+ {
+ throw new ConfigurationException("Validation error: Each
port-mapping must have exactly one port and exactly one auth-manager.");
+ }
+
// QPID-3517: Inconsistency in capitalisation in the SSL configuration
keys used within the connector and management configuration
// sections. For the moment, continue to understand both but generate
a deprecated warning if the less preferred keystore is used.
for (String key : new String[] {"management.ssl.keystorePath",
@@ -615,14 +625,13 @@ public class ServerConfiguration extends
public String getDefaultAuthenticationManager()
{
- return getStringValue("security.default-auth-manager");
+ return getStringValue(SECURITY_DEFAULT_AUTH_MANAGER);
}
-
public Map<Integer, String> getPortAuthenticationMappings()
{
- String[] ports =
getConfig().getStringArray("security.port-mappings.port-mapping.port");
- String[] authManagers =
getConfig().getStringArray("security.port-mappings.port-mapping.auth-manager");
+ String[] ports =
getConfig().getStringArray(SECURITY_PORT_MAPPINGS_PORT_MAPPING_PORT);
+ String[] authManagers =
getConfig().getStringArray(SECURITY_PORT_MAPPINGS_PORT_MAPPING_AUTH_MANAGER);
Map<Integer,String> portMappings = new HashMap<Integer, String>();
for(int i = 0; i < ports.length; i++)
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1347689-1348603
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
Wed Jun 27 15:33:07 2012
@@ -42,7 +42,6 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.logging.messages.VirtualHostMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.adapter.BrokerAdapter;
-import org.apache.qpid.server.plugins.Plugin;
import org.apache.qpid.server.plugins.PluginManager;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
@@ -585,7 +584,7 @@ public abstract class ApplicationRegistr
@Override
public AuthenticationManager getAuthenticationManager(SocketAddress
address)
{
- return
_authenticationManagerRegistry.getAuthenticationManagerFor(address);
+ return
_authenticationManagerRegistry.getAuthenticationManager(address);
}
@Override
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistry.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistry.java
Wed Jun 27 15:33:07 2012
@@ -95,7 +95,7 @@ public class AuthenticationManagerRegist
}
@Override
- public AuthenticationManager getAuthenticationManagerFor(SocketAddress
address)
+ public AuthenticationManager getAuthenticationManager(SocketAddress
address)
{
AuthenticationManager authManager =
address instanceof InetSocketAddress
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.java
Wed Jun 27 15:33:07 2012
@@ -28,7 +28,7 @@ import org.apache.qpid.server.virtualhos
/**
* Registry for {@link AuthenticationManager} instances.
*
- * <p>A lookup method {@link #getAuthenticationManagerFor(SocketAddress)}
allows a caller to determine
+ * <p>A lookup method {@link #getAuthenticationManager(SocketAddress)} allows
a caller to determine
* the AuthenticationManager associated with a particular port number.</p>
*
* <p>It is important to {@link #close()} the registry after use and this
allows the AuthenticationManagers
@@ -44,7 +44,7 @@ public interface IAuthenticationManagerR
* @param address
* @return authentication manager.
*/
- public AuthenticationManager getAuthenticationManagerFor(SocketAddress
address);
+ public AuthenticationManager getAuthenticationManager(SocketAddress
address);
Map<String, AuthenticationManager> getAvailableAuthenticationManagers();
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1347689-1348603
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Wed Jun 27 15:33:07 2012
@@ -1674,6 +1674,75 @@ public class ServerConfigurationTest ext
assertEquals(AmqpProtocolVersion.v0_10,
_serverConfig.getDefaultSupportedProtocolReply());
}
+ public void testDefaultAuthenticationManager() throws Exception
+ {
+ // Check default
+ _serverConfig.initialise();
+ assertNull("unexpected default value",
_serverConfig.getDefaultAuthenticationManager());
+
+ // Check values we set
+ String testAuthManager = "myauthmanager";
+ _config.addProperty("security.default-auth-manager", testAuthManager);
+ _serverConfig = new ServerConfiguration(_config);
+ _serverConfig.initialise();
+ assertEquals(testAuthManager,
_serverConfig.getDefaultAuthenticationManager());
+ }
+
+ public void testPortAuthenticationMappingsDefault() throws Exception
+ {
+ _serverConfig.initialise();
+ assertEquals("unexpected default number of port/authmanager mappings",
0, _serverConfig.getPortAuthenticationMappings().size());
+ }
+
+ public void testPortAuthenticationMappingsWithSingleMapping() throws
Exception
+ {
+ String testAuthManager = "myauthmanager";
+ _config.addProperty("security.port-mappings.port-mapping.port", 1234);
+
_config.addProperty("security.port-mappings.port-mapping.auth-manager",
testAuthManager);
+
+ _serverConfig = new ServerConfiguration(_config);
+ _serverConfig.initialise();
+ assertEquals("unexpected number of port/authmanager mappings", 1,
_serverConfig.getPortAuthenticationMappings().size());
+ assertEquals("unexpected mapping for port", testAuthManager,
_serverConfig.getPortAuthenticationMappings().get(1234));
+ }
+
+ public void testPortAuthenticationMappingsWithManyMapping() throws
Exception
+ {
+ String testAuthManager1 = "myauthmanager1";
+ String testAuthManager2 = "myauthmanager2";
+ _config.addProperty("security.port-mappings.port-mapping(-1).port",
1234);
+
_config.addProperty("security.port-mappings.port-mapping.auth-manager",
testAuthManager1);
+
+ _config.addProperty("security.port-mappings.port-mapping(-1).port",
2345);
+
_config.addProperty("security.port-mappings.port-mapping.auth-manager",
testAuthManager2);
+
+ _serverConfig = new ServerConfiguration(_config);
+ _serverConfig.initialise();
+
+ assertEquals("unexpected number of port/authmanager mappings", 2,
_serverConfig.getPortAuthenticationMappings().size());
+ assertEquals("unexpected mapping for port", testAuthManager1,
_serverConfig.getPortAuthenticationMappings().get(1234));
+ assertEquals("unexpected mapping for port", testAuthManager2,
_serverConfig.getPortAuthenticationMappings().get(2345));
+ }
+
+ public void testPortAuthenticationMappingWithMissingAuthManager() throws
Exception
+ {
+ _config.addProperty("security.port-mappings.port-mapping(-1).port",
1234);
+ // no auth manager defined for port
+ _serverConfig = new ServerConfiguration(_config);
+ try
+ {
+ _serverConfig.initialise();
+ fail("Exception not thrown");
+ }
+ catch(ConfigurationException ce)
+ {
+ // PASS
+ assertEquals("Incorrect error message",
+ "Validation error: Each port-mapping must have exactly one
port and exactly one auth-manager.",
+ ce.getMessage());
+ }
+ }
+
/**
* Convenience method to output required security preamble for broker
config
*/
@@ -1691,7 +1760,6 @@ public class ServerConfigurationTest ext
out.write("\t\t\t\t\t</attribute>\n");
out.write("\t\t\t\t</attributes>\n");
out.write("\t\t\t</principal-database>\n");
- out.write("\t\t\t<jmx-access>/dev/null</jmx-access>\n");
out.write("\t\t</pd-auth-manager>\n");
out.write("\t</security>\n");
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java
Wed Jun 27 15:33:07 2012
@@ -189,7 +189,7 @@ public class AuthenticationManagerRegist
AuthenticationManagerRegistry registry = new
AuthenticationManagerRegistry(_serverConfiguration, _pluginManager);
- AuthenticationManager authenticationManager =
registry.getAuthenticationManagerFor(new InetSocketAddress(1234));
+ AuthenticationManager authenticationManager =
registry.getAuthenticationManager(new InetSocketAddress(1234));
assertEquals("TestAuthenticationManager1",
authenticationManager.getMechanisms());
registry.close();
@@ -204,7 +204,7 @@ public class AuthenticationManagerRegist
AuthenticationManagerRegistry registry = new
AuthenticationManagerRegistry(_serverConfiguration, _pluginManager);
- AuthenticationManager authenticationManager =
registry.getAuthenticationManagerFor(mock(SocketAddress.class));
+ AuthenticationManager authenticationManager =
registry.getAuthenticationManager(mock(SocketAddress.class));
assertEquals("TestAuthenticationManager1",
authenticationManager.getMechanisms());
registry.close();
@@ -227,10 +227,10 @@ public class AuthenticationManagerRegist
AuthenticationManagerRegistry registry = new
AuthenticationManagerRegistry(_serverConfiguration, _pluginManager);
- AuthenticationManager authenticationManager1 =
registry.getAuthenticationManagerFor(new InetSocketAddress(unmappedPortNumber));
+ AuthenticationManager authenticationManager1 =
registry.getAuthenticationManager(new InetSocketAddress(unmappedPortNumber));
assertEquals("TestAuthenticationManager1",
authenticationManager1.getMechanisms());
- AuthenticationManager authenticationManager2 =
registry.getAuthenticationManagerFor(new InetSocketAddress(mappedPortNumber));
+ AuthenticationManager authenticationManager2 =
registry.getAuthenticationManager(new InetSocketAddress(mappedPortNumber));
assertEquals("TestAuthenticationManager2",
authenticationManager2.getMechanisms());
registry.close();
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
Wed Jun 27 15:33:07 2012
@@ -98,7 +98,7 @@ public class TestApplicationRegistry ext
}
@Override
- public AuthenticationManager getAuthenticationManagerFor(
+ public AuthenticationManager getAuthenticationManager(
SocketAddress address)
{
return pdam;
Modified:
qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1354578&r1=1354577&r2=1354578&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Wed Jun 27 15:33:07 2012
@@ -47,10 +47,10 @@ import org.slf4j.LoggerFactory;
public class IoNetworkTransport implements OutgoingNetworkTransport,
IncomingNetworkTransport
{
private static final org.slf4j.Logger LOGGER =
LoggerFactory.getLogger(IoNetworkTransport.class);
+ private static final int TIMEOUT = 60000;
private Socket _socket;
private IoNetworkConnection _connection;
- private long _timeout = 60000;
private AcceptingThread _acceptor;
public NetworkConnection connect(ConnectionSettings settings,
Receiver<ByteBuffer> delegate, SSLContext sslContext)
@@ -75,7 +75,7 @@ public class IoNetworkTransport implemen
InetAddress address = InetAddress.getByName(settings.getHost());
- _socket.connect(new InetSocketAddress(address,
settings.getPort()));
+ _socket.connect(new InetSocketAddress(address,
settings.getPort()), TIMEOUT);
}
catch (SocketException e)
{
@@ -88,7 +88,7 @@ public class IoNetworkTransport implemen
try
{
- _connection = new IoNetworkConnection(_socket, delegate,
sendBufferSize, receiveBufferSize, _timeout);
+ _connection = new IoNetworkConnection(_socket, delegate,
sendBufferSize, receiveBufferSize, TIMEOUT);
_connection.start();
}
catch(Exception e)
@@ -224,7 +224,7 @@ public class IoNetworkTransport implemen
ProtocolEngine engine = _factory.newProtocolEngine();
- NetworkConnection connection = new
IoNetworkConnection(socket, engine, sendBufferSize, receiveBufferSize,
_timeout);
+ NetworkConnection connection = new
IoNetworkConnection(socket, engine, sendBufferSize, receiveBufferSize, TIMEOUT);
if(_sslContext != null)
{
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1347689-1348603
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1347689-1348603
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1347689-1348603
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
