Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java Mon Apr 28 02:25:27 2014 @@ -20,8 +20,11 @@ */ package org.apache.qpid.server.protocol.converter.v0_10_v1_0; +import java.nio.ByteBuffer; + import org.apache.qpid.server.message.AMQMessageHeader; import org.apache.qpid.server.plugin.MessageConverter; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v1_0.MessageConverter_from_1_0; @@ -35,8 +38,7 @@ import org.apache.qpid.transport.Message import org.apache.qpid.transport.MessageProperties; import org.apache.qpid.transport.ReplyTo; -import java.nio.ByteBuffer; - +@PluggableService public class MessageConverter_1_0_to_v0_10 implements MessageConverter<Message_1_0, MessageTransferMessage> {
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins AMQP 0.8 to 0.10 MessageConversion" default="build"> - <property name="module.depends" value="common broker-core broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" /> + <property name="module.depends" value="common broker-core broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml Mon Apr 28 02:25:27 2014 @@ -39,6 +39,13 @@ <dependency> <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> <version>${project.version}</version> </dependency> Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java Mon Apr 28 02:25:27 2014 @@ -32,6 +32,7 @@ import org.apache.qpid.framing.FieldTabl import org.apache.qpid.framing.abstraction.MessagePublishInfo; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.plugin.MessageConverter; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v0_8.MessageMetaData; @@ -44,6 +45,7 @@ import org.apache.qpid.transport.Message import org.apache.qpid.transport.MessageProperties; import org.apache.qpid.transport.ReplyTo; +@PluggableService public class MessageConverter_0_10_to_0_8 implements MessageConverter<MessageTransferMessage, AMQMessage> { private static final int BASIC_CLASS_ID = 60; Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java Mon Apr 28 02:25:27 2014 @@ -28,6 +28,7 @@ import org.apache.qpid.framing.AMQShortS import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.server.plugin.MessageConverter; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v0_8.AMQMessage; @@ -41,6 +42,7 @@ import org.apache.qpid.transport.Message import org.apache.qpid.transport.ReplyTo; import org.apache.qpid.url.AMQBindingURL; +@PluggableService public class MessageConverter_0_8_to_0_10 implements MessageConverter<AMQMessage, MessageTransferMessage> { @Override Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion" default="build"> - <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" /> + <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml Mon Apr 28 02:25:27 2014 @@ -39,6 +39,13 @@ <dependency> <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> <version>${project.version}</version> </dependency> Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java Mon Apr 28 02:25:27 2014 @@ -35,11 +35,13 @@ import org.apache.qpid.amqp_1_0.type.mes import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v1_0.MessageConverter_to_1_0; import org.apache.qpid.server.protocol.v1_0.MessageMetaData_1_0; import org.apache.qpid.url.AMQBindingURL; +@PluggableService public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMessage> { @Override Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java Mon Apr 28 02:25:27 2014 @@ -20,12 +20,17 @@ */ package org.apache.qpid.server.protocol.converter.v0_8_v1_0; +import java.nio.ByteBuffer; +import java.util.LinkedHashMap; +import java.util.Map; + import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.abstraction.MessagePublishInfo; import org.apache.qpid.server.plugin.MessageConverter; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v0_8.MessageMetaData; import org.apache.qpid.server.protocol.v1_0.MessageConverter_from_1_0; @@ -35,10 +40,7 @@ import org.apache.qpid.server.store.Stor import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import java.nio.ByteBuffer; -import java.util.LinkedHashMap; -import java.util.Map; - +@PluggableService public class MessageConverter_1_0_to_v0_8 implements MessageConverter<Message_1_0, AMQMessage> { private static final int BASIC_CLASS_ID = 60; Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins Derby Store" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml Mon Apr 28 02:25:27 2014 @@ -37,6 +37,13 @@ </dependency> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>${derby-version}</version> Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java Mon Apr 28 02:25:27 2014 @@ -25,9 +25,11 @@ import java.util.Map; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.plugin.MessageStoreFactory; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.MessageStore; +@PluggableService public class DerbyMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory { Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java Mon Apr 28 02:25:27 2014 @@ -23,10 +23,10 @@ package org.apache.qpid.server.virtualho import java.util.Map; -import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; +import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.store.derby.DerbyMessageStoreFactory; import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; @@ -38,9 +38,10 @@ public class DerbyVirtualHostNode extend @ManagedAttributeField private String _storePath; - public DerbyVirtualHostNode(Broker<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor) + @ManagedObjectFactoryConstructor + public DerbyVirtualHostNode(Map<String, Object> attributes, Broker<?> parent) { - super(parent, attributes, taskExecutor); + super(attributes, parent); } @Override Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="jdbc-provider-bone" xmlns:ivy="antlib:org.apache.ivy.ant" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml Mon Apr 28 02:25:27 2014 @@ -38,6 +38,13 @@ </dependency> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> <groupId>com.jolbox</groupId> <artifactId>bonecp</artifactId> <version>${bonecp-version}</version> Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java Mon Apr 28 02:25:27 2014 @@ -24,8 +24,10 @@ import java.sql.SQLException; import java.util.Map; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.store.jdbc.ConnectionProvider; +@PluggableService public class BoneCPConnectionProviderFactory implements JDBCConnectionProviderFactory { @Override Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins JDBC Store" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml Mon Apr 28 02:25:27 2014 @@ -38,6 +38,13 @@ </dependency> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j-version}</version> Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java Mon Apr 28 02:25:27 2014 @@ -23,7 +23,9 @@ package org.apache.qpid.server.store.jdb import java.util.Map; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; +import org.apache.qpid.server.plugin.PluggableService; +@PluggableService public class DefaultConnectionProviderFactory implements JDBCConnectionProviderFactory { Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java Mon Apr 28 02:25:27 2014 @@ -25,9 +25,11 @@ import java.util.Map; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.plugin.MessageStoreFactory; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.MessageStore; +@PluggableService public class JDBCMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory { Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java Mon Apr 28 02:25:27 2014 @@ -22,13 +22,11 @@ package org.apache.qpid.server.virtualho import java.util.Map; -import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; +import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; -import org.apache.qpid.server.store.jdbc.JDBCMessageStore; import org.apache.qpid.server.store.jdbc.JDBCMessageStoreFactory; import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; @@ -53,9 +51,10 @@ public class JDBCVirtualHostNodeImpl ext @ManagedAttributeField private String _blobType; - public JDBCVirtualHostNodeImpl(Broker<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor) + @ManagedObjectFactoryConstructor + public JDBCVirtualHostNodeImpl(Map<String, Object> attributes, Broker<?> parent) { - super(parent, attributes, taskExecutor); + super(attributes, parent); } @Override Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-amqp/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-amqp/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins AMQP Management" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml Mon Apr 28 02:25:27 2014 @@ -39,7 +39,15 @@ <scope>provided</scope> </dependency> - </dependencies> + + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + </dependencies> <build> </build> Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java Mon Apr 28 02:25:27 2014 @@ -20,8 +20,10 @@ */ package org.apache.qpid.server.management.amqp; +import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.plugin.SystemNodeCreator; +@PluggableService public class ManagementNodeCreator implements SystemNodeCreator { @Override Modified: qpid/trunk/qpid/java/broker-plugins/management-http/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/build.xml Mon Apr 28 02:25:27 2014 @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Management HTTP" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="broker-core/tests qpid-test-utils management/common client" /> <property name="module.genpom" value="true" /> Modified: qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml Mon Apr 28 02:25:27 2014 @@ -38,6 +38,13 @@ </dependency> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j-version}</version> Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Mon Apr 28 02:25:27 2014 @@ -106,6 +106,7 @@ public class HttpManagement extends Abst @ManagedAttributeField private int _sessionTimeout; + @ManagedObjectFactoryConstructor public HttpManagement(Map<String, Object> attributes, Broker broker) { super(attributes, broker); Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins Management JMX" default="build"> - <property name="module.depends" value="common broker-core management/common" /> + <property name="module.depends" value="common broker-core management/common broker-codegen" /> <property name="module.test.depends" value="broker-core/tests qpid-test-utils management/common client" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml Mon Apr 28 02:25:27 2014 @@ -39,6 +39,13 @@ <dependency> <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> <artifactId>qpid-management-common</artifactId> <version>${project.version}</version> </dependency> Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Mon Apr 28 02:25:27 2014 @@ -43,6 +43,7 @@ import org.apache.qpid.server.model.Brok import org.apache.qpid.server.model.ConfigurationChangeListener; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; +import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; @@ -80,6 +81,7 @@ public class JMXManagementPluginImpl @ManagedAttributeField private boolean _usePlatformMBeanServer; + @ManagedObjectFactoryConstructor public JMXManagementPluginImpl(Map<String, Object> attributes, Broker broker) { super(attributes, broker); Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins Memory Store" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml Mon Apr 28 02:25:27 2014 @@ -37,6 +37,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java Mon Apr 28 02:25:27 2014 @@ -24,7 +24,9 @@ import java.util.Map; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.plugin.MessageStoreFactory; +import org.apache.qpid.server.plugin.PluggableService; +@PluggableService public class MemoryMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory { Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java Mon Apr 28 02:25:27 2014 @@ -22,9 +22,9 @@ package org.apache.qpid.server.virtualho import java.util.Map; -import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedObject; +import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.store.MemoryMessageStoreFactory; import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; @@ -33,9 +33,10 @@ import org.apache.qpid.server.virtualhos public class MemoryVirtualHostNode extends AbstractStandardVirtualHostNode<MemoryVirtualHostNode> { - public MemoryVirtualHostNode(Broker<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor) + @ManagedObjectFactoryConstructor + public MemoryVirtualHostNode(Map<String, Object> attributes, Broker<?> parent) { - super(parent, attributes, taskExecutor); + super(attributes, parent); } @Override Modified: qpid/trunk/qpid/java/broker-plugins/websocket/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/websocket/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/websocket/build.xml Mon Apr 28 02:25:27 2014 @@ -17,7 +17,7 @@ - under the License. --> <project name="Qpid Broker-Plugins Websocket Transport" default="build"> - <property name="module.depends" value="common broker-core" /> + <property name="module.depends" value="common broker-core broker-codegen" /> <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> Modified: qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml Mon Apr 28 02:25:27 2014 @@ -37,6 +37,14 @@ <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-codegen</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> @@ -66,4 +74,4 @@ <build> </build> -</project> \ No newline at end of file +</project> Modified: qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketTransportProviderFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketTransportProviderFactory.java?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketTransportProviderFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketTransportProviderFactory.java Mon Apr 28 02:25:27 2014 @@ -20,16 +20,17 @@ */ package org.apache.qpid.server.transport.websocket; -import org.apache.qpid.server.model.Transport; -import org.apache.qpid.server.plugin.TransportProviderFactory; -import org.apache.qpid.server.transport.TransportProvider; - import java.util.Arrays; -import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.Set; +import org.apache.qpid.server.model.Transport; +import org.apache.qpid.server.plugin.PluggableService; +import org.apache.qpid.server.plugin.TransportProviderFactory; +import org.apache.qpid.server.transport.TransportProvider; + +@PluggableService public class WebSocketTransportProviderFactory implements TransportProviderFactory { Modified: qpid/trunk/qpid/java/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/build.xml (original) +++ qpid/trunk/qpid/java/build.xml Mon Apr 28 02:25:27 2014 @@ -34,7 +34,7 @@ <findSubProjects name="broker-plugins" dir="broker-plugins" excludes="${broker-plugins-exclude}"/> <findSubProjects name="client-plugins" dir="client-plugins"/> - <property name="modules.core" value="qpid-test-utils common management/common amqp-1-0-common broker-core broker client amqp-1-0-client amqp-1-0-client-jms amqp-1-0-client-websocket tools"/> + <property name="modules.core" value="qpid-test-utils common management/common amqp-1-0-common broker-codegen broker-core broker client amqp-1-0-client amqp-1-0-client-jms amqp-1-0-client-websocket tools"/> <property name="modules.examples" value="client/example management/example amqp-1-0-client/example amqp-1-0-client-jms/example"/> <property name="modules.tests" value="systests perftests qpid-perftests-systests"/> <property name="modules.plugin" value="${broker-plugins} ${client-plugins}"/> Modified: qpid/trunk/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/module.xml (original) +++ qpid/trunk/qpid/java/module.xml Mon Apr 28 02:25:27 2014 @@ -59,7 +59,7 @@ <property name="module.src.resources" location="src/main/resources"/> <property name="module.src.resources.metainf" location="${module.src.resources}/META-INF"/> <property name="module.resources.dir" location="resources/"/> - <property name="module.metainf" location="${module.build}/META-INF"/> + <property name="module.metainf" location="${module.build}/classes/META-INF"/> <property name="module.namever" value="${project.name}-${module.name}-${project.version}"/> <property name="module.namever.osgi" value="${project.name}-${module.name}_${project.version}.0.osgi"/> Modified: qpid/trunk/qpid/java/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1590547&r1=1590546&r2=1590547&view=diff ============================================================================== --- qpid/trunk/qpid/java/pom.xml (original) +++ qpid/trunk/qpid/java/pom.xml Mon Apr 28 02:25:27 2014 @@ -77,6 +77,7 @@ <module>amqp-1-0-client</module> <module>amqp-1-0-client-jms</module> <module>amqp-1-0-client-websocket</module> + <module>broker-codegen</module> <module>broker-core</module> <module>broker</module> <module>broker-plugins/access-control</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
