You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/24 13:10:29 UTC
svn commit: r1571258 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/test/java/org/apache/qpid/server/configuration/startup/
systests/sr...
Author: rgodfrey
Date: Mon Feb 24 12:10:28 2014
New Revision: 1571258
URL: http://svn.apache.org/r1571258
Log:
QPID-5579 : Remove unused constants
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java Mon Feb 24 12:10:28 2014
@@ -28,13 +28,10 @@ import org.apache.qpid.server.security.A
public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
{
- public static final String DESCRIPTION = "description";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
public static final String TIME_TO_LIVE = "timeToLive";
- public static final String CREATED = "created";
- public static final String UPDATED = "updated";
public static final String TYPE = "type";
//retrieve the underlying AccessControl object
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java Mon Feb 24 12:10:28 2014
@@ -34,8 +34,6 @@ public interface AuthenticationProvider<
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
public static final String TIME_TO_LIVE = "timeToLive";
- public static final String CREATED = "created";
- public static final String UPDATED = "updated";
//children
Collection<VirtualHostAlias> getVirtualHostPortBindings();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java Mon Feb 24 12:10:28 2014
@@ -41,12 +41,10 @@ public interface Binding<X extends Bindi
public String ARGUMENTS = "arguments";
- public String CREATED = "created";
public String DURABLE = "durable";
public String LIFETIME_POLICY = "lifetimePolicy";
public String STATE = "state";
public String TIME_TO_LIVE = "timeToLive";
- public String UPDATED = "updated";
public String QUEUE = "queue";
public String EXCHANGE = "exchange";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Mon Feb 24 12:10:28 2014
@@ -36,7 +36,6 @@ public interface Broker<X extends Broker
{
String BUILD_VERSION = "buildVersion";
- String BYTES_RETAINED = "bytesRetained";
String OPERATING_SYSTEM = "operatingSystem";
String PLATFORM = "platform";
String PROCESS_PID = "processPid";
@@ -46,12 +45,10 @@ public interface Broker<X extends Broker
String SUPPORTED_VIRTUALHOST_STORE_TYPES = "supportedVirtualHostStoreTypes";
String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders";
String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java Mon Feb 24 12:10:28 2014
@@ -64,8 +64,6 @@ public interface Connection<X extends Co
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
public static final String TIME_TO_LIVE = "timeToLive";
- public static final String CREATED = "created";
- public static final String UPDATED = "updated";
public static final String CLIENT_ID = "clientId";
public static final String CLIENT_VERSION = "clientVersion";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java Mon Feb 24 12:10:28 2014
@@ -31,12 +31,10 @@ public interface Consumer<X extends Cons
public String NO_LOCAL = "noLocal";
public String SELECTOR = "selector";
public String SETTLEMENT_MODE = "settlementMode";
- public String CREATED = "created";
public String DURABLE = "durable";
public String LIFETIME_POLICY = "lifetimePolicy";
public String STATE = "state";
public String TIME_TO_LIVE = "timeToLive";
- public String UPDATED = "updated";
@ManagedAttribute
String getDistributionMode();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Mon Feb 24 12:10:28 2014
@@ -47,12 +47,10 @@ public interface Exchange<X extends Exch
PRODUCER_COUNT,
STATE_CHANGED));
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
String ALTERNATE_EXCHANGE = "alternateExchange";
// Attributes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java Mon Feb 24 12:10:28 2014
@@ -21,11 +21,9 @@ package org.apache.qpid.server.model;
public interface Group<X extends Group<X>> extends ConfiguredObject<X>
{
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java Mon Feb 24 12:10:28 2014
@@ -25,11 +25,9 @@ import java.util.Collections;
public interface GroupMember<X extends GroupMember<X>> extends ConfiguredObject<X>
{
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java Mon Feb 24 12:10:28 2014
@@ -32,22 +32,6 @@ public interface GroupProvider<X extends
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
public static final String TIME_TO_LIVE = "timeToLive";
- public static final String CREATED = "created";
- public static final String UPDATED = "updated";
- public static final String TYPE = "type";
-
- public static final Collection<String> AVAILABLE_ATTRIBUTES =
- Collections.unmodifiableList(
- Arrays.asList(ID,
- NAME,
- DESCRIPTION,
- STATE,
- DURABLE,
- LIFETIME_POLICY,
- TIME_TO_LIVE,
- CREATED,
- UPDATED,
- TYPE));
Set<Principal> getGroupPrincipalsForUser(String username);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java Mon Feb 24 12:10:28 2014
@@ -32,8 +32,6 @@ public interface KeyStore<X extends KeyS
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String CREATED = "created";
- String UPDATED = "updated";
String DESCRIPTION = "description";
String PATH = "path";
@@ -42,25 +40,6 @@ public interface KeyStore<X extends KeyS
String CERTIFICATE_ALIAS = "certificateAlias";
String KEY_MANAGER_FACTORY_ALGORITHM = "keyManagerFactoryAlgorithm";
- public static final Collection<String> AVAILABLE_ATTRIBUTES =
- Collections.unmodifiableList(
- Arrays.asList(
- ID,
- NAME,
- STATE,
- DURABLE,
- LIFETIME_POLICY,
- TIME_TO_LIVE,
- CREATED,
- UPDATED,
- DESCRIPTION,
- PATH,
- PASSWORD,
- KEY_STORE_TYPE,
- CERTIFICATE_ALIAS,
- KEY_MANAGER_FACTORY_ALGORITHM
- ));
-
@ManagedAttribute( secure = true )
public String getPassword();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java Mon Feb 24 12:10:28 2014
@@ -27,12 +27,10 @@ import java.util.Collections;
public interface Plugin<X extends Plugin<X>> extends ConfiguredObject<X>
{
//Hack, using it for the class name only for consistency with the other things.
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
// Attributes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Mon Feb 24 12:10:28 2014
@@ -28,12 +28,10 @@ import java.util.List;
public interface Port<X extends Port<X>> extends ConfiguredObject<X>
{
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
String BINDING_ADDRESS = "bindingAddress";
String PORT = "port";
String PROTOCOLS = "protocols";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java Mon Feb 24 12:10:28 2014
@@ -29,27 +29,11 @@ import java.util.Set;
public interface PreferencesProvider<X extends PreferencesProvider<X>> extends ConfiguredObject<X>
{
- String CREATED = "created";
- String UPDATED = "updated";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- Collection<String> AVAILABLE_ATTRIBUTES =
- Collections.unmodifiableList(
- Arrays.asList(
- ID,
- NAME,
- STATE,
- TYPE,
- CREATED,
- UPDATED,
- DURABLE,
- LIFETIME_POLICY,
- TIME_TO_LIVE
- ));
-
/**
* Returns preferences {@link Map} for a given user ID
* @param userId user ID to retrieve preferences for
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java Mon Feb 24 12:10:28 2014
@@ -55,8 +55,6 @@ public interface Session<X extends Sessi
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
public static final String TIME_TO_LIVE = "timeToLive";
- public static final String CREATED = "created";
- public static final String UPDATED = "updated";
public static final String CHANNEL_ID = "channelId";
// PRODUCER_FLOW_BLOCKED is exposed as an interim step. We will expose attribute(s) that exposing
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java Mon Feb 24 12:10:28 2014
@@ -32,8 +32,6 @@ public interface TrustStore<X extends Tr
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String CREATED = "created";
- String UPDATED = "updated";
String DESCRIPTION = "description";
String PATH = "path";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java Mon Feb 24 12:10:28 2014
@@ -28,31 +28,15 @@ import java.util.Map;
public interface User<X extends User<X>> extends ConfiguredObject<X>
{
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
String PASSWORD = "password";
// Attributes
- public static final Collection<String> AVAILABLE_ATTRIBUTES =
- Collections.unmodifiableList(
- Arrays.asList(
- ID,
- NAME,
- STATE,
- DURABLE,
- LIFETIME_POLICY,
- TIME_TO_LIVE,
- CREATED,
- UPDATED,
- PASSWORD
- ));
-
- @ManagedAttribute
+ @ManagedAttribute( secure = true )
String getPassword();
public void setPassword(String password);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Mon Feb 24 12:10:28 2014
@@ -80,12 +80,10 @@ public interface VirtualHost<X extends V
String CONFIG_STORE_PATH = "configStorePath";
String SUPPORTED_EXCHANGE_TYPES = "supportedExchangeTypes";
String SUPPORTED_QUEUE_TYPES = "supportedQueueTypes";
- String CREATED = "created";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
- String UPDATED = "updated";
String CONFIG_PATH = "configPath";
// Attributes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java Mon Feb 24 12:10:28 2014
@@ -21,6 +21,7 @@
package org.apache.qpid.server.model.adapter;
import java.security.AccessControlException;
+import java.security.AccessController;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -33,8 +34,12 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.util.MapValueConverter;
+import javax.security.auth.Subject;
+
public abstract class AbstractKeyStoreAdapter<X extends ConfiguredObject<X>> extends AbstractConfiguredObject<X>
{
public static final String DUMMY_PASSWORD_MASK = "********";
@@ -154,23 +159,9 @@ public abstract class AbstractKeyStoreAd
{
return getTimeToLive();
}
- else if(KeyStore.CREATED.equals(name))
- {
-
- }
- else if(KeyStore.UPDATED.equals(name))
- {
-
- }
else if(KeyStore.PASSWORD.equals(name))
{
- // For security reasons we don't expose the password
- if (getPassword() != null)
- {
- return DUMMY_PASSWORD_MASK;
- }
-
- return null;
+ return getPassword();
}
return super.getAttribute(name);
@@ -178,7 +169,15 @@ public abstract class AbstractKeyStoreAd
public String getPassword()
{
- return _password;
+ // For security reasons we don't expose the password unless running as the system user
+ if(SecurityManager.SYSTEM.equals(Subject.getSubject(AccessController.getContext())))
+ {
+ return _password;
+ }
+ else
+ {
+ return DUMMY_PASSWORD_MASK;
+ }
}
public void setPassword(String password)
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java Mon Feb 24 12:10:28 2014
@@ -137,14 +137,6 @@ public abstract class AbstractPluginAdap
{
return getTimeToLive();
}
- else if (CREATED.equals(name))
- {
-
- }
- else if (UPDATED.equals(name))
- {
-
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java Mon Feb 24 12:10:28 2014
@@ -159,11 +159,7 @@ public class AccessControlProviderAdapte
@Override
public Object getAttribute(String name)
{
- if(CREATED.equals(name))
- {
- // TODO
- }
- else if(DURABLE.equals(name))
+ if(DURABLE.equals(name))
{
return true;
}
@@ -183,10 +179,6 @@ public class AccessControlProviderAdapte
{
// TODO
}
- else if(UPDATED.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java Mon Feb 24 12:10:28 2014
@@ -171,11 +171,7 @@ public abstract class AuthenticationProv
@Override
public Object getAttribute(String name)
{
- if(CREATED.equals(name))
- {
- // TODO
- }
- else if(DURABLE.equals(name))
+ if(DURABLE.equals(name))
{
return true;
}
@@ -195,10 +191,6 @@ public abstract class AuthenticationProv
{
// TODO
}
- else if(UPDATED.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
@@ -693,7 +685,7 @@ public abstract class AuthenticationProv
@Override
public Collection<String> getAttributeNames()
{
- return User.AVAILABLE_ATTRIBUTES;
+ return Attribute.getAttributeNames(User.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java Mon Feb 24 12:10:28 2014
@@ -161,14 +161,6 @@ final class BindingAdapter extends Abstr
{
}
- else if(CREATED.equals(name))
- {
-
- }
- else if(UPDATED.equals(name))
- {
-
- }
else if(EXCHANGE.equals(name))
{
return _exchange.getName();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Mon Feb 24 12:10:28 2014
@@ -915,22 +915,10 @@ public class BrokerAdapter<X extends Bro
{
// TODO
}
- else if(CREATED.equals(name))
- {
- // TODO
- }
- else if(UPDATED.equals(name))
- {
- // TODO
- }
else if(BUILD_VERSION.equals(name))
{
return QpidProperties.getBuildVersion();
}
- else if(BYTES_RETAINED.equals(name))
- {
- // TODO
- }
else if(OPERATING_SYSTEM.equals(name))
{
return SystemUtils.getOSString();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java Mon Feb 24 12:10:28 2014
@@ -138,14 +138,6 @@ public class ConsumerAdapter extends Abs
{
}
- else if(CREATED.equals(name))
- {
-
- }
- else if(UPDATED.equals(name))
- {
-
- }
else if(DISTRIBUTION_MODE.equals(name))
{
return _consumer.acquires() ? "MOVE" : "COPY";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java Mon Feb 24 12:10:28 2014
@@ -318,14 +318,6 @@ final class ExchangeAdapter extends Abst
{
}
- else if(CREATED.equals(name))
- {
-
- }
- else if(UPDATED.equals(name))
- {
-
- }
else if(ALTERNATE_EXCHANGE.equals(name))
{
org.apache.qpid.server.exchange.Exchange alternateExchange = _exchange.getAlternateExchange();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java Mon Feb 24 12:10:28 2014
@@ -173,11 +173,7 @@ public class FileSystemPreferencesProvid
@Override
public Object getAttribute(String name)
{
- if (CREATED.equals(name))
- {
- // TODO
- }
- else if (DURABLE.equals(name))
+ if (DURABLE.equals(name))
{
return true;
}
@@ -197,10 +193,6 @@ public class FileSystemPreferencesProvid
{
// TODO
}
- else if (UPDATED.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java Mon Feb 24 12:10:28 2014
@@ -160,11 +160,7 @@ public class GroupProviderAdapter extend
@Override
public Object getAttribute(String name)
{
- if (CREATED.equals(name))
- {
- // TODO
- }
- else if (DURABLE.equals(name))
+ if (DURABLE.equals(name))
{
return true;
}
@@ -184,10 +180,7 @@ public class GroupProviderAdapter extend
{
// TODO
}
- else if (UPDATED.equals(name))
- {
- // TODO
- }
+
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java Mon Feb 24 12:10:28 2014
@@ -26,6 +26,7 @@ import java.security.AccessControlExcept
import java.security.GeneralSecurityException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,6 +37,7 @@ import java.util.UUID;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.Attribute;
@@ -44,6 +46,8 @@ import org.apache.qpid.server.model.Inte
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -76,7 +80,14 @@ public class KeyStoreAdapter extends Abs
_broker = broker;
String keyStorePath = (String)getAttribute(KeyStore.PATH);
- String keyStorePassword = getPassword();
+ String keyStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+ {
+ @Override
+ public String run()
+ {
+ return getPassword();
+ }
+ });
String keyStoreType = (String)getAttribute(KeyStore.KEY_STORE_TYPE);
String keyManagerFactoryAlgorithm = (String)getAttribute(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM);
String certAlias = (String)getAttribute(KeyStore.CERTIFICATE_ALIAS);
@@ -250,7 +261,14 @@ public class KeyStoreAdapter extends Abs
public KeyManager[] getKeyManagers() throws GeneralSecurityException
{
String keyStorePath = (String)getAttribute(KeyStore.PATH);
- String keyStorePassword = getPassword();
+ String keyStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+ {
+ @Override
+ public String run()
+ {
+ return getPassword();
+ }
+ });
String keyStoreType = (String)getAttribute(KeyStore.KEY_STORE_TYPE);
String keyManagerFactoryAlgorithm = (String)getAttribute(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM);
String certAlias = (String)getAttribute(KeyStore.CERTIFICATE_ALIAS);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java Mon Feb 24 12:10:28 2014
@@ -273,14 +273,6 @@ abstract public class PortAdapter<X exte
{
return getTimeToLive();
}
- else if(CREATED.equals(name))
- {
-
- }
- else if(UPDATED.equals(name))
- {
-
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java Mon Feb 24 12:10:28 2014
@@ -26,6 +26,7 @@ import java.security.AccessControlExcept
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -37,6 +38,8 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
+import javax.security.auth.Subject;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -45,6 +48,8 @@ import org.apache.qpid.server.model.Inte
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManagerFactory;
import org.apache.qpid.server.util.MapValueConverter;
@@ -79,7 +84,14 @@ public class TrustStoreAdapter extends A
_broker = broker;
String trustStorePath = (String) getAttribute(TrustStore.PATH);
- String trustStorePassword = getPassword();
+ String trustStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+ {
+ @Override
+ public String run()
+ {
+ return getPassword();
+ }
+ });
String trustStoreType = (String) getAttribute(TrustStore.TRUST_STORE_TYPE);
String trustManagerFactoryAlgorithm = (String) getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
@@ -238,7 +250,15 @@ public class TrustStoreAdapter extends A
public TrustManager[] getTrustManagers() throws GeneralSecurityException
{
String trustStorePath = (String)getAttribute(TrustStore.PATH);
- String trustStorePassword = getPassword();
+ String trustStorePassword = Subject.doAs(org.apache.qpid.server.security.SecurityManager.SYSTEM,
+ new PrivilegedAction<String>()
+ {
+ @Override
+ public String run()
+ {
+ return getPassword();
+ }
+ });
String trustStoreType = (String)getAttribute(TrustStore.TRUST_STORE_TYPE);
String trustManagerFactoryAlgorithm = (String)getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Mon Feb 24 12:10:28 2014
@@ -817,14 +817,6 @@ public final class VirtualHostAdapter ex
{
// TODO
}
- else if(CREATED.equals(name))
- {
- // TODO
- }
- else if(UPDATED.equals(name))
- {
- // TODO
- }
else if (_virtualHost != null)
{
return getAttributeFromVirtualHostImplementation(name);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java Mon Feb 24 12:10:28 2014
@@ -23,11 +23,13 @@ package org.apache.qpid.server.configura
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.net.ssl.KeyManagerFactory;
+import javax.security.auth.Subject;
import junit.framework.TestCase;
@@ -35,6 +37,8 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.adapter.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.test.utils.TestSSLConstants;
public class KeyStoreRecovererTest extends TestCase
@@ -52,17 +56,25 @@ public class KeyStoreRecovererTest exten
when(entry.getId()).thenReturn(id);
KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
+ final KeyStore keyStore = recoverer.create(null, entry, broker);
- KeyStore keyStore = recoverer.create(null, entry, broker);
assertNotNull("Key store configured object is not created", keyStore);
assertEquals(id, keyStore.getId());
//verify we can retrieve the actual password using the method
- assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
- assertNotNull(keyStore.getPassword());
+ Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<Object>()
+ {
+ @Override
+ public Object run()
+ {
+ assertNotNull(keyStore.getPassword());
+ assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
+ //verify that we haven't configured the key store with the actual dummy password value
+ assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
+ return null;
+ }
+ });
- //verify that we haven't configured the key store with the actual dummy password value
- assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
// Verify the remaining attributes, including that the password value returned
// via getAttribute is actually the dummy value and not the real password
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java Mon Feb 24 12:10:28 2014
@@ -23,16 +23,20 @@ package org.apache.qpid.server.configura
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.ConfigurationEntry;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.adapter.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestSSLConstants;
@@ -51,16 +55,24 @@ public class TrustStoreRecovererTest ext
TrustStoreRecoverer recoverer = new TrustStoreRecoverer();
- TrustStore trustStore = recoverer.create(null, entry, broker);
+ final TrustStore trustStore = recoverer.create(null, entry, broker);
assertNotNull("Trust store configured object is not created", trustStore);
assertEquals(id, trustStore.getId());
- //verify we can retrieve the actual password using the method
- assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
- assertNotNull(trustStore.getPassword());
+ Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<Object>()
+ {
+ @Override
+ public Object run()
+ {
+ //verify we can retrieve the actual password using the method
+ assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
+ assertNotNull(trustStore.getPassword());
+ //verify that we haven't configured the trust store with the actual dummy password value
+ assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
+ return null;
+ }
+ });
- //verify that we haven't configured the trust store with the actual dummy password value
- assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
// Verify the remaining attributes, including that the password value returned
// via getAttribute is actually the dummy value and not the real password
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Mon Feb 24 12:10:28 2014
@@ -64,8 +64,8 @@ public class BrokerRestHttpsTest extends
{
Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
- Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class), Broker.BYTES_RETAINED,
- Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE,
+ Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
+ Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.TIME_TO_LIVE,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Mon Feb 24 12:10:28 2014
@@ -235,7 +235,7 @@ public class BrokerRestTest extends Qpid
protected void assertBrokerAttributes(Map<String, Object> brokerDetails)
{
Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
- Broker.BYTES_RETAINED, Broker.PROCESS_PID,
+ Broker.PROCESS_PID,
Broker.TIME_TO_LIVE,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1571258&r1=1571257&r2=1571258&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Mon Feb 24 12:10:28 2014
@@ -183,7 +183,7 @@ public class ConnectionRestTest extends
ConfiguredObject.DESCRIPTION,
Session.STATE,
Session.DURABLE,
- Session.LIFETIME_POLICY, Session.TIME_TO_LIVE, Session.CREATED, Session.UPDATED);
+ Session.LIFETIME_POLICY, Session.TIME_TO_LIVE);
assertEquals("Unexpecte value of attribute " + Session.NAME, session.getChannelId() + "",
sessionData.get(Session.NAME));
assertEquals("Unexpecte value of attribute " + Session.PRODUCER_FLOW_BLOCKED, Boolean.FALSE,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org