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 2013/07/06 01:39:41 UTC
svn commit: r1500169 - in /qpid/trunk/qpid/java:
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/
bdbstore/src/main/java/resources/virtualhost/store/bdb/ ...
Author: rgodfrey
Date: Fri Jul 5 23:39:40 2013
New Revision: 1500169
URL: http://svn.apache.org/r1500169
Log:
QPID-4980 : [Java Broker] add connection pool attributes to http management
Added:
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js
- copied, changed from r1500134, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/pool/none/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/pool/none/add.html
- copied unchanged from r1500134, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/memory/add.html
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/Pluggable.java
Modified:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/add.html
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
Modified: qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java Fri Jul 5 23:39:40 2013
@@ -65,4 +65,10 @@ public class BDBHAMessageStoreManagerMBe
return new BDBHAMessageStoreManagerMBean(messageStore, (ManagedObject) parent);
}
+
+ @Override
+ public String getType()
+ {
+ return "BDBHA";
+ }
}
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js Fri Jul 5 23:39:40 2013
@@ -39,7 +39,7 @@ define(["dojo/_base/xhr",
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
+ if(item.id.substr(0,34) == "formAddVirtualHost.specific.store.") {
item.destroyRecursive();
}
});
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html Fri Jul 5 23:39:40 2013
@@ -2,7 +2,7 @@
<tr>
<td class="tableContainer-labelCell" style="width: 300px;"><strong>Path to store location*: </strong></td>
<td class="tableContainer-valueCell">
- <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.storePath"
+ <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.store.storePath"
name="storePath" placeholder="/path/to/message/store" />
</td>
</tr>
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js?rev=1500169&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js Fri Jul 5 23:39:40 2013
@@ -0,0 +1,56 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+define(["dojo/_base/xhr",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/_base/window",
+ "dijit/registry",
+ "dojo/parser",
+ "dojo/_base/array",
+ "dojo/_base/event",
+ "dojo/_base/json",
+ "dojo/string",
+ "dojo/store/Memory",
+ "dijit/form/FilteringSelect",
+ "dojo/domReady!"],
+ function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
+ return {
+ show: function() {
+ var node = dom.byId("addVirtualHost.poolSpecificDiv");
+ var that = this;
+
+ array.forEach(registry.toArray(),
+ function(item) {
+ if(item.id.substr(0,39) == "formAddVirtualHost.specific.store.pool.") {
+ item.destroyRecursive();
+ }
+ });
+
+ xhr.get({url: "virtualhost/store/pool/bonecp/add.html",
+ sync: true,
+ load: function(data) {
+ node.innerHTML = data;
+ parser.parse(node);
+
+ }});
+ }
+ };
+ });
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html?rev=1500169&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html Fri Jul 5 23:39:40 2013
@@ -0,0 +1,25 @@
+<table class="tableContainer-table tableContainer-table-horiz">
+
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count: </strong></td>
+ <td class="tableContainer-valueCell">
+ <input data-dojo-type="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.parititions"
+ name="minConnectionsPerPartition" value="4" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Min Conn per Partition: </strong></td>
+ <td class="tableContainer-valueCell">
+ <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.minConn"
+ name="minConnectionsPerPartition" value="5" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Max Conn per Partition: </strong></td>
+ <td class="tableContainer-valueCell">
+ <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.maxCon"
+ name="maxConnectionsPerPartition" value="10" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ </td>
+ </tr>
+
+</table>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java Fri Jul 5 23:39:40 2013
@@ -38,4 +38,10 @@ public class HttpManagementFactory imple
return new HttpManagement(id, broker, attributes);
}
+
+ @Override
+ public String getType()
+ {
+ return "HTTP Management";
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java Fri Jul 5 23:39:40 2013
@@ -50,17 +50,22 @@ public class HelperServlet extends Abstr
{
_mapper = new ObjectMapper();
_mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
+
+ Action[] supportedActions = {
+ new ListAuthenticationProviderAttributes(),
+ new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, "ListMessageStoreTypes"),
+ new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_TYPES, "ListVirtualHostTypes"),
+ new ListGroupProviderAttributes(),
+ new ListAccessControlProviderAttributes(),
+ new PluginClassProviderAction()
+ };
+
_actions = new HashMap<String, Action>();
- Action listProviderAttributes = new ListAuthenticationProviderAttributes();
- _actions.put(listProviderAttributes.getName(), listProviderAttributes);
- Action listMessageStoreTypes = new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, "ListMessageStoreTypes");
- _actions.put(listMessageStoreTypes.getName(), listMessageStoreTypes);
- Action listVirtualHostTypes = new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_TYPES, "ListVirtualHostTypes");
- _actions.put(listVirtualHostTypes.getName(), listVirtualHostTypes);
- Action groupProviderAttributes = new ListGroupProviderAttributes();
- _actions.put(groupProviderAttributes.getName(), groupProviderAttributes);
- Action aclProviderAttributes = new ListAccessControlProviderAttributes();
- _actions.put(aclProviderAttributes.getName(), aclProviderAttributes);
+
+ for(Action action : supportedActions)
+ {
+ _actions.put(action.getName(), action);
+ }
}
@Override
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java?rev=1500169&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/PluginClassProviderAction.java Fri Jul 5 23:39:40 2013
@@ -0,0 +1,61 @@
+package org.apache.qpid.server.management.plugin.servlet.rest;/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.plugin.Pluggable;
+import org.apache.qpid.server.plugin.QpidServiceLoader;
+
+public class PluginClassProviderAction implements Action
+{
+ @Override
+ public String getName()
+ {
+ return "pluginList";
+ }
+
+ @Override
+ public Object perform(Map<String, Object> request, Broker broker)
+ {
+ try
+ {
+ String className = (String) request.get("plugin");
+ QpidServiceLoader<Pluggable> serviceLoader = new QpidServiceLoader<Pluggable>();
+ final Class<Pluggable> clazz = (Class<Pluggable>) Class.forName("org.apache.qpid.server.plugin."+className);
+ List<String> values = new ArrayList<String>();
+ for(Pluggable instance : serviceLoader.instancesOf(clazz))
+ {
+ values.add(instance.getType());
+ }
+ return values;
+ }
+ catch (ClassNotFoundException e)
+ {
+ return Collections.emptyList();
+ }
+
+ }
+}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/add.js Fri Jul 5 23:39:40 2013
@@ -39,7 +39,7 @@ define(["dojo/_base/xhr",
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
+ if(item.id.substr(0,34) == "formAddVirtualHost.specific.store.") {
item.destroyRecursive();
}
});
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js Fri Jul 5 23:39:40 2013
@@ -39,7 +39,7 @@ define(["dojo/_base/xhr",
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
+ if(item.id.substr(0,34) == "formAddVirtualHost.specific.store.") {
item.destroyRecursive();
}
});
@@ -47,8 +47,45 @@ define(["dojo/_base/xhr",
xhr.get({url: "virtualhost/store/jdbc/add.html",
sync: true,
load: function(data) {
- node.innerHTML = data;
- parser.parse(node);
+ node.innerHTML = data;
+ parser.parse(node);
+
+ if (that.hasOwnProperty("poolTypeChooser"))
+ {
+ that.poolTypeChooser.destroy();
+ }
+
+ var selectPoolType = function(type) {
+ if(type && string.trim(type) != "") {
+ require(["qpid/management/virtualhost/store/pool/"+type.toLowerCase()+"/add"],
+ function(poolType)
+ {
+ poolType.show();
+ });
+ }
+ }
+
+ xhr.get({
+ sync: true,
+ url: "rest/helper?action=pluginList&plugin=JDBCConnectionProviderFactory",
+ handleAs: "json"
+ }).then(
+ function(data) {
+ var poolTypes = data;
+ var poolTypesData = [];
+ for (var i =0 ; i < poolTypes.length; i++)
+ {
+ poolTypesData[i]= {id: poolTypes[i], name: poolTypes[i]};
+ }
+ var poolTypesStore = new Memory({ data: poolTypesData });
+ var poolTypesDiv = dom.byId("addVirtualHost.specific.selectPoolType");
+ var input = construct.create("input", {id: "addPoolType", required: false}, poolTypesDiv);
+ that.poolTypeChooser = new FilteringSelect({ id: "addVirtualHost.specific.store.poolType",
+ name: "connectionPool",
+ store: poolTypesStore,
+ searchAttr: "name", required: false,
+ onChange: selectPoolType }, input);
+ });
}});
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js Fri Jul 5 23:39:40 2013
@@ -39,7 +39,7 @@ define(["dojo/_base/xhr",
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
+ if(item.id.substr(0,33) == "formAddVirtualHost.specific.store") {
item.destroyRecursive();
}
});
Copied: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js (from r1500134, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js?p2=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js&p1=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js&r1=1500134&r2=1500169&rev=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js Fri Jul 5 23:39:40 2013
@@ -34,17 +34,17 @@ define(["dojo/_base/xhr",
function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
return {
show: function() {
- var node = dom.byId("addVirtualHost.storeSpecificDiv");
+ var node = dom.byId("addVirtualHost.poolSpecificDiv");
var that = this;
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
+ if(item.id.substr(0,39) == "formAddVirtualHost.specific.store.pool.") {
item.destroyRecursive();
}
});
- xhr.get({url: "virtualhost/store/memory/add.html",
+ xhr.get({url: "virtualhost/store/pool/none/add.html",
sync: true,
load: function(data) {
node.innerHTML = data;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/add.html?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/add.html Fri Jul 5 23:39:40 2013
@@ -2,7 +2,7 @@
<tr>
<td class="tableContainer-labelCell" style="width: 300px;"><strong>Path to store location*: </strong></td>
<td class="tableContainer-valueCell">
- <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.storePath"
+ <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.store.storePath"
name="storePath" placeholder="/path/to/message/store" />
</td>
</tr>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/add.html?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/add.html Fri Jul 5 23:39:40 2013
@@ -2,8 +2,14 @@
<tr>
<td class="tableContainer-labelCell" style="width: 300px;"><strong>JDBC Url*: </strong></td>
<td class="tableContainer-valueCell">
- <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.connectionURL"
+ <input dojoType="dijit/form/ValidationTextBox" required="true" id="formAddVirtualHost.specific.store.connectionURL"
name="connectionURL" placeholder="jdbc:provider:info" />
- </td>
+ </tr>
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Connection Pool: </strong></td>
+ <td class="tableContainer-valueCell" ><div id="addVirtualHost.specific.selectPoolType"></div></td>
+ </td>
</tr>
</table>
+<div id="addVirtualHost.poolSpecificDiv">
+</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java Fri Jul 5 23:39:40 2013
@@ -39,4 +39,10 @@ public class JMXManagementFactory implem
return null;
}
}
+
+ @Override
+ public String getType()
+ {
+ return "JMX Management";
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java Fri Jul 5 23:39:40 2013
@@ -25,6 +25,7 @@ import javax.management.JMException;
import javax.management.StandardMBean;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.Pluggable;
import org.apache.qpid.server.plugin.QpidServiceLoader;
/**
@@ -32,7 +33,7 @@ import org.apache.qpid.server.plugin.Qpi
*
* Provider implementations are advertised as services and loaded by a {@link QpidServiceLoader}.
*/
-public interface MBeanProvider
+public interface MBeanProvider extends Pluggable
{
/**
* Tests whether a <code>child</code> can be managed by the mbean
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java Fri Jul 5 23:39:40 2013
@@ -43,7 +43,7 @@ public class BrokerConfigurationStoreCre
.instancesOf(ConfigurationStoreFactory.class);
for (ConfigurationStoreFactory storeFactory : configurationStoreFactories)
{
- String type = storeFactory.getStoreType();
+ String type = storeFactory.getType();
ConfigurationStoreFactory factory = _factories.put(type.toLowerCase(), storeFactory);
if (factory != null)
{
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/JsonConfigurationStoreFactory.java Fri Jul 5 23:39:40 2013
@@ -35,7 +35,7 @@ public class JsonConfigurationStoreFacto
}
@Override
- public String getStoreType()
+ public String getType()
{
return JsonConfigurationEntryStore.STORE_TYPE;
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/factory/MemoryConfigurationStoreFactory.java Fri Jul 5 23:39:40 2013
@@ -35,7 +35,7 @@ public class MemoryConfigurationStoreFac
}
@Override
- public String getStoreType()
+ public String getType()
{
return MemoryConfigurationEntryStore.STORE_TYPE;
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeType.java Fri Jul 5 23:39:40 2013
@@ -30,6 +30,12 @@ import org.apache.qpid.server.virtualhos
public class DirectExchangeType implements ExchangeType<DirectExchange>
{
+ @Override
+ public String getType()
+ {
+ return getName().toString();
+ }
+
public AMQShortString getName()
{
return ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeType.java Fri Jul 5 23:39:40 2013
@@ -30,6 +30,12 @@ import org.apache.qpid.server.virtualhos
public class FanoutExchangeType implements ExchangeType<FanoutExchange>
{
+ @Override
+ public String getType()
+ {
+ return getName().toString();
+ }
+
public AMQShortString getName()
{
return ExchangeDefaults.FANOUT_EXCHANGE_CLASS;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeType.java Fri Jul 5 23:39:40 2013
@@ -30,6 +30,12 @@ import org.apache.qpid.server.virtualhos
public class HeadersExchangeType implements ExchangeType<HeadersExchange>
{
+ @Override
+ public String getType()
+ {
+ return getName().toString();
+ }
+
public AMQShortString getName()
{
return ExchangeDefaults.HEADERS_EXCHANGE_CLASS;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeType.java Fri Jul 5 23:39:40 2013
@@ -30,6 +30,12 @@ import org.apache.qpid.server.virtualhos
public class TopicExchangeType implements ExchangeType<TopicExchange>
{
+ @Override
+ public String getType()
+ {
+ return getName().toString();
+ }
+
public AMQShortString getName()
{
return ExchangeDefaults.TOPIC_EXCHANGE_CLASS;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AccessControlFactory.java Fri Jul 5 23:39:40 2013
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.security.AccessControl;
-public interface AccessControlFactory
+public interface AccessControlFactory extends Pluggable
{
public static final String ATTRIBUTE_TYPE = AccessControlProvider.TYPE;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java Fri Jul 5 23:39:40 2013
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-public interface AuthenticationManagerFactory
+public interface AuthenticationManagerFactory extends Pluggable
{
public static final String ATTRIBUTE_TYPE = AuthenticationProvider.TYPE;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ConfigurationStoreFactory.java Fri Jul 5 23:39:40 2013
@@ -26,12 +26,12 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-public interface ConfigurationStoreFactory
+public interface ConfigurationStoreFactory extends Pluggable
{
/**
* Returns the type of the store this factory can create
*/
- public String getStoreType();
+ public String getType();
/**
* Creates and opens the store from a given location using initial store if provided.
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java Fri Jul 5 23:39:40 2013
@@ -27,8 +27,9 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.virtualhost.VirtualHost;
-public interface ExchangeType<T extends Exchange>
+public interface ExchangeType<T extends Exchange> extends Pluggable
{
+ public String getType();
public AMQShortString getName();
public T newInstance(UUID id, VirtualHost host, AMQShortString name,
boolean durable, boolean autoDelete) throws AMQException;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/GroupManagerFactory.java Fri Jul 5 23:39:40 2013
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.security.group.GroupManager;
-public interface GroupManagerFactory
+public interface GroupManagerFactory extends Pluggable
{
public static final String ATTRIBUTE_TYPE = GroupProvider.TYPE;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java Fri Jul 5 23:39:40 2013
@@ -29,7 +29,7 @@ import org.apache.commons.configuration.
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.jdbc.ConnectionProvider;
-public interface JDBCConnectionProviderFactory
+public interface JDBCConnectionProviderFactory extends Pluggable
{
String getType();
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java Fri Jul 5 23:39:40 2013
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.configuration.Configuration;
import org.apache.qpid.server.store.MessageStore;
-public interface MessageStoreFactory
+public interface MessageStoreFactory extends Pluggable
{
String getType();
Added: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/Pluggable.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/Pluggable.java?rev=1500169&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/Pluggable.java (added)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/Pluggable.java Fri Jul 5 23:39:40 2013
@@ -0,0 +1,25 @@
+package org.apache.qpid.server.plugin;/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+public interface Pluggable
+{
+ String getType();
+}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java Fri Jul 5 23:39:40 2013
@@ -24,7 +24,7 @@ import java.util.UUID;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Plugin;
-public interface PluginFactory
+public interface PluginFactory extends Pluggable
{
static final String PLUGIN_TYPE = "pluginType";
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java Fri Jul 5 23:39:40 2013
@@ -28,7 +28,7 @@ import org.apache.log4j.Logger;
/**
* Simple facade over a {@link ServiceLoader} to instantiate all configured implementations of an interface.
*/
-public class QpidServiceLoader<C>
+public class QpidServiceLoader<C extends Pluggable>
{
private static final Logger _logger = Logger.getLogger(QpidServiceLoader.class);
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java Fri Jul 5 23:39:40 2013
@@ -33,7 +33,7 @@ import org.apache.qpid.server.stats.Stat
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-public interface VirtualHostFactory
+public interface VirtualHostFactory extends Pluggable
{
String getType();
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java Fri Jul 5 23:39:40 2013
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.store.jdbc;
-import org.apache.commons.configuration.Configuration;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
@@ -30,7 +29,7 @@ public class DefaultConnectionProviderFa
@Override
public String getType()
{
- return "DEFAULT";
+ return "NONE";
}
@Override
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1500169&r1=1500168&r2=1500169&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Fri Jul 5 23:39:40 2013
@@ -170,9 +170,15 @@ public class DefaultExchangeFactoryTest
public void testCreateDefaultExchangeFactoryWithCustomExchangeType()
{
- ExchangeType<?> customeExchangeType = new ExchangeType<Exchange>()
+ ExchangeType<?> customExchangeType = new ExchangeType<Exchange>()
{
@Override
+ public String getType()
+ {
+ return getName().toString();
+ }
+
+ @Override
public AMQShortString getName()
{
return new AMQShortString("my-custom-exchange");
@@ -192,7 +198,7 @@ public class DefaultExchangeFactoryTest
}
};
- _stubbedExchangeTypes.add(customeExchangeType);
+ _stubbedExchangeTypes.add(customExchangeType);
_stubbedExchangeTypes.add(_directExchangeType);
_stubbedExchangeTypes.add(_topicExchangeType);
_stubbedExchangeTypes.add(_fanoutExchangeType);
@@ -206,7 +212,7 @@ public class DefaultExchangeFactoryTest
assertTrue("Fanout exchange type is not found", registeredTypes.contains(_fanoutExchangeType));
assertTrue("Topic exchange type is not found", registeredTypes.contains(_topicExchangeType));
assertTrue("Headers exchange type is not found", registeredTypes.contains(_headersExchangeType));
- assertTrue("Custom exchange type is not found", registeredTypes.contains(customeExchangeType));
+ assertTrue("Custom exchange type is not found", registeredTypes.contains(customExchangeType));
}
private final class TestExchangeFactory extends DefaultExchangeFactory
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org