diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-12-07 10:54:59 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-12-07 10:54:59 +0000 |
| commit | db07194fdec1c2c27d9de2fdc881e5d8e7b3ead9 (patch) | |
| tree | c642b1d91278214f45eb31eec981eb6678451e9f /qpid/java/broker-codegen/src/main | |
| parent | 29ae1eaabfa2d46c3f0728d6b3f9477661f9abd4 (diff) | |
| download | qpid-python-db07194fdec1c2c27d9de2fdc881e5d8e7b3ead9.tar.gz | |
QPID-6263 : [Java Broker] Remove knowledge of BrokerOptions from SystemConfig and simply use attributes instead
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1643660 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-codegen/src/main')
| -rw-r--r-- | qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java index 317e0f7c74..52c1276d49 100644 --- a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java +++ b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java @@ -113,7 +113,8 @@ public class SystemConfigFactoryGenerator extends AbstractProcessor pw.println(";"); pw.println(); - pw.println("import org.apache.qpid.server.BrokerOptions;"); + pw.println("import java.util.Map;"); + pw.println(); pw.println("import org.apache.qpid.server.configuration.updater.TaskExecutor;"); pw.println("import org.apache.qpid.server.logging.EventLogger;"); pw.println("import org.apache.qpid.server.logging.LogRecorder;"); @@ -140,10 +141,10 @@ public class SystemConfigFactoryGenerator extends AbstractProcessor pw.println(" public "+objectSimpleName+" newInstance(final TaskExecutor taskExecutor,"); pw.println(" final EventLogger eventLogger,"); pw.println(" final LogRecorder logRecorder,"); - pw.println(" final BrokerOptions brokerOptions,"); + pw.println(" final Map<String,Object> attributes,"); pw.println(" final BrokerShutdownProvider brokerShutdownProvider)"); pw.println(" {"); - pw.println(" return new "+objectSimpleName+"(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);"); + pw.println(" return new "+objectSimpleName+"(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);"); pw.println(" }"); pw.println("}"); |