svn commit: r1651615 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/security/ broker-core/src/test/java/org/apache/qpid/server/security/ broker-plugins/management-http/sr
Author: macbean
Date: Wed Jan 14 10:38:04 2015
New Revision: 1651615
URL: http://svn.apache.org/r1651615
Log:
QPID-6304: [Java Broker] Allow truststore and keystore (JKS) files to be stored
as a data:// URL inside the config
* Added truststore/keystore unit tests too to cover both new and (most of) the
existing functionality,
retiring the equivilent slower REST system tests.
* Added single REST test exercising the creation of a keystore/teststore from
data:// URL.
Added:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/DataUrlUtils.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1651615r1=1651614r2=1651615view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
Wed Jan 14 10:38:04 2015
@@ -20,11 +20,15 @@
*/
package org.apache.qpid.server.security;
+import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.security.AccessControlException;
import java.security.GeneralSecurityException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Collection;
@@ -48,6 +52,7 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
+import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
import org.apache.qpid.transport.network.security.ssl.SSLUtil;
@@ -69,7 +74,12 @@ public class FileKeyStoreImpl extends Ab
private String _password;
-private Broker? _broker;
+private final Broker? _broker;
+
+static
+{
+Handler.register();
+}
@ManagedObjectFactoryConstructor
public FileKeyStoreImpl(MapString, Object attributes, Broker? broker)
@@ -152,14 +162,25 @@ public class FileKeyStoreImpl extends Ab
java.security.KeyStore keyStore;
try
{
-String path = fileKeyStore.getPath();
+URL url = getUrlFromString(fileKeyStore.getPath());
String password = fileKeyStore.getPassword();
String keyStoreType = fileKeyStore.getKeyStoreType();
-keyStore = SSLUtil.getInitializedKeyStore(path, password,
keyStoreType);
+keyStore = SSLUtil.getInitializedKeyStore(url, password,
keyStoreType);
}
+
catch (Exception e)
{
-throw new IllegalConfigurationException(Cannot instantiate key
store at + fileKeyStore.getPath(), e);
+final String message;
+if (e instanceof IOException e.getCause() != null
e.getCause() instanceof UnrecoverableKeyException)
+{
+message = Check key store password. Cannot instantiate key
store from ' + fileKeyStore.getPath() + '.;
+}
+else
+{
+message = Cannot instantiate key store from ' +
fileKeyStore.getPath() + '.;
+}
+
+throw new IllegalConfigurationException(message, e);
}
if (fileKeyStore.getCertificateAlias() != null)
@@ -176,8
svn commit: r1642290 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
Author: macbean Date: Fri Nov 28 13:12:10 2014 New Revision: 1642290 URL: http://svn.apache.org/r1642290 Log: QPID-6250: [Java Client] removal of static defaulted username and password from ConnectionSettings.java Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java?rev=1642290r1=1642289r2=1642290view=diff == --- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java (original) +++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java Fri Nov 28 13:12:10 2014 @@ -61,8 +61,8 @@ public class ConnectionSettings private String protocol = tcp; private String host = localhost; private String vhost; -private String username = guest; -private String password = guest; +private String username; +private String password; private int port = 5672; private boolean tcpNodelay = QpidProperty.booleanProperty(Boolean.TRUE, QPID_TCP_NODELAY_PROP_NAME, AMQJ_TCP_NODELAY_PROP_NAME).get(); private int maxChannelCount = 32767; - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1642291 - in /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server: model/ security/auth/manager/
Author: macbean
Date: Fri Nov 28 13:13:06 2014
New Revision: 1642291
URL: http://svn.apache.org/r1642291
Log:
QPID-6246: [Java Broker] Introduce PreferencesSupportingAuthenticationProvider
managed interface
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
- copied, changed from r1642290,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
Copied:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
(from r1642290,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java?p2=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.javap1=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.javar1=1642290r2=1642291rev=1642291view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
Fri Nov 28 13:13:06 2014
@@ -1,5 +1,4 @@
/*
- *
* 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
@@ -16,20 +15,22 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.qpid.server.security.auth.manager;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedObject;
+package org.apache.qpid.server.model;
-@ManagedObject( category = false, type = External )
-public interface ExternalAuthenticationManagerT extends
ExternalAuthenticationManagerT extends AuthenticationProviderT
+@ManagedAnnotation
+public interface PreferencesSupportingAuthenticationProvider extends
ManagedInterface
{
-String PROVIDER_TYPE = External;
-String ATTRIBUTE_USE_FULL_DN = useFullDN;
+/**
+ * Returns the preferences provider associated with this authentication
provider
+ * @return PreferencesProvider
+ */
+PreferencesProvider? getPreferencesProvider();
-@ManagedAttribute( description = Use the full DN as the Username)
-boolean getUseFullDN();
+/**
+ * Sets the preferences provider
+ * @param preferencesProvider
+ */
+void setPreferencesProvider(PreferencesProvider? preferencesProvider);
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java?rev=1642291r1=1642290r2=1642291view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
svn commit: r1636646 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Author: macbean
Date: Tue Nov 4 16:59:07 2014
New Revision: 1636646
URL: http://svn.apache.org/r1636646
Log:
QPID-6208: PermittedNodeList seen to disappear while performing certain HA
operations
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1636646r1=1636645r2=1636646view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Tue Nov 4 16:59:07 2014
@@ -1026,17 +1026,26 @@ public class BDBHAVirtualHostNodeImpl ex
if (NodeRole.MASTER == newRole)
{
byte[] applicationState = nodeState.getAppState();
-SetString permittedNodes =
ReplicatedEnvironmentFacade.convertApplicationStateBytesToPermittedNodeList(applicationState);
-if (_permittedNodes.size() != permittedNodes.size() ||
!_permittedNodes.containsAll(permittedNodes))
+if (applicationState != null)
{
-if
(_permittedNodes.contains(remoteNode.getAddress()))
+SetString permittedNodes =
ReplicatedEnvironmentFacade.convertApplicationStateBytesToPermittedNodeList(applicationState);
+if (_permittedNodes.size() !=
permittedNodes.size() || !_permittedNodes.containsAll(permittedNodes))
{
-setAttribute(PERMITTED_NODES, _permittedNodes,
new ArrayListString(permittedNodes));
+if
(_permittedNodes.contains(remoteNode.getAddress()))
+{
+setAttribute(PERMITTED_NODES,
_permittedNodes, new ArrayListString(permittedNodes));
+} else
+{
+LOGGER.warn(Cannot change permitted nodes
from Master as existing master node ' + remoteNode.getName()
++ ' ( + remoteNode.getAddress()
+ ) is not in list of trusted nodes + _permittedNodes);
+}
}
-else
+}
+else
+{
+if (LOGGER.isDebugEnabled())
{
-LOGGER.warn(Cannot change permitted nodes
from Master as existing master node ' + remoteNode.getName()
-+ ' ( + remoteNode.getAddress() + )
is not in list of trusted nodes + _permittedNodes);
+LOGGER.debug(String.format(Application state
returned by JE was 'null' so skipping permitted node handling: s%, nodeState));
}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1635114 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/model/adapter/ systests/src/test/java/org/apac
Author: macbean
Date: Wed Oct 29 12:31:26 2014
New Revision: 1635114
URL: http://svn.apache.org/r1635114
Log:
QPID-6194: [Java Broker] Add option to prevent Broker startup when it has
ERRORED children
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1635114r1=1635113r2=1635114view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
Wed Oct 29 12:31:26 2014
@@ -58,6 +58,7 @@ public interface BrokerX extends Broker
String CONNECTION_CLOSE_WHEN_NO_ROUTE = connection.closeWhenNoRoute;
String BROKER_FLOW_TO_DISK_THRESHOLD = broker.flowToDiskThreshold;
+String BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD =
broker.failStartupWithErroredChild;
String QPID_AMQP_PORT = qpid.amqp_port;
String QPID_HTTP_PORT = qpid.http_port;
@@ -86,6 +87,8 @@ public interface BrokerX extends Broker
@ManagedContextDefault(name = BROKER_FRAME_SIZE)
int DEFAULT_FRAME_SIZE = 65535;
+@ManagedContextDefault(name = BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD)
+boolean DEFAULT_BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD = false;
@DerivedAttribute
String getBuildVersion();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1635114r1=1635113r2=1635114view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Wed Oct 29 12:31:26 2014
@@ -235,41 +235,42 @@ public class BrokerAdapter extends Abstr
_managementModeAuthenticationProvider.open();
}
-for(KeyStore? keyStore : getChildren(KeyStore.class))
-{
-addKeyStore(keyStore);
-}
-for(TrustStore? trustStore : getChildren(TrustStore.class))
-{
-addTrustStore(trustStore);
-}
-for(AuthenticationProvider? authenticationProvider :
getChildren(AuthenticationProvider.class))
-{
-addAuthenticationProvider(authenticationProvider);
-}
-for(Port? port : getChildren(Port.class))
-{
-addPort(port);
-}
-for(Plugin? plugin : getChildren(Plugin.class))
-{
-addPlugin(plugin);
-}
-for(GroupProvider? groupProvider : getChildren(GroupProvider.class))
-{
-addGroupProvider(groupProvider);
-}
-for(AccessControlProvider? accessControlProvider :
getChildren(AccessControlProvider.class))
+boolean hasBrokerAnyErroredChildren = false;
+
+for (final Class? extends ConfiguredObject childClass :
getModel().getChildTypes(getCategoryClass()))
{
-addAccessControlProvider(accessControlProvider);
+final Collection? extends ConfiguredObject children =
getChildren(childClass);
+if (children != null) {
+for (final ConfiguredObject? child : children) {
+
+if (child instanceof AccessControlProvider)
+{
+addAccessControlProvider((AccessControlProvider)child);
+}
+else
+{
+child.addChangeListener(this);
+}
+
+if (child.getState() == State.ERRORED )
+{
+hasBrokerAnyErroredChildren = true;
+LOGGER.warn(String.format(Broker child object '%s' of
type '%s' is %s,
+child.getName(),
childClass.getSimpleName(), State.ERRORED ));
+}
+}
+}
}
-for(VirtualHostNode? virtualHostNode :
getChildren(VirtualHostNode.class))
+
+final boolean brokerShutdownOnErroredChild =
getContextValue(Boolean.class, BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD);
+if (!_brokerOptions.isManagementMode() brokerShutdownOnErroredChild
hasBrokerAnyErroredChildren
svn commit: r1635167 - /qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
Author: macbean
Date: Wed Oct 29 15:04:29 2014
New Revision: 1635167
URL: http://svn.apache.org/r1635167
Log:
QPID-6194: [Java Broker] explicitly set broker.failStartupWithErroredChild for
test that requires broker to start with erorred children
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java?rev=1635167r1=1635166r2=1635167view=diff
==
---
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
Wed Oct 29 15:04:29 2014
@@ -46,6 +46,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.jms.ConnectionListener;
import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -439,6 +440,9 @@ public class MultiNodeTest extends QpidB
public void testClusterCannotStartWithIntruder() throws Exception
{
+//set property explicitly as test requires broker to start to enable
check for ERRORED nodes
+setSystemProperty(Broker.BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD,
String.valueOf(Boolean.FALSE));
+
int intruderPort =
getNextAvailable(Collections.max(_groupCreator.getBdbPortNumbers()) + 1);
String nodeName = intruder;
String nodeHostPort = _groupCreator.getIpAddressOfBrokerHost() + : +
intruderPort;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1634023 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Author: macbean
Date: Fri Oct 24 08:22:03 2014
New Revision: 1634023
URL: http://svn.apache.org/r1634023
Log:
QPID-6180: [Java Broker] Cannot create BDB HA group on Windows development
environment due to node folder not being reported as writable by
Files.isWritable(Path)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1634023r1=1634022r2=1634023view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Fri Oct 24 08:22:03 2014
@@ -21,6 +21,7 @@
package org.apache.qpid.server.virtualhostnode.berkeleydb;
import java.io.File;
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
@@ -504,10 +505,11 @@ public class BDBHAVirtualHostNodeImpl ex
throw new IllegalConfigurationException(String.format(Store path
'%s' is not a folder, getStorePath()));
}
-if (!Files.isWritable(storePath.toPath()))
+if (!storePath.canWrite())
{
throw new IllegalConfigurationException(String.format(Store path
'%s' is not writable, getStorePath()));
}
+
}
private void validateAddress()
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1634026 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: ./ accesscontrolprovider/ groupprovider/ js/qpid/management/
Author: macbean
Date: Fri Oct 24 08:25:40 2014
New Revision: 1634026
URL: http://svn.apache.org/r1634026
Log:
QPID-6185: [Java Broker] Make the web management UI tables, tabs and panels
more consistent in terms of style and STATE being displayed
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html?rev=1634026r1=1634025r2=1634026view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
Fri Oct 24 08:25:40 2014
@@ -19,6 +19,9 @@
-
--
div class=AclFileProvider
-span style=Path:/spanspan class=path style=position:absolute;
left:6em/span
-br/
+div class=clear
+div class=formLabel-labelCellPath:/div
+div class=path/div
+/div
+div class=clear/div
/div
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html?rev=1634026r1=1634025r2=1634026view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
Fri Oct 24 08:25:40 2014
@@ -19,7 +19,11 @@
-
--
div class=FileGroupManager
-span style=Path:/spanspan class=path style=position:absolute;
left:6em/span
+div class=clear
+div class=formLabel-labelCellPath:/div
+div class=path/div
+/div
+div class=clear/div
br/
div data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Groups'
div class=groups/div
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1634026r1=1634025r2=1634026view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Fri Oct 24 08:25:40 2014
@@ -482,8 +482,9 @@ define([dojo/_base/xhr,
that.keyStoresGrid =
new UpdatableStore(that.brokerData.keystores,
query(.broker-key-stores)[0],
[ { name: Name,field:
name, width: 20%},
- { name: Type, field:
type, width: 20%},
- { name: Description, field:
description, width: 60%}
+ { name: State,field:
state, width: 10%},
+ { name: Type, field:
type, width: 10%},
+ { name: Path, field:
path, width: 60
svn commit: r1634043 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: showAuthProvider.html showGroupProvider.html showPreferencesProvider.html
Author: macbean Date: Fri Oct 24 12:07:45 2014 New Revision: 1634043 URL: http://svn.apache.org/r1634043 Log: QPID-6185: [Java Broker] Further UI changes to handle the user table non IE issue and some dialog titles Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html?rev=1634043r1=1634042r2=1634043view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html Fri Oct 24 12:07:45 2014 @@ -18,31 +18,33 @@ - under the License. - -- -div class=authorizationProvider data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Authentication Provider Attributes', open: true -div class=clear -div class=formLabel-labelCellName:/div -div class=name/div -/div -div class=clear -div class=formLabel-labelCellType:/div -div class=type/div -/div -div class=clear -div class=formLabel-labelCellState:/div -div class=state/div -/div +div +div class=authorizationProvider data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Authentication Provider Attributes', open: true +div class=clear +div class=formLabel-labelCellName:/div +div class=name/div +/div +div class=clear +div class=formLabel-labelCellType:/div +div class=type/div +/div +div class=clear +div class=formLabel-labelCellState:/div +div class=state/div +/div -div class=clear/div -div class=clear dijitDialogPaneActionBar -button data-dojo-type=dijit.form.Button class=editAuthenticationProviderButton type=buttonEdit/button -button data-dojo-type=dijit.form.Button class=deleteAuthenticationProviderButton type=buttonDelete/button -/div -br/ -br/ -div class=clear/div -div class=clear preferencesPanel data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Preferences Provider', open: true - div class=preferencesProviderDetails/div - button data-dojo-type=dijit.form.Button class=addPreferencesProviderButtonAdd/button +div class=clear/div +div class=clear dijitDialogPaneActionBar +button data-dojo-type=dijit.form.Button class=editAuthenticationProviderButton type=buttonEdit/button +button data-dojo-type=dijit.form.Button class=deleteAuthenticationProviderButton type=buttonDelete/button +/div +br/ +br/ +div class=clear/div +div class=clear preferencesPanel data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Preferences Provider', open: true + div class=preferencesProviderDetails/div + button data-dojo-type=dijit.form.Button class=addPreferencesProviderButtonAdd/button +/div +br/ /div -br/ /div Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html?rev=1634043r1=1634042r2=1634043view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html Fri Oct 24 12:07:45 2014 @@ -19,7 +19,7 @@ - -- div -div class=groupProvider data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Group Provider Attributes', open: true +div class=groupProvider data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Group Provider', open: true div class=clear div class=formLabel-labelCellName:/div div class=name/div @@ -41,3 +41,4 @@ /div /div /div + Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html?rev=1634043r1=1634042r2=1634043view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http
svn commit: r1633600 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Author: macbean
Date: Wed Oct 22 11:35:02 2014
New Revision: 1633600
URL: http://svn.apache.org/r1633600
Log:
QPID-6176: [Java Broker] Re-instate the variables/values that are now missing
from the Web UI Broker Attributes section
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1633600r1=1633599r2=1633600view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Wed Oct 22 11:35:02 2014
@@ -53,6 +53,10 @@ define([dojo/_base/xhr,
function (xhr, parser, query, json, connect, properties, updater, util,
UpdatableStore, EnhancedGrid, registry, entities,
addAuthenticationProvider, addVirtualHostNodeAndVirtualHost, addPort,
addKeystore, addGroupProvider, addAccessControlProvider, editBroker) {
+ var brokerAttributeNames = [name, operatingSystem, platform,
productVersion, modelVersion,
+defaultVirtualHost,
statisticsReportingPeriod, statisticsReportingResetEnabled,
+connection.sessionCountLimit,
connection.heartBeatDelay];
+
function Broker(name, parent, controller) {
this.name = name;
this.controller = controller;
@@ -64,6 +68,7 @@ define([dojo/_base/xhr,
}
}
+
Broker.prototype.getTitle = function()
{
return Broker;
@@ -78,7 +83,7 @@ define([dojo/_base/xhr,
contentPane.containerNode.innerHTML = data;
parser.parse(contentPane.containerNode);
-that.brokerUpdater = new
BrokerUpdater(contentPane.containerNode, that.modelObj, that.controller,
that.attributeWidgetFactories);
+that.brokerUpdater = new
BrokerUpdater(contentPane.containerNode, that.modelObj, that.controller);
updater.add( that.brokerUpdater );
@@ -226,11 +231,10 @@ define([dojo/_base/xhr,
updater.remove( this.brokerUpdater );
};
- function BrokerUpdater(node, brokerObj, controller, attributes)
+ function BrokerUpdater(node, brokerObj, controller)
{
this.controller = controller;
this.query = api/latest/broker?depth=2;
- this.attributes = attributes;
this.accessControlProvidersWarn =
query(.broker-access-control-providers-warning, node)[0]
var that = this;
@@ -553,12 +557,12 @@ define([dojo/_base/xhr,
BrokerUpdater.prototype.updateHeader = function()
{
- this.showReadOnlyAttributes();
var brokerData = this.brokerData;
window.document.title = Qpid: + brokerData.name +
Management;
- for(var i in this.attributes)
+
+ for(var i in brokerAttributeNames)
{
- var propertyName = this.attributes[i].name;
+ var propertyName = brokerAttributeNames[i];
var element = dojo.byId(brokerAttribute. + propertyName);
if (element)
{
@@ -622,52 +626,42 @@ define([dojo/_base/xhr,
var that = this;
xhr.get({url: this.query, sync: properties.useSyncGet,
handleAs: json}).then(function(data)
-
{
-
that.brokerData = data[0];
-
util.flattenStatistics( that.brokerData );
-
-
that.updateHeader();
-
-
if (that.vhostsGrid.update(that.brokerData.virtualhostnodes))
-
{
-
that.vhostsGrid.grid._refresh();
-
that.toggleVirtualHostNodeNodeMenus
svn commit: r1633162 - in /qpid/trunk/qpid/java/perftests/etc: chartdefs/ testdefs/
Author: macbean
Date: Mon Oct 20 14:16:51 2014
New Revision: 1633162
URL: http://svn.apache.org/r1633162
Log:
QPID-6138: [Java Perf Tests] Update perf test defs to remove redundant tests
Removed:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js?rev=1633162r1=1633161r2=1633162view=diff
==
--- qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
(original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
Mon Oct 20 14:16:51 2014
@@ -45,9 +45,6 @@ for(producersIndex=0; producersIndex n
_iterations:[
{
_acknowledgeMode: 0
-},
-{
- _acknowledgeMode: 1
}
],
_clients:
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js?rev=1633162r1=1633161r2=1633162view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
(original)
+++
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
Mon Oct 20 14:16:51 2014
@@ -78,7 +78,7 @@ for(i=0; i numbersOfSessions.length ;
{
_name:
client__CONSUMING_CLIENT_INDEXConsumer1Session1,
_destinationName: queueName,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_maximumDuration: duration
}
]
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1632102 - /qpid/trunk/qpid/java/perftests/etc/chartdefs/
Author: macbean
Date: Wed Oct 15 15:57:25 2014
New Revision: 1632102
URL: http://svn.apache.org/r1632102
Log:
QPID-6138: [Java Perf Tests] Update perf test chart def descriptions
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef?rev=1632102r1=1632101r2=1632102view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
Wed Oct 15 15:57:25 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size Bytes/S
chartSubtitle=Transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes ${baselineName}, single queue.
+chartDescription=1P 1C, single queue, transient, auto-ack, with message
payload between 256-262144 bytes ${baselineName}.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (KB/s)
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1632102r1=1632101r2=1632102view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
Wed Oct 15 15:57:25 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size Bytes/S
chartSubtitle=Persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, persistent, session-transacted, with
message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (KB/s)
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef?rev=1632102r1=1632101r2=1632102view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
svn commit: r1631388 - in /qpid/trunk/qpid/java/perftests: etc/testdefs/QueueTypes.json pom.xml
Author: macbean
Date: Mon Oct 13 13:28:30 2014
New Revision: 1631388
URL: http://svn.apache.org/r1631388
Log:
QPID-6138: [Java Perf Tests] Update perf test profiles replacing
persistent/auto-ack with persistent/transacted - queue type change
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
qpid/trunk/qpid/java/perftests/pom.xml
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json?rev=1631388r1=1631387r2=1631388view=diff
==
--- qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json Mon Oct 13
13:28:30 2014
@@ -16029,7 +16029,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_producers: [
{
_name: Producer1,
@@ -16054,7 +16054,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_consumers: [
{
_name: Consumer1,
@@ -16087,7 +16087,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_producers: [
{
_name: Producer1,
@@ -16111,7 +16111,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_consumers: [
{
_name: Consumer1,
@@ -16154,7 +16154,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_producers: [
{
_name: Producer1,
@@ -16179,7 +16179,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 1,
+ _acknowledgeMode: 0,
_consumers: [
{
_name: Consumer1,
Modified: qpid/trunk/qpid/java/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1631388r1=1631387r2=1631388view=diff
==
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/pom.xml Mon Oct 13 13:28:30 2014
@@ -179,7 +179,10 @@
/arguments
systemProperties
systemProperty
- keyqpid.amqp/keyvalue0-91/value
+
keylog4j.configuration/keyvaluefile:log4j.properties/value
+/systemProperty
+systemProperty
+ keyqpid.amqp.version/keyvalue0-91/value
/systemProperty
systemProperty
keyqpid.dest_syntax/keyvalueBURL/value
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1630807 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Author: macbean
Date: Fri Oct 10 12:45:28 2014
New Revision: 1630807
URL: http://svn.apache.org/r1630807
Log:
QPID-6134: [Java Broker] added operational logging call to additional intruder
detection logic
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1630807r1=1630806r2=1630807view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Fri Oct 10 12:45:28 2014
@@ -343,6 +343,7 @@ public class BDBHAVirtualHostNodeImpl ex
String nodeAddress = node.getHostName() + : + node.getPort();
if (!_permittedNodes.contains(nodeAddress))
{
+getEventLogger().message(getGroupLogSubject(),
HighAvailabilityMessages.INTRUDER_DETECTED(node.getName(), nodeAddress));
shutdownOnIntruder(nodeAddress);
throw new IllegalStateException(Intruder node detected:
+ nodeAddress);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1630496 - in /qpid/trunk/qpid/java/perftests: ./ etc/chartdefs/ etc/testdefs/
Author: macbean
Date: Thu Oct 9 14:56:41 2014
New Revision: 1630496
URL: http://svn.apache.org/r1630496
Log:
QPID-6138: [Java Perf Tests] Update perf test profiles replacing
persistent/auto-ack with persistent/transacted
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json
qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
qpid/trunk/qpid/java/perftests/pom.xml
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef?rev=1630496r1=1630495r2=1630496view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
Thu Oct 9 14:56:41 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size Bytes/S
chartSubtitle=Transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes ${baselineName}.
+chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes ${baselineName}, single queue.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (KB/s)
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1630496r1=1630495r2=1630496view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
Thu Oct 9 14:56:41 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size Bytes/S
chartSubtitle=Persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144 bytes.
+chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144
svn commit: r1630498 - /qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
Author: macbean
Date: Thu Oct 9 15:03:57 2014
New Revision: 1630498
URL: http://svn.apache.org/r1630498
Log:
QPID-6138: [Java Perf Tests] Update perf test profiles replacing
persistent/auto-ack with persistent/transacted - queue type revert
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json?rev=1630498r1=1630497r2=1630498view=diff
==
--- qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json Thu Oct 9
15:03:57 2014
@@ -16029,7 +16029,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_producers: [
{
_name: Producer1,
@@ -16054,7 +16054,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_consumers: [
{
_name: Consumer1,
@@ -16087,7 +16087,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_producers: [
{
_name: Producer1,
@@ -16111,7 +16111,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_consumers: [
{
_name: Consumer1,
@@ -16154,7 +16154,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_producers: [
{
_name: Producer1,
@@ -16179,7 +16179,7 @@
_sessions: [
{
_sessionName: session1,
- _acknowledgeMode: 0,
+ _acknowledgeMode: 1,
_consumers: [
{
_name: Consumer1,
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1630167 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ broker-core/s
Author: macbean
Date: Wed Oct 8 16:34:10 2014
New Revision: 1630167
URL: http://svn.apache.org/r1630167
Log:
QPID-6134: [Java Broker] Restarting a node that has detected an intruder should
go back into the ERROR state not ACTIVE
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1630167r1=1630166r2=1630167view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Wed Oct 8 16:34:10 2014
@@ -335,6 +335,24 @@ public class BDBHAVirtualHostNodeImpl ex
throw new IllegalStateException(Environment facade is not
created);
}
+try
+{
+SetReplicationNode remoteNodes =
environmentFacade.getEnvironment().getGroup().getNodes();
+for (ReplicationNode node : remoteNodes)
+{
+String nodeAddress = node.getHostName() + : + node.getPort();
+if (!_permittedNodes.contains(nodeAddress))
+{
+shutdownOnIntruder(nodeAddress);
+throw new IllegalStateException(Intruder node detected:
+ nodeAddress);
+}
+}
+}
+catch (DatabaseException dbe)
+{
+environmentFacade.handleDatabaseException(DB exception while
checking for intruder node, dbe);
+}
+
if (_environmentFacade.compareAndSet(null, environmentFacade))
{
environmentFacade.setStateChangeListener(new
EnvironmentStateChangeListener());
@@ -1047,7 +1065,7 @@ public class BDBHAVirtualHostNodeImpl ex
private boolean processIntruderNode(ReplicationNode node)
{
-String hostAndPort = node.getHostName() + : + node.getPort();
+final String hostAndPort = node.getHostName() + : +
node.getPort();
getEventLogger().message(getGroupLogSubject(),
HighAvailabilityMessages.INTRUDER_DETECTED(node.getName(), hostAndPort));
boolean inManagementMode =
getParent(Broker.class).isManagementMode();
@@ -1069,35 +1087,16 @@ public class BDBHAVirtualHostNodeImpl ex
BDBHAVirtualHostNodeImpl.this.getName(),
_lastRole.get(),
String.valueOf(BDBHAVirtualHostNodeImpl.this.getPermittedNodes()) ));
-
getTaskExecutor().submit(new TaskVoid()
{
@Override
public Void execute()
{
-State state = getState();
-if (state != State.ERRORED)
-{
-try
-{
-stopAndSetStateTo(State.ERRORED);
-}
-catch(Exception e)
-{
-LOGGER.error(Unexpected exception on closing
the node when intruder is detected , e);
-}
-finally
-{
-closeEnvironment();
-
-_lastRole.set(NodeRole.DETACHED);
-attributeSet(ROLE, _role, NodeRole.DETACHED);
-}
-notifyStateChanged(state, State.ERRORED);
-}
+shutdownOnIntruder(hostAndPort);
return null;
}
});
+
return false;
}
}
@@ -1119,6 +1118,28 @@ public class BDBHAVirtualHostNodeImpl ex
}
}
+protected void shutdownOnIntruder(String intruderHostAndPort)
+{
+LOGGER.info(Intruder detected ( + intruderHostAndPort + ), stopping
and setting state to ERRORED);
+
+State initialState = getState();
+try
+{
+stopAndSetStateTo(State.ERRORED);
+}
+catch (Exception e)
+{
+LOGGER.error(Unexpected exception
svn commit: r1629680 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: addQueue.html editQueue.html js/qpid/management/addQueue.js js/qpid/management/editQueue.js
Author: macbean Date: Mon Oct 6 15:35:07 2014 New Revision: 1629680 URL: http://svn.apache.org/r1629680 Log: QPID-6130: [Java Broker] Introduce edit queue dialog - further add/edit harmonisation Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1629680r1=1629679r2=1629680view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html Mon Oct 6 15:35:07 2014 @@ -39,19 +39,75 @@ div class=clear div class=formLabel-labelCellQueue Type:/div div class=formLabel-controlCell -input type=radio id=formAddQueueTypeStandard name=type value=standard checked=checked dojoType=dijit.form.RadioButton / -label for=formAddQueueTypeStandardStandard/label -nbsp; -input type=radio id=formAddQueueTypePriority name=type value=priority dojoType=dijit.form.RadioButton / -label for=formAddQueueTypePriorityPriority/label -nbsp; -input type=radio id=formAddQueueTypeLVQ name=type value=lvq dojoType=dijit.form.RadioButton / -label for=formAddQueueTypeLVQLVQ/label -nbsp; -input type=radio id=formAddQueueTypeSorted name=type value=sorted dojoType=dijit.form.RadioButton / -label for=formAddQueueTypeSortedSorted/label +select id=formAddQueue.type +dojoType=dijit.form.FilteringSelect +data-dojo-props= + name: 'type', + value: 'standard', + searchAttr: 'name', + required: true, + promptMessage: 'Type of Queue', + title: 'Enter the queue type' +option value=standardStandard/option +option value=priorityPriority/option +option value=lvqLVQ/option +option value=sortedSorted/option +/select +/div +/div +div class=clear/div + +div id=formAddQueueType:priority class=hidden typeSpecificDiv +div class=clear +div class=formLabel-labelCellPriorities:/div +div class=formLabel-controlCell +input type=text id=formAddQueue.priorities + data-dojo-type=dijit/form/ValidationTextBox + data-dojo-props= + name: 'priorities', + placeHolder: 'number of priorities', + promptMessage: 'Number of priorities supported by the queue', + title: 'Enter the number of priorities supported by the queue', + trim: true/ +/div +/div +div class=clear/div +/div + +div id=formAddQueueType:lvq class=hidden typeSpecificDiv +div class=clear +div class=formLabel-labelCellLVQ Message Property:/div +div class=formLabel-controlCell +input type=text id=formAddQueue.lvqKey + data-dojo-type=dijit/form/ValidationTextBox + data-dojo-props= + name: 'lvqKey', + placeHolder: 'lvq key', + promptMessage: 'Name of the message property used to perform the conflation', + title: 'Enter the name of the message property used to perform the conflation', + trim: true/ +/div +/div +div class=clear/div +/div + +div id=formAddQueueType:sorted class=hidden typeSpecificDiv +div class=clear +div class=formLabel
svn commit: r1629203 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/queue/ broker-plugins/management-http/src/main/java/resources/ broker-plugins/management-http/src/main
Author: macbean
Date: Fri Oct 3 14:09:50 2014
New Revision: 1629203
URL: http://svn.apache.org/r1629203
Log:
QPID-6130: [Java Broker] Introduce edit queue dialog to web management UI
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1629203r1=1629202r2=1629203view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Fri Oct 3 14:09:50 2014
@@ -2961,7 +2961,10 @@ public abstract class AbstractQueueX ex
{
throw new IllegalConfigurationException(Flow resume size can't be
greater than flow control size);
}
-
+else if (changedAttributes.contains(DURABLE)
proxyForValidation.isDurable() != isDurable())
+{
+throw new IllegalConfigurationException(Message durability cannot
be modified after queue creation);
+}
for (String attrName : NON_NEGATIVE_NUMBERS)
{
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1629203r1=1629202r2=1629203view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
Fri Oct 3 14:09:50 2014
@@ -73,8 +73,8 @@
value: '',
searchAttr: 'name',
required: false,
- promptMessage: 'Message durability override. If
not default, messages arriving will have durability setting overridden',
- title: 'Enter message durability override'
+ promptMessage: 'Message persistence override. If
not default, messages arriving will have persistence setting overridden',
+ title: 'Enter message persistence override'
option value=ALWAYSAlways/option
option value=DEFAULTDefault/option
option value=NEVERNever/option
@@ -108,10 +108,8 @@
/div
/div
-br/
div class=clear/div
-
div id=formAddQueueTypePriority:fields class=hidden
data-dojo-type=dijit.TitlePane data-dojo-props=title:
'Priority Queue Settings'
div class=clear
@@ -166,8 +164,9 @@
div class=clear/div
/div
-br/
-div data-dojo-type=dijit.TitlePane data-dojo-props=title:
'Flow Control Settings', open: false
+div class=clear formBox
+fieldset
+legendFlow Control Settings/legend
div class=clear
div class=formLabel-labelCellCapacity:/div
div class=formLabel-controlCell
@@ -194,11 +193,13 @@
trim: true/
/div
/div
+/fieldset
div class=clear/div
/div
-br/
-div data-dojo-type=dijit.TitlePane data-dojo-props=title:
'Alerting Settings', open: false
+div class=clear formBox
+fieldset
+legendAlerting Settings/legend
div class=clear
svn commit: r1629225 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Author: macbean
Date: Fri Oct 3 15:20:07 2014
New Revision: 1629225
URL: http://svn.apache.org/r1629225
Log:
QPID-6130: [Java Broker] Introduce edit queue dialog - review change to remove
duplicate API call
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1629225r1=1629224r2=1629225view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Fri Oct 3 15:20:07 2014
@@ -136,7 +136,7 @@ define([dojo/_base/xhr,
}
this.virtualHostNodeContext.loadInheritedData(api/latest/broker);
-this.virtualHostContext.loadInheritedData(api/latest/broker);
+this.virtualHostContext.setData({},
this.virtualHostNodeContext.effectiveValues,this.virtualHostNodeContext.inheritedActualValues);
this.dialog.show();
if (!this.resizeEventRegistered)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1629242 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
Author: macbean
Date: Fri Oct 3 15:59:52 2014
New Revision: 1629242
URL: http://svn.apache.org/r1629242
Log:
QPID-6130: [Java Broker] Introduce edit queue dialog - removed redundant JS
imports
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1629242r1=1629241r2=1629242view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
Fri Oct 3 15:59:52 2014
@@ -30,8 +30,6 @@ define([dojo/_base/xhr,
dojo/parser,
'dojo/json',
dojo/query,
-dojo/store/Memory,
-dojo/data/ObjectStore,
qpid/common/util,
dojo/text!editQueue.html,
qpid/common/ContextVariablesEditor,
@@ -44,7 +42,7 @@ define([dojo/_base/xhr,
dojox/validate/us,
dojox/validate/web,
dojo/domReady!],
- function (xhr, entities, array, event, lang, win, dom, domConstruct,
registry, parser, json, query, Memory, ObjectStore, util, template)
+ function (xhr, entities, array, event, lang, win, dom, domConstruct,
registry, parser, json, query, util, template)
{
var fields = [name,
type,
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1628133 - /qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Author: macbean
Date: Mon Sep 29 08:09:55 2014
New Revision: 1628133
URL: http://svn.apache.org/r1628133
Log:
NO-JIRA: [Java Broker] UI change to update BDB HA permitted nodes hidden field
correctly
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1628133r1=1628132r2=1628133view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Mon Sep 29 08:09:55 2014
@@ -106,6 +106,7 @@ define([dojo/_base/xhr,
_changeAddress: function(address, virtualHostNodeHelperAddress)
{
virtualHostNodeHelperAddress.set(value, address);
+ this._updatePermittedNodesJson();
},
_clickAddPermittedNodeButton: function(e)
{
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1625930 - /qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
Author: macbean Date: Thu Sep 18 09:51:53 2014 New Revision: 1625930 URL: http://svn.apache.org/r1625930 Log: QPID-6075: fix for mocking issue in BDB profile Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1625930r1=1625929r2=1625930view=diff == --- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original) +++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Thu Sep 18 09:51:53 2014 @@ -403,7 +403,8 @@ public class BDBMessageStoreTest extends assertTrue(Store does not exist at + storeLocation, location.exists()); BDBVirtualHost mockVH = mock(BDBVirtualHost.class); -when(mockVH.getStorePath()).thenReturn(getStore().getStoreLocation()); +String testLocation = getStore().getStoreLocation(); +when(mockVH.getStorePath()).thenReturn(testLocation); getStore().onDelete(mockVH); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1625505 - in /qpid/trunk/qpid/java/broker-core/src: main/java/org/apache/qpid/server/store/JsonFileConfigStore.java test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Author: macbean
Date: Wed Sep 17 10:35:33 2014
New Revision: 1625505
URL: http://svn.apache.org/r1625505
Log:
QPID-6095: [Java Broker] Deletion of an ERRORED JSON VHN with an invalid store
path causes an exception
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1625505r1=1625504r2=1625505view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Wed Sep 17 10:35:33 2014
@@ -91,6 +91,7 @@ public class JsonFileConfigStore impleme
private String _name;
private FileLock _fileLock;
private String _configFileName;
+private String _backupFileName;
private String _lockFileName;
private static final Module _module;
@@ -170,12 +171,14 @@ public class JsonFileConfigStore impleme
{
_directoryName = fileFromSettings.getParent();
_configFileName = fileFromSettings.getName();
+_backupFileName = fileFromSettings.getName() + .bak;
_lockFileName = fileFromSettings.getName() + .lck;
}
else
{
_directoryName = configurationStoreSettings.getStorePath();
_configFileName = _name + .json;
+_backupFileName = _name + .bak;
_lockFileName = _name + .lck;
}
@@ -185,14 +188,21 @@ public class JsonFileConfigStore impleme
if(!fileExists(_configFileName))
{
-File newFile = new File(_directoryName, _configFileName);
-try
+if(!fileExists(_backupFileName))
{
-_objectMapper.writeValue(newFile, Collections.emptyMap());
+File newFile = new File(_directoryName, _configFileName);
+try
+{
+_objectMapper.writeValue(newFile, Collections.emptyMap());
+}
+catch (IOException e)
+{
+throw new StoreException(Could not write configuration
file + newFile, e);
+}
}
-catch (IOException e)
+else
{
-throw new StoreException(Could not write configuration file
+ newFile, e);
+renameFile(_backupFileName, _configFileName);
}
}
}
@@ -390,8 +400,11 @@ public class JsonFileConfigStore impleme
File tmpFile = File.createTempFile(cfg,tmp, new
File(_directoryName));
tmpFile.deleteOnExit();
_objectMapper.writeValue(tmpFile, data);
+renameFile(_configFileName, _backupFileName);
renameFile(tmpFile.getName(),_configFileName);
tmpFile.delete();
+File backupFile = new File(_directoryName, _backupFileName);
+backupFile.delete();
}
catch (IOException e)
{
@@ -619,5 +632,4 @@ public class JsonFileConfigStore impleme
}
return map;
}
-
}
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java?rev=1625505r1=1625504r2=1625505view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Wed Sep 17 10:35:33 2014
@@ -352,18 +352,25 @@ public class JsonFileConfigStoreTest ext
public void testStoreFileLifecycle()
{
File expectedJsonFile = new File(_storeLocation, _parent.getName() +
.json);
+File expectedJsonFileBak = new File(_storeLocation, _parent.getName()
+ .bak);
+File expectedJsonFileLck = new File(_storeLocation, _parent.getName()
+ .lck);
assertFalse(JSON store should not exist, expectedJsonFile.exists());
+assertFalse(JSON backup should not exist,
expectedJsonFileBak.exists());
+assertFalse(JSON lock should not exist,
expectedJsonFileLck.exists());
_store.openConfigurationStore(_parent, false);
assertTrue(JSON store should exist after open,
expectedJsonFile.exists());
+assertFalse(JSON
svn commit: r1625601 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/store/ broker-plugins/derby-store/src/
Author: macbean
Date: Wed Sep 17 14:10:38 2014
New Revision: 1625601
URL: http://svn.apache.org/r1625601
Log:
QPID-6075: [Java Broker] Deleting VHN fails to delete underlying store files if
VHN has not been started
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1625601r1=1625600r2=1625601view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Wed Sep 17 14:10:38 2014
@@ -77,7 +77,6 @@ public class BDBConfigurationStore imple
private EnvironmentFacade _environmentFacade;
-private String _storeLocation;
private ConfiguredObject? _parent;
private final Class? extends ConfiguredObject _rootClass;
private boolean _overwrite;
@@ -106,7 +105,6 @@ public class BDBConfigurationStore imple
if (_environmentFacade == null)
{
_environmentFacade =
_environmentFacadeFactory.createEnvironmentFacade(parent);
-_storeLocation = _environmentFacade.getStoreLocation();
_overwrite = overwrite;
_initialRecords = initialRecords;
}
@@ -482,24 +480,22 @@ public class BDBConfigurationStore imple
@Override
public void onDelete(ConfiguredObject? parent)
{
-if (LOGGER.isDebugEnabled())
-{
-LOGGER.debug(Deleting store + _storeLocation);
-}
-
FileBasedSettings fileBasedSettings = (FileBasedSettings)parent;
String storePath = fileBasedSettings.getStorePath();
if (storePath != null)
{
+if (LOGGER.isDebugEnabled())
+{
+LOGGER.debug(Deleting store + storePath);
+}
+
File configFile = new File(storePath);
if (!FileUtils.delete(configFile, true))
{
LOGGER.info(Failed to delete the store at location +
storePath);
}
}
-
-_storeLocation = null;
}
private boolean isConfigurationStoreOpen()
@@ -570,7 +566,7 @@ public class BDBConfigurationStore imple
@Override
public String getStoreLocation()
{
-return BDBConfigurationStore.this._storeLocation;
+return ((FileBasedSettings)_parent).getStorePath();
}
@Override
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1625601r1=1625600r2=1625601view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Wed Sep 17 14:10:38 2014
@@ -46,7 +46,6 @@ public class BDBMessageStore extends Abs
private EnvironmentFacade _environmentFacade;
private ConfiguredObject? _parent;
-private String _storeLocation;
private long _persistentSizeLowThreshold;
private long _persistentSizeHighThreshold;
@@ -78,7 +77,6 @@ public class BDBMessageStore extends Abs
}
_environmentFacade =
_environmentFacadeFactory.createEnvironmentFacade(parent);
-_storeLocation = _environmentFacade.getStoreLocation();
}
}
@@ -105,24 +103,22 @@ public class BDBMessageStore extends Abs
@Override
public void onDelete(ConfiguredObject? parent)
{
-if (LOGGER.isDebugEnabled())
-{
-LOGGER.debug(Deleting store + _storeLocation);
-}
-
FileBasedSettings fileBasedSettings = (FileBasedSettings)parent;
String storePath = fileBasedSettings.getStorePath();
if (storePath != null
svn commit: r1625035 - in /qpid/trunk/qpid/java/broker-core/src: main/java/org/apache/qpid/server/store/JsonFileConfigStore.java test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Author: macbean
Date: Mon Sep 15 14:03:28 2014
New Revision: 1625035
URL: http://svn.apache.org/r1625035
Log:
QPID-6095: [Java Broker] Deletion of an ERRORED JSON VHN with an invalid store
path causes an exception
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1625035r1=1625034r2=1625035view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Mon Sep 15 14:03:28 2014
@@ -90,7 +90,6 @@ public class JsonFileConfigStore impleme
private String _name;
private FileLock _fileLock;
private String _configFileName;
-private String _backupFileName;
private String _lockFileName;
private static final Module _module;
@@ -170,14 +169,12 @@ public class JsonFileConfigStore impleme
{
_directoryName = fileFromSettings.getParent();
_configFileName = fileFromSettings.getName();
-_backupFileName = fileFromSettings.getName() + .bak;
_lockFileName = fileFromSettings.getName() + .lck;
}
else
{
_directoryName = configurationStoreSettings.getStorePath();
_configFileName = _name + .json;
-_backupFileName = _name + .bak;
_lockFileName = _name + .lck;
}
@@ -187,21 +184,14 @@ public class JsonFileConfigStore impleme
if(!fileExists(_configFileName))
{
-if(!fileExists(_backupFileName))
+File newFile = new File(_directoryName, _configFileName);
+try
{
-File newFile = new File(_directoryName, _configFileName);
-try
-{
-_objectMapper.writeValue(newFile, Collections.emptyMap());
-}
-catch (IOException e)
-{
-throw new StoreException(Could not write configuration
file + newFile, e);
-}
+_objectMapper.writeValue(newFile, Collections.emptyMap());
}
-else
+catch (IOException e)
{
-renameFile(_backupFileName, _configFileName);
+throw new StoreException(Could not write configuration file
+ newFile, e);
}
}
}
@@ -399,12 +389,8 @@ public class JsonFileConfigStore impleme
File tmpFile = File.createTempFile(cfg,tmp, new
File(_directoryName));
tmpFile.deleteOnExit();
_objectMapper.writeValue(tmpFile,data);
-renameFile(_configFileName,_backupFileName);
renameFile(tmpFile.getName(),_configFileName);
tmpFile.delete();
-File backupFile = new File(_directoryName, _backupFileName);
-backupFile.delete();
-
}
catch (IOException e)
{
@@ -581,11 +567,14 @@ public class JsonFileConfigStore impleme
@Override
public void onDelete()
{
-if (_configFileName != null _backupFileName != null)
+if (_configFileName != null)
{
-renameFile(_configFileName,_backupFileName);
+File configFile = new File(_directoryName, _configFileName);
+if (!configFile.delete())
+{
+_logger.info(Failed to delete JSON file config store: +
_configFileName);
+}
_configFileName = null;
-_backupFileName = null;
}
}
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java?rev=1625035r1=1625034r2=1625035view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Mon Sep 15 14:03:28 2014
@@ -351,14 +351,11 @@ public class JsonFileConfigStoreTest ext
public void testStoreFileLifecycle()
{
File expectedJsonFile = new File(_storeLocation, _parent.getName() +
.json);
-File expectedJsonFileBak = new File(_storeLocation, _parent.getName
svn commit: r1625039 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/ja
Author: macbean
Date: Mon Sep 15 14:16:31 2014
New Revision: 1625039
URL: http://svn.apache.org/r1625039
Log:
QPID-6075: [Java Broker] Deleting VHN fails to delete underlying store files if
VHN has not been started
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1625039r1=1625038r2=1625039view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Mon Sep 15 14:16:31 2014
@@ -44,6 +44,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.FileBasedSettings;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreProvider;
import org.apache.qpid.server.store.SizeMonitoringSettings;
@@ -479,27 +480,26 @@ public class BDBConfigurationStore imple
}
@Override
-public void onDelete()
+public void onDelete(ConfiguredObject? parent)
{
-if (!isConfigurationStoreOpen()
!_providedMessageStore.isMessageStoreOpen())
+if (LOGGER.isDebugEnabled())
{
-if (_storeLocation != null)
-{
-if (LOGGER.isDebugEnabled())
-{
-LOGGER.debug(Deleting store + _storeLocation);
-}
+LOGGER.debug(Deleting store + _storeLocation);
+}
-File location = new File(_storeLocation);
-if (location.exists())
-{
-if (!FileUtils.delete(location, true))
-{
-LOGGER.error(Cannot delete + _storeLocation);
-}
-}
+FileBasedSettings fileBasedSettings = (FileBasedSettings)parent;
+String storePath = fileBasedSettings.getStorePath();
+
+if (storePath != null)
+{
+File configFile = new File(storePath);
+if (!FileUtils.delete(configFile, true
svn commit: r1624490 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js broker-plugins/management-http/src/main/java/resources/js/qpid/manag
Author: macbean
Date: Fri Sep 12 10:27:04 2014
New Revision: 1624490
URL: http://svn.apache.org/r1624490
Log:
QPID-6092: [Java Broker] Editing permitted node list to be allowed when VHN is
master or in STOPPED/ERRORED state. UI (2/2)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1624490r1=1624489r2=1624490view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
Fri Sep 12 10:27:04 2014
@@ -38,7 +38,10 @@ define([qpid/common/util,
{
registry.byId(editVirtualHostNode.storePath).set(disabled, true);
}
-
+ if (!( data.effectiveData.role == MASTER || data.data.state ==
ERRORED || data.data.state == STOPPED))
+ {
+
registry.byId(editVirtualHostNode.permittedNodesList).set(disabled, true);
+ }
var overrideData = [{id: '0', name: 'Majority', selected: '1'}];
if (node.remotereplicationnodes
node.remotereplicationnodes.length1)
{
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1624490r1=1624489r2=1624490view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Fri Sep 12 10:27:04 2014
@@ -156,7 +156,7 @@ define([dojo/_base/xhr,
{
try
{
-TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: actualData});
+TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: actualData, effectiveData: effectiveData});
that.form.connectChildren();
util.applyMetadataToWidgets(that.allFieldsContainer,
VirtualHostNode, actualData.type);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1624298 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Author: macbean
Date: Thu Sep 11 14:24:46 2014
New Revision: 1624298
URL: http://svn.apache.org/r1624298
Log:
QPID-6090: [Java Broker] Change based on code review to protect against
intruder case
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1624298r1=1624297r2=1624298view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Thu Sep 11 14:24:46 2014
@@ -769,7 +769,7 @@ public class BDBHAVirtualHostNodeImpl ex
}
String missingNodeAddress = null;
-if (!proposedPermittedNodes.contains(getAddress()))
+if (getPermittedNodes().contains(getAddress())
!proposedPermittedNodes.contains(getAddress()))
{
missingNodeAddress = getAddress();
}
@@ -779,7 +779,7 @@ public class BDBHAVirtualHostNodeImpl ex
{
final BDBHARemoteReplicationNode? bdbHaRemoteReplicationNode
= (BDBHARemoteReplicationNode?) node;
final String remoteNodeAddress =
bdbHaRemoteReplicationNode.getAddress();
-if (!proposedPermittedNodes.contains(remoteNodeAddress))
+if (getPermittedNodes().contains(remoteNodeAddress)
!proposedPermittedNodes.contains(remoteNodeAddress))
{
missingNodeAddress = remoteNodeAddress;
break;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1624299 - in /qpid/trunk/qpid/java/bdbstore/src: main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java test/java/org/apache/qpid/server/store/berkeleyd
Author: macbean
Date: Thu Sep 11 14:30:42 2014
New Revision: 1624299
URL: http://svn.apache.org/r1624299
Log:
QPID-6092: [Java Broker] Editing permitted node list to be allowed when VHN is
master or in STOPPED/ERRORED state. Server (1/2)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1624299r1=1624298r2=1624299view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Thu Sep 11 14:30:42 2014
@@ -763,7 +763,11 @@ public class BDBHAVirtualHostNodeImpl ex
private void validatePermittedNodes(ListString proposedPermittedNodes)
{
-if (proposedPermittedNodes == null || proposedPermittedNodes.isEmpty())
+if (getRemoteReplicationNodes().size() 0 getRole() !=
NodeRole.MASTER !(getState() == State.STOPPED || getState() ==
State.ERRORED))
+{
+throw new IllegalArgumentException(String.format(Attribute '%s'
can only be set on '%s' node or node in '%s' or '%s' state, PERMITTED_NODES,
NodeRole.MASTER, State.STOPPED, State.ERRORED));
+}
+else if (proposedPermittedNodes == null ||
proposedPermittedNodes.isEmpty())
{
throw new IllegalArgumentException(String.format(Attribute '%s'
is mandatory and must be set, PERMITTED_NODES));
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java?rev=1624299r1=1624298r2=1624299view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Thu Sep 11 14:30:42 2014
@@ -413,6 +413,63 @@ public class BDBHAVirtualHostNodeTest ex
}
}
+public void testPermittedNodesAttributeModificationConditions() throws
Exception
+{
+int node1PortNumber = findFreePort();
+int node2PortNumber = getNextAvailable(node1PortNumber+1);
+int node3PortNumber = getNextAvailable(node2PortNumber+1);
+int node4PortNumber = getNextAvailable(node3PortNumber+1);
+int node5PortNumber = getNextAvailable(node4PortNumber+1);
+
+String node1Address = localhost: + node1PortNumber;
+String node2Address = localhost: + node2PortNumber;
+String node3Address = localhost: + node3PortNumber;
+String node4Address = localhost: + node4PortNumber;
+String node5Address = localhost: + node5PortNumber;
+
+String groupName = group;
+String node1Name = node1;
+
+MapString, Object node1Attributes =
_helper.createNodeAttributes(node1Name, groupName, node1Address, node1Address,
node1Name, node1PortNumber, node2PortNumber, node3PortNumber);
+BDBHAVirtualHostNode? node1 =
_helper.createAndStartHaVHN(node1Attributes);
+
+MapString, Object node2Attributes =
_helper.createNodeAttributes(node2, groupName, node2Address, node1Address,
node1Name);
+BDBHAVirtualHostNode? node2 =
_helper.createAndStartHaVHN(node2Attributes);
+
+MapString, Object node3Attributes =
_helper.createNodeAttributes(node3, groupName, node3Address, node1Address,
node1Name);
+BDBHAVirtualHostNode? node3 =
_helper.createAndStartHaVHN(node3Attributes);
+
+_helper.awaitRemoteNodes(node1, 2);
+
+// Create new proposed permitted nodes list for update
+ListString amendedPermittedNodes = new ArrayListString();
+amendedPermittedNodes.add(node1Address);
+amendedPermittedNodes.add(node2Address);
+amendedPermittedNodes.add(node3Address);
+amendedPermittedNodes.add(node4Address);
+
+// Try to update the permitted nodes attributes using the new list on
REPLICA - should fail
+BDBHAVirtualHostNode? nonMasterNode =
_helper.findNodeInRole(NodeRole.REPLICA);
+try
+{
+nonMasterNode.setAttributes(Collections.String,
ObjectsingletonMap
svn commit: r1624012 - in /qpid/trunk/qpid/java/bdbstore/src: main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java test/java/org/apache/qpid/server/store/berkeleyd
Author: macbean
Date: Wed Sep 10 14:28:02 2014
New Revision: 1624012
URL: http://svn.apache.org/r1624012
Log:
QPID-6090: [Java Broker] Prevent removal of existing group nodes from the
permitted nodes attribute on VHN
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1624012r1=1624011r2=1624012view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Wed Sep 10 14:28:02 2014
@@ -761,13 +761,38 @@ public class BDBHAVirtualHostNodeImpl ex
}
}
-private void validatePermittedNodes(ListString permittedNodes)
+private void validatePermittedNodes(ListString proposedPermittedNodes)
{
-if (permittedNodes == null || permittedNodes.isEmpty())
+if (proposedPermittedNodes == null || proposedPermittedNodes.isEmpty())
{
throw new IllegalArgumentException(String.format(Attribute '%s'
is mandatory and must be set, PERMITTED_NODES));
}
-for (String permittedNode: permittedNodes)
+
+String missingNodeAddress = null;
+if (!proposedPermittedNodes.contains(getAddress()))
+{
+missingNodeAddress = getAddress();
+}
+else
+{
+for (final RemoteReplicationNode? node :
getRemoteReplicationNodes())
+{
+final BDBHARemoteReplicationNode? bdbHaRemoteReplicationNode
= (BDBHARemoteReplicationNode?) node;
+final String remoteNodeAddress =
bdbHaRemoteReplicationNode.getAddress();
+if (!proposedPermittedNodes.contains(remoteNodeAddress))
+{
+missingNodeAddress = remoteNodeAddress;
+break;
+}
+}
+}
+
+if (missingNodeAddress != null)
+{
+throw new IllegalArgumentException(String.format(The current
group node '%s' cannot be removed from '%s' as its already a group member,
missingNodeAddress, PERMITTED_NODES));
+}
+
+for (String permittedNode: proposedPermittedNodes)
{
String[] tokens = permittedNode.split(:);
if (tokens.length != 2)
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java?rev=1624012r1=1624011r2=1624012view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Wed Sep 10 14:28:02 2014
@@ -372,6 +372,47 @@ public class BDBHAVirtualHostNodeTest ex
}
}
+public void testCurrentNodeCannotBeRemovedFromPermittedNodeList() throws
Exception
+{
+int node1PortNumber = findFreePort();
+int node2PortNumber = getNextAvailable(node1PortNumber+1);
+int node3PortNumber = getNextAvailable(node2PortNumber+1);
+
+String node1Address = localhost: + node1PortNumber;
+String node2Address = localhost: + node2PortNumber;
+String node3Address = localhost: + node3PortNumber;
+
+String groupName = group;
+String node1Name = node1;
+
+MapString, Object node1Attributes =
_helper.createNodeAttributes(node1Name, groupName, node1Address, node1Address,
node1Name, node1PortNumber, node2PortNumber, node3PortNumber);
+BDBHAVirtualHostNode? node1 =
_helper.createAndStartHaVHN(node1Attributes);
+
+MapString, Object node2Attributes =
_helper.createNodeAttributes(node2, groupName, node2Address, node1Address,
node1Name);
+BDBHAVirtualHostNode? node2 =
_helper.createAndStartHaVHN(node2Attributes);
+
+MapString, Object node3Attributes =
_helper.createNodeAttributes(node3, groupName, node3Address, node1Address,
node1Name);
+BDBHAVirtualHostNode? node3 =
_helper.createAndStartHaVHN(node3Attributes);
+
+_helper.awaitRemoteNodes(node1, 2
svn commit: r1620329 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Author: macbean
Date: Mon Aug 25 14:40:52 2014
New Revision: 1620329
URL: http://svn.apache.org/r1620329
Log:
NO-JIRA: added colon character to the web UI context variable regex pattern to
allow use of namespace
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1620329r1=1620328r2=1620329view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Mon Aug 25 14:40:52 2014
@@ -713,7 +713,7 @@ define([dojo/_base/xhr,
}
}
- var singleContextVarRegexp = (\\${[\\w\\.\\-]+});
+ var singleContextVarRegexp = (\\${[\\w+\\.\\-:]+});
util.numericOrContextVarRegexp = function(constraints)
{
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1619854 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/model/port/ broker-plugins/management-http/src
Author: macbean
Date: Fri Aug 22 16:08:07 2014
New Revision: 1619854
URL: http://svn.apache.org/r1619854
Log:
QPID-6034: [Java Broker] Refactor Port UI to use metadata service rather than
hard-coding a list of protocols/transports etc
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1619854r1=1619853r2=1619854view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
Fri Aug 22 16:08:07 2014
@@ -45,9 +45,6 @@ public interface PortX extends PortX
// Attributes
-@ManagedAttribute(defaultValue = *)
-String getBindingAddress();
-
@ManagedAttribute( mandatory = true )
int getPort();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1619854r1=1619853r2=1619854view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
Fri Aug 22 16:08:07 2014
@@ -61,9 +61,6 @@ abstract public class AbstractPortX ext
private int _port;
@ManagedAttributeField
-private String _bindingAddress;
-
-@ManagedAttributeField
private KeyStore? _keyStore;
@ManagedAttributeField
@@ -172,12 +169,6 @@ abstract public class AbstractPortX ext
}
@Override
-public String getBindingAddress()
-{
-return _bindingAddress;
-}
-
-@Override
public int getPort()
{
return _port;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java?rev=1619854r1=1619853r2=1619854view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
Fri Aug 22 16:08:07 2014
@@ -48,6 +48,9 @@ public interface AmqpPortX extends Amqp
@ManagedContextDefault(name = DEFAULT_AMQP_PROTOCOLS)
String INSTALLED_PROTOCOLS = AmqpPortImpl.getInstalledProtocolsAsString();
+@ManagedAttribute(defaultValue = *)
+String getBindingAddress();
+
@ManagedAttribute( defaultValue = AmqpPort.DEFAULT_AMQP_TCP_NO_DELAY )
boolean
svn commit: r1617275 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: css/common.css showConnection.html showQueue.html showVirtualHost.html
Author: macbean
Date: Mon Aug 11 13:25:17 2014
New Revision: 1617275
URL: http://svn.apache.org/r1617275
Log:
QPID-5986: [Java Broker] right aligned attributes on queue, connection and
virtualhost tabs not correct in IE
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1617275r1=1617274r2=1617275view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
Mon Aug 11 13:25:17 2014
@@ -223,13 +223,18 @@ div .messages {
.alignLeft {
float: left;
+display: inline-block;
}
+
.alignRight {
float: right;
+display: inline-block;
}
+
.multiLineValue {
display: inline-block;
}
+
.haOptionLabel {
font-weight: bold;
margin-left: 5px;
@@ -238,3 +243,4 @@ div .messages {
font-style: italic;
margin: 0px 0px 10px 5px;
}
+
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html?rev=1617275r1=1617274r2=1617275view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
Mon Aug 11 13:25:17 2014
@@ -39,7 +39,7 @@
/div
/div
div class=alignRight
-div
+div class=clear
div class=formLabel-labelCellInbound:/div
div class=formValue-valueCell
span class=msgInRate/span
@@ -48,7 +48,7 @@
span class=bytesInRateUnits/span
/div
/div
-div
+div class=clear
div class=formLabel-labelCellOutbound:/div
div class=formValue-valueCell
span class=msgOutRate/span
@@ -57,13 +57,13 @@
span class=bytesOutRateUnits/span
/div
/div
-div
+div class=clear
div class=formLabel-labelCellConnect Time:/div
div class=formValue-valueCell
div class=createdTime/div
/div
/div
-div
+div class=clear
div class=formLabel-labelCellLast I/O Time:/div
div class=formValue-valueCell
div class=lastIoTime/div
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1617275r1=1617274r2=1617275view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
Mon Aug 11 13:25:17 2014
@@ -50,7 +50,7 @@
/div
/div
div class=alignRight
-div
+div class=clear
div class=formLabel-labelCellInbound:/div
div class=formValue-valueCell
span class=msgInRate/span
@@ -59,7 +59,7 @@
span class=bytesInRateUnits/span
/div
/div
-div
+div class=clear
div class=formLabel-labelCellOutbound:/div
div class=formValue-valueCell
span class=msgOutRate/span
@@ -68,7 +68,7 @@
span class=bytesOutRateUnits/span
/div
/div
-div
+div class=clear
div class=formLabel-labelCellSize:/div
div class=formValue-valueCell
span class=queueDepthMessages/span
@@ -77,7 +77,7 @@
span class=queueDepthBytesUnits)/span
/div
/div
-div
+div class=clear
svn commit: r1616706 - in /qpid/trunk/qpid/doc/book/src: java-broker/commonEntities.xml jms-client-0-8/commonEntities.xml
Author: macbean Date: Fri Aug 8 09:48:16 2014 New Revision: 1616706 URL: http://svn.apache.org/r1616706 Log: NO_JIRA: update docbook version variables to match that of the maven poms Modified: qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/commonEntities.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml?rev=1616706r1=1616705r2=1616706view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/commonEntities.xml Fri Aug 8 09:48:16 2014 @@ -22,7 +22,7 @@ !ENTITY qpidDownloadUrl http://qpid.apache.org/download.html; !ENTITY qpidCppBook ../../AMQP-Messaging-Broker-CPP-Book/html/ -!ENTITY qpidCurrentRelease 0.31 +!ENTITY qpidCurrentRelease 0.32-SNAPSHOT !ENTITY windowsBrokerDownloadFileName qpid-java-broker-qpidCurrentRelease;.zip !ENTITY windowsExtractedBrokerDirName qpid-broker-qpidCurrentRelease; Modified: qpid/trunk/qpid/doc/book/src/jms-client-0-8/commonEntities.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/jms-client-0-8/commonEntities.xml?rev=1616706r1=1616705r2=1616706view=diff == --- qpid/trunk/qpid/doc/book/src/jms-client-0-8/commonEntities.xml (original) +++ qpid/trunk/qpid/doc/book/src/jms-client-0-8/commonEntities.xml Fri Aug 8 09:48:16 2014 @@ -19,7 +19,7 @@ -- -!ENTITY qpidVersion 0.31 +!ENTITY qpidVersion 0.32-SNAPSHOT !ENTITY qpidDownloadUrlDesc the Apache Qpid project web site !ENTITY qpidDownloadUrl http://qpid.apache.org/download.html; - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1615606 [2/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html?rev=1615606r1=1615605r2=1615606view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html Mon Aug 4 15:07:03 2014 @@ -22,11 +22,11 @@ div div style=both:clear div class=formLabel-labelCellName:/div - div class=name style=float:left;/divbr/ + div class=name/div /div div style=both:clear div class=formLabel-labelCellType:/div - div class=type style=float:left;/divbr/ + div class=type/div /div /div div class=pluginDetails/div Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html?rev=1615606r1=1615605r2=1615606view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html Mon Aug 4 15:07:03 2014 @@ -21,59 +21,59 @@ div div class=portContainer - div class=name style=clear:both + div class=clear name div class=formLabel-labelCellName:/div - div class=nameValue style=float:left;/divbr/ + div class=nameValue/div /div - div class=state style=clear:both + div class=clear state div class=formLabel-labelCellState:/div - div class=stateValue style=float:left;/divbr/ + div class=stateValue/div /div - div class=port style=clear:both + div class=clear port div class=formLabel-labelCellPort Number:/div - div class=portValue style=float:left;/divbr/ + div class=portValue/div /div - div class=authenticationProvider style=clear:both + div class=clear authenticationProvider div class=formLabel-labelCellAuthentication Provider:/div - div class=authenticationProviderValue style=float:left;/divbr/ + div class=authenticationProviderValue/div /div - div class=protocols style=clear:both + div class=clear protocols div class=formLabel-labelCellProtocols:/div - div class=protocolsValue style=float:left;/divbr/ + div class=protocolsValue/div /div - div class=transports style=clear:both + div class=clear transports div class=formLabel-labelCellTransports:/div - div class=transportsValue style=float:left;/divbr/ + div class=transportsValue/div /div - div class=bindingAddress style=clear:both + div class=clear bindingAddress div class=formLabel-labelCellBinding address:/div - div class=bindingAddressValue style=float:left;/divbr + div class=bindingAddressValue/div /div - div class=keyStore style=clear:both + div class=clear keyStore div class=formLabel-labelCellKey Store:/div - div class=keyStoreValue style=float:left;/divbr + div class=keyStoreValue/div /div - div class=needClientAuth style=clear:both + div class=clear needClientAuth div class=formLabel-labelCellNeed SSL Client Certificate:/div - div class=needClientAuthValue style=float:left;/divbr + div class=needClientAuthValue/div /div - div class=wantClientAuth style=clear:both + div class=clear wantClientAuth div class=formLabel-labelCellWant SSL Client Certificate:/div - div class=wantClientAuthValue style=float:left;/divbr + div class=wantClientAuthValue/div /div - div class=trustStores style=clear:both + div class=clear trustStores div class=formLabel-labelCellTrust Stores:/div - div class=trustStoresValue style=float:left;/divbr + div class=trustStoresValue/div /div /div Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html?rev=1615606r1=1615605r2=1615606view=diff == ---
svn commit: r1615606 [1/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Author: macbean Date: Mon Aug 4 15:07:03 2014 New Revision: 1615606 URL: http://svn.apache.org/r1615606 Log: QPID-5935: [Java Broker] Web Management UI style refactor to remove html inline styles and standardise via css Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html 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/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/edit.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/edit.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
svn commit: r1614299 [2/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1614299r1=1614298r2=1614299view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Tue Jul 29 10:05:03 2014 @@ -21,50 +21,50 @@ div class=queue div data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Queue Attributes', open: true div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Name:/div +div class=formLabel-labelCellName:/div div class=name style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;State:/div +div class=formLabel-labelCellState:/div div class=state style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Durable:/div +div class=formLabel-labelCellDurable:/div div class=durable style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Persist Messages:/div +div class=formLabel-labelCellPersist Messages:/div div class=messageDurability style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Enforced Max. Ttl(ms):/div +div class=formLabel-labelCellEnforced Max. Ttl(ms):/div div class=maximumMessageTtl style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Enforced Min. Ttl(ms):/div +div class=formLabel-labelCellEnforced Min. Ttl(ms):/div div class=minimumMessageTtl style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Exclusive:/div +div class=formLabel-labelCellExclusive:/div div class=exclusive style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Owner:/div +div class=formLabel-labelCellOwner:/div div class=owner style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Lifespan:/div +div class=formLabel-labelCellLifespan:/div div class=lifetimePolicy style=float:left;/div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Type:/div +div class=formLabel-labelCellType:/div div style=float:left; span class=type/span span class=typeQualifier/span /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Size:/div +div class=formLabel-labelCellSize:/div div style=float:left; span class=queueDepthMessages/span span msgs/span @@ -73,7 +73,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Pre-fetched:/div +div class=formLabel-labelCellPre-fetched:/div div style=float:left; span class=unacknowledgedMessages/span span msgs/span @@ -82,7 +82,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Inbound:/div +div class=formLabel-labelCellInbound:/div div style=float:left; span class=msgInRate/span span msg/s/span @@ -91,7 +91,7 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;Outbound:/div +div class=formLabel-labelCellOutbound:/div div style=float:left; span class=msgOutRate/span span msg/s/span @@ -100,16 +100,16 @@ /div /div div style=clear:both -div class=formLabel-labelCell style=float:left; width: 150px;AlternateExchange:/div +div class=formLabel-labelCellAlternateExchange:/div div class=alternateExchange style=float:left;/div /div div class=messageGroups style=clear:both div
svn commit: r1614299 [1/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/resources/virtu
Author: macbean Date: Tue Jul 29 10:05:03 2014 New Revision: 1614299 URL: http://svn.apache.org/r1614299 Log: QPID-5935: [Java Broker] Web Management UI style refactor to remove html inline styles and standardise via css Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html 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/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html Modified: qpid/trunk/qpid/java
svn commit: r1613461 [2/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/ bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/ bdbs
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1613461view=auto
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
(added)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
Fri Jul 25 16:16:12 2014
@@ -0,0 +1,161 @@
+/*
+ *
+ * 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,
+dojox/html/entities,
+dojo/_base/array,
+dojo/_base/event,
+dojo/_base/lang,
+dojo/_base/window,
+dojo/dom,
+dojo/dom-construct,
+dijit/registry,
+dojo/parser,
+'dojo/json',
+dojo/query,
+dojo/store/Memory,
+dojo/data/ObjectStore,
+qpid/common/util,
+dojo/text!editVirtualHost.html,
+dijit/Dialog,
+dijit/form/CheckBox,
+dijit/form/FilteringSelect,
+dijit/form/ValidationTextBox,
+dijit/form/Button,
+dijit/form/Form,
+dijit/form/NumberSpinner,
+dojox/validate/us,
+dojox/validate/web,
+dojo/domReady!],
+ function (xhr, entities, array, event, lang, win, dom, domConstruct,
registry, parser, json, query, Memory, ObjectStore, util, template)
+ {
+var fields = [ queue.deadLetterQueueEnabled,
storeTransactionIdleTimeoutWarn, storeTransactionIdleTimeoutClose,
storeTransactionOpenTimeoutWarn, storeTransactionOpenTimeoutClose,
housekeepingCheckPeriod, housekeepingThreadCount];
+
+var virtualHostEditor =
+{
+ init: function()
+ {
+var that=this;
+this.containerNode = domConstruct.create(div, {innerHTML: template});
+parser.parse(this.containerNode);
+this.dialog = registry.byId(editVirtualHostDialog)
+this.saveButton = registry.byId(editVirtualHost.saveButton);
+this.cancelButton = registry.byId(editVirtualHost.cancelButton);
+this.cancelButton.on(click, function(e){that._cancel(e);});
+this.saveButton.on(click, function(e){that._save(e);});
+for(var i = 0; i fields.length; i++)
+{
+var fieldName = fields[i];
+this[fieldName] = registry.byId(editVirtualHost. + fieldName);
+}
+this.form = registry.byId(editVirtualHostForm);
+ },
+ show: function(hostData)
+ {
+var that=this;
+this.hostName = hostData.hostName;
+this.query = api/latest/virtualhost/ +
encodeURIComponent(hostData.nodeName) + / +
encodeURIComponent(hostData.hostName);
+this.dialog.set(title, Edit Virtual Host - +
entities.encode(String(hostData.hostName)));
+xhr.get(
+{
+ url: this.query,
+ sync: true,
+ handleAs: json,
+ load: function(data)
+ {
+that._show(data[0]);
+ }
+}
+);
+ },
+ destroy: function()
+ {
+if (this.dialog)
+{
+this.dialog.destroyRecursive();
+this.dialog = null;
+}
+
+if (this.containerNode)
+{
+domConstruct.destroy(this.containerNode);
+this.containerNode = null;
+}
+ },
+ _cancel: function(e)
+ {
+ this.dialog.hide();
+ },
+ _save: function(e)
+ {
+event.stop(e);
+if(this.form.validate())
+{
+ var data = util.getFormWidgetValues(this.form);
+
+ var success = false,failureReason=null;
+ xhr.put({
+ url: this.query,
+ sync: true,
+ handleAs: json,
+ headers: { Content-Type: application/json},
+ putData: json.stringify(data),
+ load: function(x) {success = true; },
+ error: function(error) {success = false; failureReason = error;}
+
svn commit: r1612269 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/ bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/ne
Author: macbean
Date: Mon Jul 21 13:46:18 2014
New Revision: 1612269
URL: http://svn.apache.org/r1612269
Log:
QPID-5413: [Java Broker] BDB HA VHN/VH UI text changes and improved JS
validation add permitted nodes button
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1612269r1=1612268r2=1612269view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Mon Jul 21 13:46:18 2014
@@ -43,7 +43,7 @@ define([dojo/_base/xhr,
this.virtualHostNodeHelperAddress =
registry.byId(addVirtualHostNode.helperAddress);
// add callback
- virtualHostNodeAddress.on(change,
function(address){that._addressChanged(address,
that.virtualHostNodeHelperAddress);});
+ virtualHostNodeAddress.on(change,
function(address){that._changeAddress(address,
that.virtualHostNodeHelperAddress);});
// list objects html node and dojo object
this.addVirtualHostNodePermittedNodesList =
dom.byId(addVirtualHostNode.permittedNodesList);
@@ -52,7 +52,7 @@ define([dojo/_base/xhr,
// permitted node text field
this.addVirtualHostNodePermittedNode =
registry.byId(addVirtualHostNode.permittedNode);
- this.addVirtualHostNodePermittedNode.on(input,
function(event){that._inputPermittedNode(event);});
+ this.addVirtualHostNodePermittedNode.on(change,
function(value){that._changePermittedNode(value);});
// add and remove buttons click handlers
this.addVirtualHostNodePermittedNodeAddButton =
registry.byId(addVirtualHostNode.permittedNodeAdd);
@@ -93,12 +93,13 @@ define([dojo/_base/xhr,
var hasSelection =
this.addVirtualHostNodePermittedNodesListDojo.get(value).length 0;
this.addVirtualHostNodePermittedNodeRemoveButton.set(disabled,
!hasSelection);
},
-_inputPermittedNode: function(event)
+_changePermittedNode: function(value)
{
- this.addVirtualHostNodePermittedNodeAddButton.set(disabled, false);
+ var fieldIsEmpty =
(this.addVirtualHostNodePermittedNode.get(value) == );
+ this.addVirtualHostNodePermittedNodeAddButton.set(disabled,
fieldIsEmpty);
return true;
},
-_addressChanged: function(address, virtualHostNodeHelperAddress)
+_changeAddress: function(address, virtualHostNodeHelperAddress)
{
virtualHostNodeHelperAddress.set(value, address);
},
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html?rev=1612269r1=1612268r2=1612269view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
Mon Jul 21 13:46:18 2014
@@ -101,6 +101,7 @@
name: 'permittedNode',
placeHolder: 'host:port',
title: 'Enter address',
+ intermediateChanges: true,
pattern:
'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}' /
/div
div class=formBoxButtons
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html?rev=1612269r1=1612268r2=1612269view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
(original)
+++
qpid/trunk/qpid/java/broker
svn commit: r1610630 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Author: macbean
Date: Tue Jul 15 09:23:48 2014
New Revision: 1610630
URL: http://svn.apache.org/r1610630
Log:
QPID-5891: Re-instated incorrect removal of else clause in
ReplicatedEnvironmentFacade.setMessageStoreDurability() method
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1610630r1=1610629r2=1610630view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Tue Jul 15 09:23:48 2014
@@ -1117,6 +1117,10 @@ public class ReplicatedEnvironmentFacade
}
_realMessageStoreDurability = new
Durability(localTransactionSynchronizationPolicy,
remoteTransactionSynchronizationPolicy, replicaAcknowledgmentPolicy);
}
+else
+{
+throw new IllegalStateException(Message store durability is
already set to + _messageStoreDurability.get());
+}
}
public void setPermittedNodes(CollectionString permittedNodes)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1610677 - /qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java
Author: macbean Date: Tue Jul 15 13:01:56 2014 New Revision: 1610677 URL: http://svn.apache.org/r1610677 Log: QPID-5891: Removed unnecessary mock reset call in unit test Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java?rev=1610677r1=1610676r2=1610677view=diff == --- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java (original) +++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java Tue Jul 15 13:01:56 2014 @@ -238,8 +238,6 @@ public class BDBHAVirtualHostNodeOperati reset(_eventLogger); -resetEventLogger(); - int node2PortNumber = getNextAvailable(node1PortNumber + 1); MapString, Object node2Attributes = _helper.createNodeAttributes(node2, groupName, localhost: + node2PortNumber, helperAddress); BDBHAVirtualHostNodeImpl node2 = (BDBHAVirtualHostNodeImpl)_helper.createHaVHN(node2Attributes); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1610378 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
Author: macbean
Date: Mon Jul 14 10:23:42 2014
New Revision: 1610378
URL: http://svn.apache.org/r1610378
Log:
QPID-5822: [Java Broker] change to JE param setting logic to handle
EnvironmentParams.SUPPORTED_PARAMS not always containing ALL valid params
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java?rev=1610378r1=1610377r2=1610378view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java
Mon Jul 14 10:23:42 2014
@@ -23,9 +23,7 @@ package org.apache.qpid.server.store.ber
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-
-import com.sleepycat.je.config.ConfigParam;
-import com.sleepycat.je.config.EnvironmentParams;
+import java.util.regex.Pattern;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
@@ -34,6 +32,9 @@ import org.apache.qpid.server.store.berk
public class ReplicatedEnvironmentFacadeFactory implements
EnvironmentFacadeFactory
{
+public static final Pattern NON_REP_JE_PARAM_PATTERN =
Pattern.compile(^je\\.(?!rep\\.).*);
+public static final Pattern REP_JE_PARAM_PATTERN =
Pattern.compile(^je\\.rep\\..*);
+
@Override
public EnvironmentFacade createEnvironmentFacade(final ConfiguredObject?
parent)
{
@@ -113,27 +114,27 @@ public class ReplicatedEnvironmentFacade
private MapString, String
buildEnvironmentConfigParameters(ConfiguredObject? parent)
{
-return buildConfig(parent, false);
+return buildConfig(parent, NON_REP_JE_PARAM_PATTERN);
}
private MapString, String
buildReplicationConfigParameters(ConfiguredObject? parent)
{
-return buildConfig(parent, true);
+return buildConfig(parent, REP_JE_PARAM_PATTERN);
}
-private MapString, String buildConfig(ConfiguredObject? parent,
boolean selectReplicationParaemeters)
+private MapString, String buildConfig(ConfiguredObject? parent,
Pattern paramName)
{
MapString, String targetMap = new HashMap();
-for (ConfigParam entry : EnvironmentParams.SUPPORTED_PARAMS.values())
+for (String name : parent.getContext().keySet())
{
-final String name = entry.getName();
-if (entry.isForReplication() == selectReplicationParaemeters
parent.getContext().containsKey(name))
+if (paramName.matcher(name).matches())
{
String contextValue = parent.getContext().get(name);
targetMap.put(name, contextValue);
}
}
+
return Collections.unmodifiableMap(targetMap);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1610379 [2/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkele
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java?rev=1610379view=auto
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
(added)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
Mon Jul 14 10:26:17 2014
@@ -0,0 +1,502 @@
+/*
+ * 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.
+ *
+ *
+ */
+package org.apache.qpid.server.logging.messages;
+
+import static
org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.server.logging.LogMessage;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
+ *
+ * Generated using GenerateLogMessages and LogMessages.vm
+ * This file is based on the content of HighAvailability_logmessages.properties
+ *
+ * To regenerate, edit the templates/properties and run the build with
-Dgenerate=true
+ */
+public class HighAvailabilityMessages
+{
+private static ResourceBundle _messages;
+private static Locale _currentLocale = BrokerProperties.getLocale();
+
+public static final String HIGHAVAILABILITY_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability;
+public static final String STOPPED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.stopped;
+public static final String INTRUDER_DETECTED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.intruder_detected;
+public static final String STARTED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.started;
+public static final String TRANSFER_MASTER_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.transfer_master;
+public static final String QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.quorum_override_changed;
+public static final String DETACHED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.detached;
+public static final String MAJORITY_LOST_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.majority_lost;
+public static final String PRIORITY_CHANGED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.priority_changed;
+public static final String ATTACHED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.attached;
+public static final String ADDED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.added;
+public static final String DELETED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.deleted;
+public static final String ROLE_CHANGED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.role_changed;
+public static final String DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + highavailability.designated_primary_changed;
+
+static
+{
+Logger.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY);
+Logger.getLogger(STOPPED_LOG_HIERARCHY);
+Logger.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
+Logger.getLogger(STARTED_LOG_HIERARCHY);
+Logger.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
+Logger.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
+Logger.getLogger(DETACHED_LOG_HIERARCHY);
+Logger.getLogger(MAJORITY_LOST_LOG_HIERARCHY);
+Logger.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
+Logger.getLogger(ATTACHED_LOG_HIERARCHY);
+Logger.getLogger(ADDED_LOG_HIERARCHY);
+Logger.getLogger(DELETED_LOG_HIERARCHY);
+Logger.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
+Logger.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY);
+
+_messages =
svn commit: r1607863 - /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Author: macbean Date: Fri Jul 4 14:19:35 2014 New Revision: 1607863 URL: http://svn.apache.org/r1607863 Log: QPID-5877: [Java Broker] Potential for rejected messages to be resent out of order Work completed by Keith Wall kw...@apache.org and me. Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1607863r1=1607862r2=1607863view=diff == --- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original) +++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Fri Jul 4 14:19:35 2014 @@ -1823,7 +1823,7 @@ public abstract class AbstractQueueX ex lastSeen = context.getLastSeenEntry(); releasedNode = context.getReleasedEntry(); -node = (releasedNode != null lastSeen.compareTo(releasedNode)0) ? releasedNode : getEntries().next( +node = (releasedNode != null lastSeen.compareTo(releasedNode)=0) ? releasedNode : getEntries().next( lastSeen); } return node; - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1607882 - /qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Author: macbean Date: Fri Jul 4 15:51:28 2014 New Revision: 1607882 URL: http://svn.apache.org/r1607882 Log: QPID-5876: [Java Client] Highest delivery tag variable not reset after failover and causes rejections to be sent Work by Keith Wall kw...@apache.org and me. Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1607882r1=1607881r2=1607882view=diff == --- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original) +++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Fri Jul 4 15:51:28 2014 @@ -2271,6 +2271,7 @@ public abstract class AMQSessionC exten _failedOverDirty = true; } +_highestDeliveryTag.set(-1); _rollbackMark.set(-1); resubscribeProducers(); resubscribeConsumers(); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1605737 [3/3] - in /qpid/trunk/qpid/java: ./ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ bd
Copied:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java
(from r1605697,
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.javap1=qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.javar1=1605697r2=1605737rev=1605737view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java
Thu Jun 26 11:19:54 2014
@@ -1,5 +1,4 @@
/*
- *
* 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
@@ -16,15 +15,15 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.qpid.server.store;
-public class JsonFileConfigStoreConfigurationTest extends
AbstractDurableConfigurationStoreTestCase
+package org.apache.qpid.server.store.jdbc;
+
+import org.apache.qpid.server.store.Settings;
+
+public interface JDBCSettings extends Settings
{
-@Override
-protected DurableConfigurationStore createConfigStore() throws Exception
-{
-return new JsonFileConfigStore();
-}
+String getConnectionUrl();
+
+String getConnectionPoolType();
}
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java?rev=1605737r1=1605736r2=1605737view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
Thu Jun 26 11:19:54 2014
@@ -1,5 +1,4 @@
/*
- *
* 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
@@ -16,35 +15,24 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.qpid.server.virtualhost.jdbc;
-import java.util.Map;
+package org.apache.qpid.server.virtualhost.jdbc;
-import org.apache.qpid.server.model.ManagedObject;
-import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.jdbc.GenericJDBCMessageStore;
-import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory;
+import org.apache.qpid.server.store.jdbc.JDBCSettings;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-@ManagedObject(category = false, type = JDBCVirtualHost.VIRTUAL_HOST_TYPE)
-public class JDBCVirtualHost extends AbstractVirtualHostJDBCVirtualHost
+public interface JDBCVirtualHostX extends JDBCVirtualHostX extends
VirtualHostImplX, AMQQueue?, ExchangeImpl?,
+JDBCSettings
{
-public static final String VIRTUAL_HOST_TYPE = JDBC;
-
-@ManagedObjectFactoryConstructor
-public JDBCVirtualHost(final MapString, Object attributes,
- final VirtualHostNode? virtualHostNode)
-{
-super(attributes, virtualHostNode);
-}
+@ManagedAttribute(mandatory=true)
+String getConnectionUrl();
+@ManagedAttribute(defaultValue= DefaultConnectionProviderFactory.TYPE)
+String getConnectionPoolType();
-@Override
-protected MessageStore createMessageStore()
-{
-return new GenericJDBCMessageStore();
-}
}
Copied:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java
(from r1605697,
svn commit: r1605742 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/ broker-core/src/m
Author: macbean
Date: Thu Jun 26 11:31:39 2014
New Revision: 1605742
URL: http://svn.apache.org/r1605742
Log:
QPID-5821: Remove unused settings interface incorrectly committed
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1605742r1=1605741r2=1605742view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Thu Jun 26 11:31:39 2014
@@ -46,7 +46,7 @@ import org.apache.qpid.server.store.Conf
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreProvider;
-import org.apache.qpid.server.store.SizeMonitorSettings;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.berkeleydb.entry.HierarchyKey;
import org.apache.qpid.server.store.berkeleydb.tuple.ConfiguredObjectBinding;
@@ -507,7 +507,7 @@ public class BDBConfigurationStore imple
{
_parent = parent;
-final SizeMonitorSettings sizeMonitorSettings =
(SizeMonitorSettings) parent;
+final SizeMonitoringSettings sizeMonitorSettings =
(SizeMonitoringSettings) parent;
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1605742r1=1605741r2=1605742view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Thu Jun 26 11:31:39 2014
@@ -27,7 +27,7 @@ import com.sleepycat.je.DatabaseExceptio
import org.apache.log4j.Logger;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.SizeMonitorSettings;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.util.FileUtils;
@@ -67,7 +67,7 @@ public class BDBMessageStore extends Abs
{
_parent = parent;
-final SizeMonitorSettings sizeMonitorSettings =
(SizeMonitorSettings) parent;
+final SizeMonitoringSettings sizeMonitorSettings =
(SizeMonitoringSettings) parent;
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java?rev=1605742r1=1605741r2=1605742view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
Thu Jun 26 11:31:39 2014
@@ -24,10
svn commit: r1605787 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/plugin/ broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/ brok
Author: macbean
Date: Thu Jun 26 13:59:36 2014
New Revision: 1605787
URL: http://svn.apache.org/r1605787
Log:
QPID-5821: [Java Broker] Make JDBC username and password separate attributes
within the model
Work done by Keith Wall kw...@apache.org and me.
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java?rev=1605787r1=1605786r2=1605787view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
Thu Jun 26 13:59:36 2014
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.store.jdbc.ConnectionProvider;
@@ -34,28 +35,10 @@ public interface JDBCConnectionProviderF
{
String getType();
-ConnectionProvider getConnectionProvider(ConfiguredObject? parent,
String connectionUrl)
+ConnectionProvider getConnectionProvider(String connectionUrl, String
username, String password, MapString, String providerAttributes)
throws SQLException;
-static final class TYPES
-{
-private TYPES()
-{
-}
-
-public static CollectionString get()
-{
-QpidServiceLoaderJDBCConnectionProviderFactory qpidServiceLoader
= new QpidServiceLoaderJDBCConnectionProviderFactory();
-IterableJDBCConnectionProviderFactory factories =
qpidServiceLoader.atLeastOneInstanceOf(JDBCConnectionProviderFactory.class);
-ListString names = new ArrayListString();
-for(JDBCConnectionProviderFactory factory : factories)
-{
-names.add(factory.getType());
-}
-return Collections.unmodifiableCollection(names);
-}
-}
-
+SetString getProviderAttributeNames();
static final class FACTORIES
{
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.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/BoneCPConnectionProvider.java?rev=1605787r1=1605786r2=1605787view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
Thu Jun 26 13:59:36 2014
@@ -20,9 +20,12 @@
*/
package org.apache.qpid.server.store.jdbc.bonecp;
+import static
svn commit: r1605819 - /qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
Author: macbean
Date: Thu Jun 26 15:30:51 2014
New Revision: 1605819
URL: http://svn.apache.org/r1605819
Log:
NO-JIRA: [Java Tests] BDB tests - prevent sporadic test failure from quorum
override test.
Work by Keith Wall kw...@apache.org and myself.
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java?rev=1605819r1=1605818r2=1605819view=diff
==
---
qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
Thu Jun 26 15:30:51 2014
@@ -53,7 +53,7 @@ public class HAClusterBlackboxTest exten
private final HATestClusterCreator _clusterCreator = new
HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES);
-private FailoverAwaitingListener _failoverAwaitingListener;
+private FailoverAwaitingListener _failoverListener;
private ConnectionURL _brokerFailoverUrl;
@Override
@@ -71,7 +71,7 @@ public class HAClusterBlackboxTest exten
_brokerFailoverUrl =
_clusterCreator.getConnectionUrlForAllClusterNodes();
_clusterCreator.startCluster();
-_failoverAwaitingListener = new FailoverAwaitingListener();
+_failoverListener = new FailoverAwaitingListener();
super.setUp();
}
@@ -86,14 +86,14 @@ public class HAClusterBlackboxTest exten
{
final Connection connection = getConnection(_brokerFailoverUrl);
-
((AMQConnection)connection).setConnectionListener(_failoverAwaitingListener);
+((AMQConnection)connection).setConnectionListener(_failoverListener);
final int activeBrokerPort =
_clusterCreator.getBrokerPortNumberFromConnection(connection);
LOGGER.info(Active connection port + activeBrokerPort);
_clusterCreator.stopNode(activeBrokerPort);
LOGGER.info(Node is stopped);
-_failoverAwaitingListener.assertFailoverOccurs(2);
+_failoverListener.awaitFailoverCompletion(2);
LOGGER.info(Listener has finished);
// any op to ensure connection remains
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -105,7 +105,7 @@ public class HAClusterBlackboxTest exten
final Connection connection = getConnection(_brokerFailoverUrl);
LOGGER.info(Got connection to cluster);
-
((AMQConnection)connection).setConnectionListener(_failoverAwaitingListener);
+((AMQConnection)connection).setConnectionListener(_failoverListener);
final int activeBrokerPort =
_clusterCreator.getBrokerPortNumberFromConnection(connection);
LOGGER.info(Active connection port + activeBrokerPort);
final int inactiveBrokerPort =
_clusterCreator.getPortNumberOfAnInactiveBroker(connection);
@@ -114,7 +114,7 @@ public class HAClusterBlackboxTest exten
_clusterCreator.stopNode(inactiveBrokerPort);
-_failoverAwaitingListener.assertFailoverDoesNotOccur(2000);
+_failoverListener.assertNoFailoverCompletionWithin(2000);
// any op to ensure connection remains
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -124,7 +124,7 @@ public class HAClusterBlackboxTest exten
{
final Connection connection = getConnection(_brokerFailoverUrl);
-
((AMQConnection)connection).setConnectionListener(_failoverAwaitingListener);
+((AMQConnection)connection).setConnectionListener(_failoverListener);
final int activeBrokerPort =
_clusterCreator.getBrokerPortNumberFromConnection(connection);
LOGGER.info(Active connection port + activeBrokerPort);
@@ -133,14 +133,14 @@ public class HAClusterBlackboxTest exten
LOGGER.info(Update role attribute on inactive broker on port +
inactiveBrokerPort);
MapString, Object attributes =
_clusterCreator.getNodeAttributes(inactiveBrokerPort);
-assertEquals(Inactive broker has unexpeced role, REPLICA,
attributes.get(BDBHAVirtualHostNode.ROLE));
+assertEquals(Inactive broker has unexpected role, REPLICA,
attributes.get(BDBHAVirtualHostNode.ROLE));
_clusterCreator.setNodeAttributes(inactiveBrokerPort,
Collections.String, ObjectsingletonMap(BDBHAVirtualHostNode.ROLE, MASTER));
-_failoverAwaitingListener.assertFailoverOccurs(2);
+_failoverListener.awaitFailoverCompletion(2);
LOGGER.info(Listener has finished);
attributes = _clusterCreator.getNodeAttributes
svn commit: r1604793 - /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes
Author: macbean Date: Mon Jun 23 13:22:18 2014 New Revision: 1604793 URL: http://svn.apache.org/r1604793 Log: NO-JIRA: added test exludes for transient profiles where the tests assume VH state after restart Modified: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes Modified: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes?rev=1604793r1=1604792r2=1604793view=diff == --- qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes Mon Jun 23 13:22:18 2014 @@ -58,4 +58,7 @@ org.apache.qpid.systest.rest.VirtualHost org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode +org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover +org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutReconnected +org.apache.qpid.server.failover.FailoverMethodTest#testNoFailover - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1603786 - in /qpid/trunk/qpid/java/broker-core/src: main/java/org/apache/qpid/server/plugin/ main/java/org/apache/qpid/server/protocol/ test/java/org/apache/qpid/server/plugin/
Author: macbean
Date: Thu Jun 19 09:38:35 2014
New Revision: 1603786
URL: http://svn.apache.org/r1603786
Log:
QPID-5825: Broker tries to downgrade to the wrong amqp protocol version
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreatorComparator.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/plugin/
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapperTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/plugin/ProtocolEngineCreatorComparatorTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java?rev=1603786view=auto
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
(added)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
Thu Jun 19 09:38:35 2014
@@ -0,0 +1,131 @@
+package org.apache.qpid.server.plugin;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.qpid.server.model.Protocol;
+
+public class AMQPProtocolVersionWrapper
+{
+private static final char DELIMITER = '_';
+
+private int major;
+private int minor;
+private int patch;
+
+public AMQPProtocolVersionWrapper(Protocol amqpProtocol)
+{
+if (!amqpProtocol.isAMQP())
+{
+throw new IllegalArgumentException(Protocol must be of type +
Protocol.ProtocolType.AMQP);
+}
+
+final String[] parts = StringUtils.split(amqpProtocol.name(),
DELIMITER);
+for (int i = 0; i parts.length; i++)
+{
+switch (i)
+{
+case 1: this.major = Integer.parseInt(parts[i]);
+break;
+case 2: this.minor = Integer.parseInt(parts[i]);
+break;
+case 3: this.patch = Integer.parseInt(parts[i]);
+break;
+}
+}
+}
+
+public AMQPProtocolVersionWrapper(int major, int minor, int patch)
+{
+this.major = major;
+this.minor = minor;
+this.patch = patch;
+}
+
+public int getMajor()
+{
+return major;
+}
+
+public void setMajor(int major)
+{
+this.major = major;
+}
+
+public int getMinor()
+{
+return minor;
+}
+
+public void setMinor(int minor)
+{
+this.minor = minor;
+}
+
+public int getPatch()
+{
+return patch;
+}
+
+public void setPatch(int patch)
+{
+this.patch = patch;
+}
+
+public Protocol getProtocol()
+{
+return Protocol.valueOf(this.toString());
+}
+
+@Override
+public boolean equals(Object o)
+{
+if (this == o)
+{
+return true;
+}
+if (!(o instanceof AMQPProtocolVersionWrapper))
+{
+return false;
+}
+
+final AMQPProtocolVersionWrapper number = (AMQPProtocolVersionWrapper)
o;
+
+if (this.major != number.major)
+{
+return false;
+}
+else if (this.minor != number.minor)
+{
+return false;
+}
+else if (this.patch != number.patch)
+{
+return false;
+}
+else
+{
+return true;
+}
+}
+
+@Override
+public int hashCode()
+{
+int result = major;
+result = 31 * result + minor;
+result = 31 * result + patch;
+return result;
+}
+
+@Override
+public String toString()
+{
+final StringBuilder sb = new
StringBuilder(Protocol.ProtocolType.AMQP.name()).append(DELIMITER)
+ .append(major).append(DELIMITER)
+ .append(minor);
+if (patch != 0)
+{
+sb.append(DELIMITER).append(patch);
+}
+return sb.toString();
+}
+}
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreatorComparator.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreatorComparator.java?rev=1603786view=auto
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org
svn commit: r1603791 - /qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Author: macbean
Date: Thu Jun 19 09:42:45 2014
New Revision: 1603791
URL: http://svn.apache.org/r1603791
Log:
QPID-5831: Unexpected internal exception when closing JE Replicated environment
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1603791r1=1603790r2=1603791view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Thu Jun 19 09:42:45 2014
@@ -782,8 +782,28 @@ public class ReplicatedEnvironmentFacade
}
finally
{
-_environment.close();
-_environment = null;
+// Try closing the environment but swallow
EnvironmentFailureException
+// if the environment becomes invalid while closing.
+// This can be caused by potential race between facade close and
DatabasePinger open.
+try
+{
+_environment.close();
+}
+catch (EnvironmentFailureException efe)
+{
+if (!_environment.isValid())
+{
+LOGGER.debug(Environment became invalid on close, so
ignore, efe);
+}
+else
+{
+throw efe;
+}
+}
+finally
+{
+_environment = null;
+}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1601631 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
Author: macbean
Date: Tue Jun 10 13:28:24 2014
New Revision: 1601631
URL: http://svn.apache.org/r1601631
Log:
QPID-5811: logging to assist investigation of test failure
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1601631r1=1601630r2=1601631view=diff
==
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
Tue Jun 10 13:28:24 2014
@@ -29,6 +29,8 @@ import org.apache.qpid.jms.ConnectionLis
import org.apache.qpid.jms.FailoverPolicy;
import org.apache.qpid.test.utils.FailoverBaseCase;
import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -61,6 +63,8 @@ import java.util.concurrent.atomic.Atomi
*/
public class FailoverBehaviourTest extends FailoverBaseCase implements
ConnectionListener, ExceptionListener
{
+protected static final Logger _LOGGER =
LoggerFactory.getLogger(FailoverBehaviourTest.class);
+
private static final String TEST_MESSAGE_FORMAT = test message {0};
/** Indicates whether tests are run against clustered broker */
@@ -1092,6 +1096,7 @@ public class FailoverBehaviourTest exten
String text = MessageFormat.format(messagePattern, i);
Message message = producerSession.createTextMessage(text);
producer.send(message);
+_LOGGER.debug(Test message number + i + produced with text =
+ text + , and JMSMessageID = + message.getJMSMessageID());
}
if(standaloneProducer)
@@ -1132,7 +1137,7 @@ public class FailoverBehaviourTest exten
* @param messageIndex
*message index
*/
-private void assertReceivedMessage(Message receivedMessage, String
messagePattern, int messageIndex)
+private void assertReceivedMessage(Message receivedMessage, String
messagePattern, int messageIndex) throws JMSException
{
assertNotNull(Expected message [ + messageIndex + ] is not
received!, receivedMessage);
assertTrue(Failure to receive message [ + messageIndex + ],
expected TextMessage but received
@@ -1147,6 +1152,7 @@ public class FailoverBehaviourTest exten
{
fail(JMSException occured while getting message text: +
e.getMessage());
}
+_LOGGER.debug(Test message number + messageIndex + consumed with
text = + receivedText + , and JMSMessageID = +
receivedMessage.getJMSMessageID());
assertEquals(Failover is broken! Expected [ + expectedText + ] but
got [ + receivedText + ],
expectedText, receivedText);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
