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 2015/08/28 14:33:55 UTC
svn commit: r1698320 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/store/
broker-core/src/main/resources/ systests/etc/
Author: orudyy
Date: Fri Aug 28 12:33:55 2015
New Revision: 1698320
URL: http://svn.apache.org/r1698320
Log:
QPID-6715: [Java Broker] Change model version to qpid release major and minor version
work by Lorenz Quack <qu...@gmail.com>
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/resources/initial-config.json
qpid/java/trunk/systests/etc/config-systests.json
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java?rev=1698320&r1=1698319&r2=1698320&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java Fri Aug 28 12:33:55 2015
@@ -46,12 +46,13 @@ public final class BrokerModel extends M
* Remove Broker#supportedVirtualHostNodeTypes, #supportedVirtualHostTypes, #supportedAuthenticationProviders,
* supportedPreferencesProviderTypes, VH#supportedExchangeTypes, VH#supportedQueueTypes
* Renamed FileTrustStore/FileKeyStore.path => FileTrustStore/FileKeyStore.storeUrl
- * 3.1 Add BrokerLogger as a child of Broker
+ * 6.0 Add BrokerLogger as a child of Broker
* Replace the defaultVirtualHost (at Broker) with defaultVirtualHostNode flag (at VHN)
* Make Connections children of Ports instead of VHosts
+ * Bring model version and Qpid version into sync
*/
- public static final int MODEL_MAJOR_VERSION = 3;
- public static final int MODEL_MINOR_VERSION = 1;
+ public static final int MODEL_MAJOR_VERSION = 6;
+ public static final int MODEL_MINOR_VERSION = 0;
public static final String MODEL_VERSION = MODEL_MAJOR_VERSION + "." + MODEL_MINOR_VERSION;
private static final Model MODEL_INSTANCE = new BrokerModel();
private final Map<Class<? extends ConfiguredObject>, Collection<Class<? extends ConfiguredObject>>> _parents =
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1698320&r1=1698319&r2=1698320&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java Fri Aug 28 12:33:55 2015
@@ -63,7 +63,7 @@ public class BrokerStoreUpgraderAndRecov
register(new Upgrader_1_3_to_2_0());
register(new Upgrader_2_0_to_3_0());
- register(new Upgrader_3_0_to_3_1());
+ register(new Upgrader_3_0_to_6_0());
}
private void register(StoreUpgraderPhase upgrader)
@@ -318,15 +318,15 @@ public class BrokerStoreUpgraderAndRecov
}
}
- private class Upgrader_3_0_to_3_1 extends StoreUpgraderPhase
+ private class Upgrader_3_0_to_6_0 extends StoreUpgraderPhase
{
private String _defaultVirtualHost;
private final Set<ConfiguredObjectRecord> _knownBdbHaVirtualHostNode = new HashSet<>();
private final Map<String, ConfiguredObjectRecord> _knownNonBdbHaVirtualHostNode = new HashMap<>();
- public Upgrader_3_0_to_3_1()
+ public Upgrader_3_0_to_6_0()
{
- super("modelVersion", "3.0", "3.1");
+ super("modelVersion", "3.0", "6.0");
}
@Override
@@ -348,8 +348,8 @@ public class BrokerStoreUpgraderAndRecov
getUpdateMap().put(record.getId(), record);
}
- addMemoryLogger(record);
- addFileLogger(record);
+ addLogger(record, "memory", "Memory");
+ addLogger(record, "logfile", "File");
getNextUpgrader().configuredObject(record);
}
else if (record.getType().equals("VirtualHostNode"))
@@ -368,43 +368,30 @@ public class BrokerStoreUpgraderAndRecov
}
}
- private void addMemoryLogger(final ConfiguredObjectRecord record)
+ private void addLogger(final ConfiguredObjectRecord record, String name, String type)
{
Map<String,Object> attributes = new HashMap<>();
- attributes.put("name", "memory");
- attributes.put("type", "Memory");
- final ConfiguredObjectRecord memoryLogger = new ConfiguredObjectRecordImpl(UUID.randomUUID(),
- "BrokerLogger",
- attributes,
- Collections.singletonMap("Broker",
- record.getId()));
- addNameValueFilter(1, memoryLogger, LogLevel.INFO, "");
- getUpdateMap().put(memoryLogger.getId(), memoryLogger);
- getNextUpgrader().configuredObject(memoryLogger);
+ attributes.put("name", name);
+ attributes.put("type", type);
+ final ConfiguredObjectRecord logger = new ConfiguredObjectRecordImpl(UUID.randomUUID(),
+ "BrokerLogger",
+ attributes,
+ Collections.singletonMap("Broker",
+ record.getId()));
+ addNameValueFilter("Root", logger, LogLevel.WARN, "ROOT");
+ addNameValueFilter("Qpid", logger, LogLevel.INFO, "org.apache.qpid.*");
+ addNameValueFilter("Operational", logger, LogLevel.INFO, "qpid.message.*");
+ getUpdateMap().put(logger.getId(), logger);
+ getNextUpgrader().configuredObject(logger);
}
- private void addFileLogger(final ConfiguredObjectRecord record)
- {
- Map<String,Object> attributes = new HashMap<>();
- attributes.put("name", "file");
- attributes.put("type", "File");
-
- final ConfiguredObjectRecord fileLogger = new ConfiguredObjectRecordImpl(UUID.randomUUID(),
- "BrokerLogger",
- attributes,
- Collections.singletonMap("Broker",
- record.getId()));
- addNameValueFilter(1, fileLogger, LogLevel.INFO, "");
- getUpdateMap().put(fileLogger.getId(), fileLogger);
- getNextUpgrader().configuredObject(fileLogger);
- }
- private void addNameValueFilter(int seqNo,
+ private void addNameValueFilter(String inclusionRuleName,
final ConfiguredObjectRecord loggerRecord,
final LogLevel level,
final String loggerName)
{
Map<String,Object> attributes = new HashMap<>();
- attributes.put("name", String.valueOf(seqNo));
+ attributes.put("name", inclusionRuleName);
attributes.put("level", level.name());
attributes.put("loggerName", loggerName);
attributes.put("type", "NameAndLevel");
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java?rev=1698320&r1=1698319&r2=1698320&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java Fri Aug 28 12:33:55 2015
@@ -71,7 +71,7 @@ public class VirtualHostStoreUpgraderAnd
register(new Upgrader_0_3_to_0_4());
register(new Upgrader_0_4_to_2_0());
register(new Upgrader_2_0_to_3_0());
- register(new Upgrader_3_0_to_3_1());
+ register(new Upgrader_3_0_to_6_0());
Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>();
for (String exchangeName : DEFAULT_EXCHANGES.keySet())
@@ -516,11 +516,11 @@ public class VirtualHostStoreUpgraderAnd
}
}
- private class Upgrader_3_0_to_3_1 extends StoreUpgraderPhase
+ private class Upgrader_3_0_to_6_0 extends StoreUpgraderPhase
{
- public Upgrader_3_0_to_3_1()
+ public Upgrader_3_0_to_6_0()
{
- super("modelVersion", "3.0", "3.1");
+ super("modelVersion", "3.0", "6.0");
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/resources/initial-config.json?rev=1698320&r1=1698319&r2=1698320&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/java/trunk/broker-core/src/main/resources/initial-config.json Fri Aug 28 12:33:55 2015
@@ -20,7 +20,7 @@
*/
{
"name": "${broker.name}",
- "modelVersion": "3.1",
+ "modelVersion": "6.0",
"authenticationproviders" : [ {
"name" : "passwordFile",
"type" : "PlainPasswordFile",
@@ -55,10 +55,20 @@
"name" : "memory",
"type" : "Memory",
"brokerloggerfilters" : [ {
- "name" : "acceptFilter1",
+ "name" : "Root",
"type" : "NameAndLevel",
- "level" : "INFO",
+ "level" : "WARN",
"loggerName" : "ROOT"
+ }, {
+ "name" : "Qpid",
+ "type" : "NameAndLevel",
+ "level" : "INFO",
+ "loggerName" : "org.apache.qpid.*"
+ }, {
+ "name" : "Operational",
+ "type" : "NameAndLevel",
+ "level" : "INFO",
+ "loggerName" : "qpid.message.*"
} ]
} ],
"ports" : [ {
Modified: qpid/java/trunk/systests/etc/config-systests.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/etc/config-systests.json?rev=1698320&r1=1698319&r2=1698320&view=diff
==============================================================================
--- qpid/java/trunk/systests/etc/config-systests.json (original)
+++ qpid/java/trunk/systests/etc/config-systests.json Fri Aug 28 12:33:55 2015
@@ -20,7 +20,7 @@
*/
{
"name": "Broker",
- "modelVersion": "3.1",
+ "modelVersion": "6.0",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "PlainPasswordFile",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org