You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2012/11/07 10:12:58 UTC
svn commit: r1406507 - in
/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src:
main/java/org/apache/qpid/server/configuration/
main/java/org/apache/qpid/server/configuration/startup/
main/java/org/apache/qpid/server/model/ main/java/org/ap...
Author: orudyy
Date: Wed Nov 7 09:12:57 2012
New Revision: 1406507
URL: http://svn.apache.org/viewvc?rev=1406507&view=rev
Log:
QPID-4390: WIP - clean-up in various tests and classes
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/PortConfigurationHelperTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationEntry.java Wed Nov 7 09:12:57 2012
@@ -85,22 +85,26 @@ public class ConfigurationEntry
*/
public Map<ConfiguredObjectType, Collection<ConfigurationEntry>> getChildren()
{
+ Map<ConfiguredObjectType, Collection<ConfigurationEntry>> children = null;
if (_childrenIds == null)
{
- return Collections.emptyMap();
+ children = Collections.emptyMap();
}
- Map<ConfiguredObjectType, Collection<ConfigurationEntry>> children = new HashMap<ConfiguredObjectType, Collection<ConfigurationEntry>>();
- for (UUID childId : _childrenIds)
+ else
{
- ConfigurationEntry entry = _store.getEntry(childId);
- ConfiguredObjectType type = entry.getType();
- Collection<ConfigurationEntry> childrenOfType = children.get(type);
- if (childrenOfType == null)
+ children = new HashMap<ConfiguredObjectType, Collection<ConfigurationEntry>>();
+ for (UUID childId : _childrenIds)
{
- childrenOfType = new ArrayList<ConfigurationEntry>();
- children.put(type, childrenOfType);
+ ConfigurationEntry entry = _store.getEntry(childId);
+ ConfiguredObjectType type = entry.getType();
+ Collection<ConfigurationEntry> childrenOfType = children.get(type);
+ if (childrenOfType == null)
+ {
+ childrenOfType = new ArrayList<ConfigurationEntry>();
+ children.put(type, childrenOfType);
+ }
+ childrenOfType.add(entry);
}
- childrenOfType.add(entry);
}
return Collections.unmodifiableMap(children);
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java Wed Nov 7 09:12:57 2012
@@ -97,7 +97,7 @@ public class BrokerRecoverer implements
Collection<Port> ports = broker.getPorts();
for (Port port : ports)
{
- String authenticationProviderName = port.getAuthenticationManager();
+ String authenticationProviderName = port.getAuthenticationManagerName();
AuthenticationProvider provider = null;
if (authenticationProviderName != null)
{
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java Wed Nov 7 09:12:57 2012
@@ -62,7 +62,7 @@ public class VirtualHostRecoverer extend
+ entry);
}
// XXX hack
- VirtualHostConfiguration virtualHostConfiguration = (VirtualHostConfiguration)attributes.get("configuration");
+ //VirtualHostConfiguration virtualHostConfiguration = (VirtualHostConfiguration)attributes.get("configuration");
// String configurationPath = attributes.get("configuration");
// VirtualHostConfiguration virtualHostConfiguration = new VirtualHostConfiguration(configurationPath);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java Wed Nov 7 09:12:57 2012
@@ -63,4 +63,7 @@ public interface AuthenticationProvider
* TODO: move all the functionality from SubjectCreator into AuthenticationProvider
*/
SubjectCreator getSubjectCreator();
+
+ // XXX just an idea
+ //setGroupProviders(Collection<GroupProvider> groupProviders);
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java Wed Nov 7 09:12:57 2012
@@ -115,7 +115,7 @@ public interface Port extends Configured
boolean isWantClientAuth();
- String getAuthenticationManager();
+ String getAuthenticationManagerName();
AuthenticationProvider getAuthenticationProvider();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java Wed Nov 7 09:12:57 2012
@@ -34,7 +34,8 @@ public enum Protocol
AMQP_1_0(ProtocolType.AMQP),
JMX_RMI(ProtocolType.JMX),
HTTP(ProtocolType.HTTP),
- HTTPS(ProtocolType.HTTP);
+ HTTPS(ProtocolType.HTTP),
+ RMI(ProtocolType.RMI);
private final ProtocolType _protocolType;
@@ -108,6 +109,6 @@ public enum Protocol
static enum ProtocolType
{
- AMQP, HTTP, JMX;
+ AMQP, HTTP, JMX, RMI;
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java Wed Nov 7 09:12:57 2012
@@ -322,7 +322,7 @@ public class PortAdapter extends Abstrac
}
else if(AUTHENTICATION_MANAGER.equals(name))
{
- return getAuthenticationManager();
+ return getAuthenticationManagerName();
}
return super.getAttribute(name);
}
@@ -406,7 +406,7 @@ public class PortAdapter extends Abstrac
}
@Override
- public String getAuthenticationManager()
+ public String getAuthenticationManagerName()
{
return _authenticationManager;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java Wed Nov 7 09:12:57 2012
@@ -63,6 +63,7 @@ public class PortFactory
private boolean isAmqpProtocol(Map<String, Object> portAttributes)
{
Set<Object> protocolStrings = MapValueConverter.getSetAttribute(Port.PROTOCOLS, portAttributes);
+ // XXX fix this for non AMQP ports, f.e, JMX_RMI,HTTP
int amqpProtocolsFound = 0;
int nonAmqpProtocolsFound = 0;
for (Object protocolObject : protocolStrings)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Wed Nov 7 09:12:57 2012
@@ -237,6 +237,7 @@ public class ApplicationRegistry impleme
private void createBroker()
{
+ // XXX get rid of it!!
Map<String, VirtualHostConfiguration> virtualHostConfigurations = new HashMap<String, VirtualHostConfiguration>();
String[] vhNames = _configuration.getVirtualHostsNames();
for (String name : vhNames)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/PortConfigurationHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/PortConfigurationHelperTest.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/PortConfigurationHelperTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/PortConfigurationHelperTest.java Wed Nov 7 09:12:57 2012
@@ -191,6 +191,7 @@ public class PortConfigurationHelperTest
protocols.remove(Protocol.HTTP);
protocols.remove(Protocol.HTTPS);
protocols.remove(Protocol.JMX_RMI);
+ protocols.remove(Protocol.RMI);
return protocols;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java?rev=1406507&r1=1406506&r2=1406507&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactoryTest.java Wed Nov 7 09:12:57 2012
@@ -42,14 +42,14 @@ import org.apache.qpid.server.security.a
public class AuthenticationProviderFactoryTest extends TestCase
{
- public void testCreateInternalAuthenticationManager()
+ public void testCreatePasswordCredentialManagingAuthenticationProvider()
{
AuthenticationProvider provider = testForFactory(mock(PrincipalDatabaseAuthenticationManager.class));
assertTrue("The created provider should match the factory's AuthenticationManager type",
provider instanceof PasswordCredentialManagingAuthenticationProvider);
}
- public void testCreateExternalAuthenticationManager()
+ public void testCreateNonPasswordCredentialManagingAuthenticationProvider()
{
AuthenticationProvider provider = testForFactory(mock(AuthenticationManager.class));
assertFalse("The created provider should match the factory's AuthenticationManager type",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org