svn commit: r1631712 - /qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Author: rgodfrey
Date: Tue Oct 14 10:33:50 2014
New Revision: 1631712
URL: http://svn.apache.org/r1631712
Log:
QPID-6088 : only reset the credit window if the credit window has been expanded
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1631712r1=1631711r2=1631712view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Tue Oct 14 10:33:50 2014
@@ -32,6 +32,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.Destination;
@@ -98,6 +99,7 @@ public class AMQSession_0_8 extends AMQS
/** Flow control */
private FlowControlIndicator _flowControl = new FlowControlIndicator();
+private final AtomicBoolean _creditChanged = new AtomicBoolean();
/**
* Creates a new session on a connection.
@@ -858,6 +860,7 @@ public class AMQSession_0_8 extends AMQS
getProtocolHandler().syncWrite(basicQosBody.generateFrame(getChannelId()),
BasicQosOkBody.class);
+_creditChanged.set(true);
return true;
}
else
@@ -874,7 +877,7 @@ public class AMQSession_0_8 extends AMQS
int acknowledgeMode = getAcknowledgeMode();
boolean manageCredit = acknowledgeMode ==
javax.jms.Session.CLIENT_ACKNOWLEDGE || acknowledgeMode ==
javax.jms.Session.SESSION_TRANSACTED;
-if(manageCredit)
+if(manageCredit _creditChanged.compareAndSet(true,false))
{
new FailoverNoopSupport(
new FailoverProtectedOperationVoid, AMQException()
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631725 - in /qpid/site: docs/components/dispatch-router/index.html input/components/dispatch-router/index.md
Author: tross Date: Tue Oct 14 11:52:49 2014 New Revision: 1631725 URL: http://svn.apache.org/r1631725 Log: DISPATCH-71 - Typo fix in website Modified: qpid/site/docs/components/dispatch-router/index.html qpid/site/input/components/dispatch-router/index.md Modified: qpid/site/docs/components/dispatch-router/index.html URL: http://svn.apache.org/viewvc/qpid/site/docs/components/dispatch-router/index.html?rev=1631725r1=1631724r2=1631725view=diff == --- qpid/site/docs/components/dispatch-router/index.html (original) +++ qpid/site/docs/components/dispatch-router/index.html Tue Oct 14 11:52:49 2014 @@ -179,7 +179,7 @@ find previous versions with our div class=two-column ul -lia href=/releases/qpid-dispatch-0.2/book/index.htmlDocmentation/a/li +lia href=/releases/qpid-dispatch-0.2/book/index.htmlDocumentation/a/li lia href=/releases/qpid-dispatch-0.2/book/amqp-mapping.htmlUsage of AMQP/a/li /ul Modified: qpid/site/input/components/dispatch-router/index.md URL: http://svn.apache.org/viewvc/qpid/site/input/components/dispatch-router/index.md?rev=1631725r1=1631724r2=1631725view=diff == --- qpid/site/input/components/dispatch-router/index.md (original) +++ qpid/site/input/components/dispatch-router/index.md Tue Oct 14 11:52:49 2014 @@ -76,7 +76,7 @@ find previous versions with our div class=two-column markdown=1 - - [Docmentation](@current-dispatch-release-url@/book/index.html) + - [Documentation](@current-dispatch-release-url@/book/index.html) - [Usage of AMQP](@current-dispatch-release-url@/book/amqp-mapping.html) /div - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631732 - in /qpid/trunk/qpid/java: broker-core/src/main/java/org/apache/qpid/server/ broker-core/src/main/java/org/apache/qpid/server/logging/messages/ broker-core/src/main/java/org/apac
Author: orudyy
Date: Tue Oct 14 12:37:36 2014
New Revision: 1631732
URL: http://svn.apache.org/r1631732
Log:
QPID-6142: Fix NPE thrown on startup when broker fails to start due to CO
validation exceptions
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerShutdownProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1631732r1=1631731r2=1631732view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Tue Oct 14 12:37:36 2014
@@ -58,6 +58,17 @@ public class Broker implements BrokerShu
private EventLogger _eventLogger;
private boolean _configuringOwnLogging = false;
private final TaskExecutor _taskExecutor = new TaskExecutorImpl();
+private final boolean _exitJVMOnShutdownWithNonZeroExitCode;
+
+public Broker()
+{
+this(false);
+}
+
+public Broker(boolean exitJVMOnShutdownWithNonZeroExitCode)
+{
+this._exitJVMOnShutdownWithNonZeroExitCode =
exitJVMOnShutdownWithNonZeroExitCode;
+}
protected static class InitException extends RuntimeException
{
@@ -71,6 +82,12 @@ public class Broker implements BrokerShu
public void shutdown()
{
+shutdown(0);
+}
+
+@Override
+public void shutdown(int exitStatusCode)
+{
try
{
removeShutdownHook();
@@ -92,6 +109,11 @@ public class Broker implements BrokerShu
{
LogManager.shutdown();
}
+
+if (_exitJVMOnShutdownWithNonZeroExitCode exitStatusCode !=
0)
+{
+System.exit(exitStatusCode);
+}
}
}
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1631732r1=1631731r2=1631732view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
Tue Oct 14 12:37:36 2014
@@ -57,6 +57,7 @@ public class BrokerMessages
public static final String SHUTTING_DOWN_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + broker.shutting_down;
public static final String MANAGEMENT_MODE_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + broker.management_mode;
public static final String STARTUP_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + broker.startup;
+public static final String FATAL_ERROR_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + broker.fatal_error;
public static final String READY_LOG_HIERARCHY =
DEFAULT_LOG_HIERARCHY_PREFIX + broker.ready;
static
@@ -75,6 +76,7 @@ public class BrokerMessages
Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
Logger.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY);
Logger.getLogger(STARTUP_LOG_HIERARCHY);
+Logger.getLogger(FATAL_ERROR_LOG_HIERARCHY);
Logger.getLogger(READY_LOG_HIERARCHY);
_messages =
ResourceBundle.getBundle(org.apache.qpid.server.logging.messages.Broker_logmessages,
_currentLocale);
@@ -493,6 +495,38 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
+ * preBRK-1016 : Fatal error : {0} : See log file for more
information/pre
+ * Optional values are contained in [square brackets] and are numbered
+ * sequentially in the method call.
+ *
+ */
+public static LogMessage FATAL_ERROR(String param1)
+{
+String rawMessage = _messages.getString(FATAL_ERROR);
+
+final Object[] messageArguments = {param1};
+
svn commit: r1631733 - /qpid/proton/trunk/proton-c/bindings/python/proton.py
Author: rhs Date: Tue Oct 14 12:38:48 2014 New Revision: 1631733 URL: http://svn.apache.org/r1631733 Log: made Handler extend object Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1631733r1=1631732r2=1631733view=diff == --- qpid/proton/trunk/proton-c/bindings/python/proton.py (original) +++ qpid/proton/trunk/proton-c/bindings/python/proton.py Tue Oct 14 12:38:48 2014 @@ -3501,7 +3501,7 @@ class Event: def __repr__(self): return %s(%s) % (self.type, self.context) -class Handler: +class Handler(object): def on_unhandled(self, event): pass - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631746 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Author: kwall
Date: Tue Oct 14 13:21:38 2014
New Revision: 1631746
URL: http://svn.apache.org/r1631746
Log:
QPID-6151: [Java Broker Web Management Console] Fix race condition affecting
the display of preference provider attributes
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1631746r1=1631745r2=1631746view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Tue Oct 14 13:21:38 2014
@@ -139,6 +139,7 @@ define([dojo/_base/xhr,
this.editPreferencesProviderButton =
query(.editPreferencesProviderButton, node)[0];
this.deletePreferencesProviderButton =
query(.deletePreferencesProviderButton, node)[0];
this.preferencesProviderAttributes =
dom.byId(preferencesProviderAttributes)
+ this.preferencesNode = query(.preferencesProviderDetails,
node)[0];
this.query = api/latest/authenticationprovider/ +
encodeURIComponent(authProviderObj.name);
@@ -171,7 +172,7 @@ define([dojo/_base/xhr,
else
{
var preferencesProviderData =
that.authProviderData.preferencesproviders?
that.authProviderData.preferencesproviders[0]: null;
- that.preferencesNode =
query(.preferencesProviderDetails, node)[0];
+
that.updatePreferencesProvider(preferencesProviderData);
}
});
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631772 [3/3] - in /qpid/proton/branches/examples: examples/engine/ examples/engine/java/ examples/engine/java/src/ examples/engine/java/src/main/ examples/engine/java/src/main/java/ exam
Modified: qpid/proton/branches/examples/tutorial/proton_events.py
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/proton_events.py?rev=1631772r1=1631771r2=1631772view=diff
==
--- qpid/proton/branches/examples/tutorial/proton_events.py (original)
+++ qpid/proton/branches/examples/tutorial/proton_events.py Tue Oct 14 14:35:39
2014
@@ -18,44 +18,9 @@
#
import heapq, os, Queue, re, socket, time, types
from proton import Collector, Connection, Delivery, Endpoint, Event, Timeout
-from proton import Message, ProtonException, Transport, TransportException,
ConnectionException
+from proton import Message, Handler, ProtonException, Transport,
TransportException, ConnectionException
from select import select
-class EventDispatcher(object):
-
-methods = {
-Event.CONNECTION_INIT: on_connection_init,
-Event.CONNECTION_OPEN: on_connection_local_open,
-Event.CONNECTION_REMOTE_OPEN: on_connection_open,
-Event.CONNECTION_CLOSE: on_connection_local_close,
-Event.CONNECTION_REMOTE_CLOSE: on_connection_close,
-Event.CONNECTION_FINAL: on_connection_final,
-
-Event.SESSION_INIT: on_session_init,
-Event.SESSION_OPEN: on_session_open,
-Event.SESSION_REMOTE_OPEN: on_session_open,
-Event.SESSION_CLOSE: on_session_local_close,
-Event.SESSION_REMOTE_CLOSE: on_session_close,
-Event.SESSION_FINAL: on_session_final,
-
-Event.LINK_INIT: on_link_init,
-Event.LINK_OPEN: on_link_local_open,
-Event.LINK_REMOTE_OPEN: on_link_open,
-Event.LINK_CLOSE: on_link_local_close,
-Event.LINK_REMOTE_CLOSE: on_link_close,
-Event.LINK_FLOW: on_link_flow,
-Event.LINK_FINAL: on_link_final,
-
-Event.TRANSPORT: on_transport,
-Event.DELIVERY: on_delivery
-}
-
-def dispatch(self, event):
-getattr(self, self.methods.get(event.type, on_%s % str(event.type)),
self.unhandled)(event)
-
-def unhandled(self, event):
-pass
-
class AmqpConnection(object):
def __init__(self, conn, sock, events):
@@ -270,7 +235,7 @@ class Events(object):
def dispatch(self, event):
for d in self.dispatchers:
-d.dispatch(event)
+event.dispatch(d)
@property
def next_interval(self):
@@ -280,9 +245,14 @@ class Events(object):
def empty(self):
return self.collector.peek() == None
+class ExtendedEventType(object):
+def __init__(self, name):
+self.name = name
+self.method = on_%s % name
+
class ApplicationEvent(Event):
-def __init__(self, type, connection=None, session=None, link=None,
delivery=None, subject=None):
-self.type = type
+def __init__(self, typename, connection=None, session=None, link=None,
delivery=None, subject=None):
+self.type = ExtendedEventType(typename)
self.subject = subject
if delivery:
self.context = delivery
@@ -302,7 +272,7 @@ class ApplicationEvent(Event):
def __repr__(self):
objects = [self.context, self.subject]
-return %s(%s) % (self.type,
+return %s(%s) % (self.type.name,
, .join([str(o) for o in objects if o is not
None]))
class ScheduledEvents(Events):
@@ -399,41 +369,41 @@ class SelectLoop(object):
return False
-class Handshaker(EventDispatcher):
+class Handshaker(Handler):
-def on_connection_open(self, event):
+def on_connection_remote_open(self, event):
conn = event.connection
if conn.state Endpoint.LOCAL_UNINIT:
conn.open()
-def on_session_open(self, event):
+def on_session_remote_open(self, event):
ssn = event.session
if ssn.state Endpoint.LOCAL_UNINIT:
ssn.open()
-def on_link_open(self, event):
+def on_link_remote_open(self, event):
link = event.link
if link.state Endpoint.LOCAL_UNINIT:
link.source.copy(link.remote_source)
link.target.copy(link.remote_target)
link.open()
-def on_connection_close(self, event):
+def on_connection_remote_close(self, event):
conn = event.connection
if not (conn.state Endpoint.LOCAL_CLOSED):
conn.close()
-def on_session_close(self, event):
+def on_session_remote_close(self, event):
ssn = event.session
if not (ssn.state Endpoint.LOCAL_CLOSED):
ssn.close()
-def on_link_close(self, event):
+def on_link_remote_close(self, event):
link = event.link
if not (link.state Endpoint.LOCAL_CLOSED):
link.close()
-class FlowController(EventDispatcher):
+class FlowController(Handler):
def __init__(self, window=1):
self.window = window
@@ -446,7 +416,7 @@ class FlowController(EventDispatcher):
if
svn commit: r1631772 [2/3] - in /qpid/proton/branches/examples: examples/engine/ examples/engine/java/ examples/engine/java/src/ examples/engine/java/src/main/ examples/engine/java/src/main/java/ exam
Modified:
qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Binary.java
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Binary.java?rev=1631772r1=1631771r2=1631772view=diff
==
---
qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Binary.java
(original)
+++
qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Binary.java
Tue Oct 14 14:35:39 2014
@@ -1,189 +1,189 @@
-/*
- *
- * 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.proton.amqp;
-
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-import static java.lang.Math.min;
-
-public final class Binary
-{
-
-private final byte[] _data;
-private final int _offset;
-private final int _length;
-private int _hashCode;
-
-public Binary(final byte[] data)
-{
-this(data, 0, data.length);
-}
-
-public Binary(final byte[] data, final int offset, final int length)
-{
-_data = data;
-_offset = offset;
-_length = length;
-}
-
-public ByteBuffer asByteBuffer()
-{
-return ByteBuffer.wrap(_data, _offset, _length);
-}
-
-@Override
-public final int hashCode()
-{
-int hc = _hashCode;
-if(hc == 0)
-{
-for (int i = 0; i _length; i++)
-{
-hc = 31*hc + (0xFF _data[_offset + i]);
-}
-_hashCode = hc;
-}
-return hc;
-}
-
-@Override
-public final boolean equals(Object o)
-{
-if (this == o)
-{
-return true;
-}
-
-if (o == null || getClass() != o.getClass())
-{
-return false;
-}
-
-Binary buf = (Binary) o;
-final int size = _length;
-if (size != buf._length)
-{
-return false;
-}
-
-final byte[] myData = _data;
-final byte[] theirData = buf._data;
-int myOffset = _offset;
-int theirOffset = buf._offset;
-final int myLimit = myOffset + size;
-
-while(myOffset myLimit)
-{
-if (myData[myOffset++] != theirData[theirOffset++])
-{
-return false;
-}
-}
-
-return true;
-}
-
-
-public int getArrayOffset()
-{
-return _offset;
-}
-
-public byte[] getArray()
-{
-return _data;
-}
-
-public int getLength()
-{
-return _length;
-}
-
-public String toString()
-{
-StringBuilder str = new StringBuilder();
-
-
-for (int i = 0; i _length; i++)
-{
-byte c = _data[_offset + i];
-
-if (c 31 c 127 c != '\\')
-{
-str.append((char)c);
-}
-else
-{
-str.append(String.format(\\x%02x, c));
-}
-}
-
-return str.toString();
-
-}
-
-public static Binary combine(final CollectionBinary binaries)
-{
-
-if(binaries.size() == 1)
-{
-return binaries.iterator().next();
-}
-
-int size = 0;
-for(Binary binary : binaries)
-{
-size += binary.getLength();
-}
-byte[] data = new byte[size];
-int offset = 0;
-for(Binary binary : binaries)
-{
-System.arraycopy(binary._data, binary._offset, data, offset,
binary._length);
-offset += binary._length;
-}
-return new Binary(data);
-}
-
-public Binary subBinary(final int offset, final int length)
-{
-return new Binary(_data, _offset+offset, length);
-}
-
-public static Binary create(ByteBuffer buffer)
-{
-if( buffer == null )
-return null;
-if( buffer.isDirect() || buffer.isReadOnly() )
-{
-byte data[] = new byte [buffer.remaining()];
-ByteBuffer dup = buffer.duplicate();
-dup.get(data);
-return
svn commit: r1631772 [1/3] - in /qpid/proton/branches/examples: examples/engine/ examples/engine/java/ examples/engine/java/src/ examples/engine/java/src/main/ examples/engine/java/src/main/java/ exam
Author: gsim Date: Tue Oct 14 14:35:39 2014 New Revision: 1631772 URL: http://svn.apache.org/r1631772 Log: Merged in changes from trunk and updated examples accordingly. Added: qpid/proton/branches/examples/examples/engine/ qpid/proton/branches/examples/examples/engine/java/ qpid/proton/branches/examples/examples/engine/java/LICENSE qpid/proton/branches/examples/examples/engine/java/drain (with props) qpid/proton/branches/examples/examples/engine/java/pom.xml qpid/proton/branches/examples/examples/engine/java/server (with props) qpid/proton/branches/examples/examples/engine/java/spout (with props) qpid/proton/branches/examples/examples/engine/java/src/ qpid/proton/branches/examples/examples/engine/java/src/main/ qpid/proton/branches/examples/examples/engine/java/src/main/java/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/ qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Drain.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Driver.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/FlowController.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Handshaker.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Message.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Pool.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Router.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Server.java qpid/proton/branches/examples/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Spout.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/BaseHandler.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/Handler.java qpid/proton/branches/examples/tools/cmake/Modules/ProtonFindPerl.cmake - copied, changed from r1630895, qpid/proton/branches/examples/tools/cmake/Modules/FindPerlLibs.cmake Removed: qpid/proton/branches/examples/tools/cmake/Modules/FindPerlLibs.cmake Modified: qpid/proton/branches/examples/proton-c/bindings/CMakeLists.txt qpid/proton/branches/examples/proton-c/bindings/python/proton.py qpid/proton/branches/examples/proton-c/include/proton/event.h qpid/proton/branches/examples/proton-c/src/engine/engine.c qpid/proton/branches/examples/proton-c/src/events/event.c qpid/proton/branches/examples/proton-c/src/messenger/messenger.c qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Binary.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/Symbol.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java qpid/proton/branches/examples/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java qpid/proton/branches/examples/proton-j/src/main/resources/cengine.py qpid/proton/branches/examples/tests/python/proton_tests/engine.py qpid/proton/branches/examples/tutorial/client.py qpid/proton/branches/examples/tutorial/client_http.py qpid/proton/branches/examples/tutorial/db_recv.py qpid/proton/branches/examples/tutorial/db_send.py qpid/proton/branches/examples/tutorial/helloworld.py qpid/proton/branches/examples/tutorial/helloworld_alt.py qpid/proton/branches/examples/tutorial/helloworld_direct.py qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py
svn commit: r1631794 - in /qpid/proton/trunk/contrib/proton-jms/src: main/java/org/apache/qpid/proton/jms/ test/java/org/apache/qpid/proton/jms/
Author: robbie
Date: Tue Oct 14 15:33:34 2014
New Revision: 1631794
URL: http://svn.apache.org/r1631794
Log:
PROTON-711: add support (disabled by default) for using a byte value for
destination type annotations during outbound transformation
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AutoOutboundTransformer.java
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSVendor.java
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/OutboundTransformer.java
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AutoOutboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AutoOutboundTransformer.java?rev=1631794r1=1631793r2=1631794view=diff
==
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AutoOutboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AutoOutboundTransformer.java
Tue Oct 14 15:33:34 2014
@@ -46,4 +46,10 @@ public class AutoOutboundTransformer ext
}
}
+@Override
+public void setUseByteDestinationTypeAnnotations(boolean
useByteDestinationTypeAnnotations)
+{
+
super.setUseByteDestinationTypeAnnotations(useByteDestinationTypeAnnotations);
+
transformer.setUseByteDestinationTypeAnnotations(useByteDestinationTypeAnnotations);
+}
}
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java?rev=1631794r1=1631793r2=1631794view=diff
==
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
Tue Oct 14 15:33:34 2014
@@ -224,21 +224,39 @@ public class JMSMappingOutboundTransform
return (ProtonJMessage)
org.apache.qpid.proton.message.Message.Factory.create(header, da, ma, props,
ap, body, footer);
}
-private static String destinationAttributes(Destination destination) {
-if( destination instanceof Queue ) {
-if( destination instanceof TemporaryQueue ) {
-return temporary,queue;
-} else {
-return queue;
+private Object destinationAttributes(Destination destination) {
+if(isUseByteDestinationTypeAnnotations()) {
+if( destination instanceof Queue ) {
+if( destination instanceof TemporaryQueue ) {
+return JMSVendor.TEMP_QUEUE_TYPE;
+} else {
+return JMSVendor.QUEUE_TYPE;
+}
}
-}
-if( destination instanceof Topic ) {
-if( destination instanceof TemporaryTopic ) {
-return temporary,topic;
-} else {
-return topic;
+if( destination instanceof Topic ) {
+if( destination instanceof TemporaryTopic ) {
+return JMSVendor.TEMP_TOPIC_TYPE;
+} else {
+return JMSVendor.TOPIC_TYPE;
+}
+}
+return JMSVendor.QUEUE_TYPE;
+} else {
+if( destination instanceof Queue ) {
+if( destination instanceof TemporaryQueue ) {
+return temporary,queue;
+} else {
+return queue;
+}
+}
+if( destination instanceof Topic ) {
+if( destination instanceof TemporaryTopic ) {
+return temporary,topic;
+} else {
+return topic;
+}
}
+return ;
}
-return ;
}
}
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSVendor.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSVendor.java?rev=1631794r1=1631793r2=1631794view=diff
==
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSVendor.java
(original)
+++
svn commit: r1631793 - in /qpid/proton/trunk/contrib/proton-jms/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/qpid/ java/org/apache/qpid/proton/ java/org/apache/qpid/proton/jms/
Author: robbie
Date: Tue Oct 14 15:33:15 2014
New Revision: 1631793
URL: http://svn.apache.org/r1631793
Log:
PROTON-711: add tests for the existing destination type annotation processing
done by the transformers
Added:
qpid/proton/trunk/contrib/proton-jms/src/test/
qpid/proton/trunk/contrib/proton-jms/src/test/java/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
Added:
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java?rev=1631793view=auto
==
---
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java
(added)
+++
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java
Tue Oct 14 15:33:15 2014
@@ -0,0 +1,214 @@
+/*
+ * 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.proton.jms;
+
+import static org.junit.Assert.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.Destination;
+import javax.jms.Queue;
+import javax.jms.TemporaryQueue;
+import javax.jms.TemporaryTopic;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
+import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.message.Message;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class JMSMappingInboundTransformerTest
+{
+@Test
+public void testTransformMessageWithAmqpValueStringCreatesTextMessage()
throws Exception
+{
+TextMessage mockTextMessage = createMockTextMessage();
+JMSVendor mockVendor = createMockVendor(mockTextMessage);
+JMSMappingInboundTransformer transformer = new
JMSMappingInboundTransformer(mockVendor);
+
+String contentString = myTextMessageContent;
+Message amqp = Message.Factory.create();
+amqp.setBody(new AmqpValue(contentString));
+
+EncodedMessage em = encodeMessage(amqp);
+
+javax.jms.Message jmsMessage = transformer.transform(em);
+
+assertTrue(Expected TextMessage, jmsMessage instanceof TextMessage);
+Mockito.verify(mockTextMessage).setText(contentString);
+assertSame(Expected provided mock message, got a different one,
mockTextMessage, jmsMessage);
+}
+
+// === JMSDestination Handling =
+// =
+
+@Test
+public void testTransformWithNoToTypeDestinationTypeAnnotation() throws
Exception
+{
+doTransformWithToTypeDestinationTypeAnnotationTestImpl(null,
Destination.class);
+}
+
+@Test
+public void testTransformWithQueueStringToTypeDestinationTypeAnnotation()
throws Exception
+{
+doTransformWithToTypeDestinationTypeAnnotationTestImpl(queue,
Queue.class);
+}
+
+@Test
+public void
testTransformWithTemporaryQueueStringToTypeDestinationTypeAnnotation() throws
Exception
+{
+
doTransformWithToTypeDestinationTypeAnnotationTestImpl(queue,temporary,
TemporaryQueue.class);
+}
+
+@Test
+public void testTransformWithTopicStringToTypeDestinationTypeAnnotation()
throws Exception
+{
+doTransformWithToTypeDestinationTypeAnnotationTestImpl(topic,
Topic.class);
+}
+
+@Test
+public void
testTransformWithTemporaryTopicStringToTypeDestinationTypeAnnotation()
svn commit: r1631795 - in /qpid/proton/trunk/contrib/proton-jms/src: main/java/org/apache/qpid/proton/jms/InboundTransformer.java test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.
Author: robbie
Date: Tue Oct 14 15:33:50 2014
New Revision: 1631795
URL: http://svn.apache.org/r1631795
Log:
PROTON-711: add support (disabled by default) for using a byte value for
destination type annotations during inbound transformation
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformerTest.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java?rev=1631795r1=1631794r2=1631795view=diff
==
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
Tue Oct 14 15:33:50 2014
@@ -53,12 +53,22 @@ public abstract class InboundTransformer
int defaultPriority = javax.jms.Message.DEFAULT_PRIORITY;
long defaultTtl = javax.jms.Message.DEFAULT_TIME_TO_LIVE;
+private boolean useByteDestinationTypeAnnotations = false;
+
public InboundTransformer(JMSVendor vendor) {
this.vendor = vendor;
}
abstract public Message transform(EncodedMessage amqpMessage) throws
Exception;
+public boolean isUseByteDestinationTypeAnnotations() {
+return useByteDestinationTypeAnnotations;
+}
+
+public void setUseByteDestinationTypeAnnotations(boolean
useByteDestinationTypeAnnotations) {
+this.useByteDestinationTypeAnnotations =
useByteDestinationTypeAnnotations;
+}
+
public int getDefaultDeliveryMode() {
return defaultDeliveryMode;
}
@@ -130,8 +140,16 @@ public abstract class InboundTransformer
}
}
-Class? extends Destination toAttributes = Destination.class;
-Class? extends Destination replyToAttributes = Destination.class;
+Class? extends Destination toAttributes = null;
+Class? extends Destination replyToAttributes = null;
+
+if (isUseByteDestinationTypeAnnotations()){
+toAttributes = Queue.class;
+replyToAttributes = Queue.class;
+} else {
+toAttributes = Destination.class;
+replyToAttributes = Destination.class;
+}
final MessageAnnotations ma = amqp.getMessageAnnotations();
if( ma!=null ) {
@@ -140,9 +158,9 @@ public abstract class InboundTransformer
if( x-opt-jms-type.equals(key.toString())
entry.getValue() != null ) {
jms.setJMSType(entry.getValue().toString());
} else if( x-opt-to-type.equals(key.toString()) ) {
-toAttributes =
toClassFromAttributes(entry.getValue().toString());
+toAttributes = toClassFromAttributes(entry.getValue());
} else if( x-opt-reply-type.equals(key.toString()) ) {
-replyToAttributes =
toClassFromAttributes(entry.getValue().toString());
+replyToAttributes =
toClassFromAttributes(entry.getValue());
} else {
setProperty(jms, prefixVendor + prefixMessageAnnotations +
key, entry.getValue());
}
@@ -246,29 +264,49 @@ public abstract class InboundTransformer
return Collections.unmodifiableSet(s);
}
-Class? extends Destination toClassFromAttributes(String value)
+Class? extends Destination toClassFromAttributes(Object value)
{
-if( value ==null ) {
-return null;
-}
-HashSetString attributes = new HashSetString();
-for( String x: value.split(\\s*,\\s*) ) {
-attributes.add(x);
-}
+if(isUseByteDestinationTypeAnnotations()) {
+if(value instanceof Byte) {
+switch ((Byte) value) {
+case JMSVendor.QUEUE_TYPE:
+return Queue.class;
+case JMSVendor.TOPIC_TYPE:
+return Topic.class;
+case JMSVendor.TEMP_QUEUE_TYPE:
+return TemporaryQueue.class;
+case JMSVendor.TEMP_TOPIC_TYPE:
+return TemporaryTopic.class;
+default:
+return Queue.class;
+}
+}
-if( QUEUE_ATTRIBUTES.equals(attributes) ) {
return Queue.class;
+} else {
+if( value == null ) {
+return null;
+}
+String valueString = value.toString();
+HashSetString attributes = new HashSetString();
+for( String x: valueString.split(\\s*,\\s*) ) {
svn commit: r1631810 - in /qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/AMQConnection.java common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
Author: kwall
Date: Tue Oct 14 16:13:20 2014
New Revision: 1631810
URL: http://svn.apache.org/r1631810
Log:
QPID-6152: [Java Client] Allow connection/session close time to be overridden
by system property.
Change implementation so that the timeout is applied individually to each
session close, the connection and
the shutdown of the task pool. Also moved the shutdown of the task pool to a
finally, so that it occurs
even if one or more sessions fail to close.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1631810r1=1631809r2=1631810view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
Tue Oct 14 16:13:20 2014
@@ -81,7 +81,8 @@ public class AMQConnection extends Close
private static final Logger _logger =
LoggerFactory.getLogger(AMQConnection.class);
private static final AtomicLong CONN_NUMBER_GENERATOR = new AtomicLong();
-private static final long DEFAULT_CLOSE_TIMEOUT = 2000l;
+private static final long DEFAULT_CLOSE_TIMEOUT =
Long.getLong(ClientProperties.QPID_CLOSE_TIMEOUT,
+
ClientProperties.DEFAULT_CLOSE_TIMEOUT);
private final long _connectionNumber;
@@ -880,44 +881,19 @@ public class AMQConnection extends Close
{
try
{
-long startCloseTime = System.currentTimeMillis();
-
- closeAllSessions(null, timeout, startCloseTime);
-
-//This MUST occur after we have successfully closed
all Channels/Sessions
-_taskPool.shutdown();
-
-if (!_taskPool.isTerminated())
+try
{
-try
-{
-// adjust timeout
-long taskPoolTimeout = adjustTimeout(timeout,
startCloseTime);
-
-_taskPool.awaitTermination(taskPoolTimeout,
TimeUnit.MILLISECONDS);
-}
-catch (InterruptedException e)
-{
-_logger.info(Interrupted while shutting down
connection thread pool.);
-}
+closeAllSessions(null, timeout);
}
-
-// adjust timeout
-timeout = adjustTimeout(timeout, startCloseTime);
-//If the taskpool hasn't shutdown by now then give it
shutdownNow.
-// This will interupt any running tasks.
-if (!_taskPool.isTerminated())
+finally
{
-ListRunnable tasks = _taskPool.shutdownNow();
-for (Runnable r : tasks)
-{
-_logger.warn(Connection close forced taskpool
to prevent execution: + r);
-}
+//This MUST occur after we have successfully
closed all Channels/Sessions
+shutdownTaskPool(timeout);
}
}
catch (JMSException e)
{
-_logger.error(error:, e);
+_logger.error(Error closing connection, e);
JMSException jmse = new JMSException(Error closing
connection: + e);
jmse.setLinkedException(e);
jmse.initCause(e);
@@ -939,16 +915,32 @@ public class AMQConnection extends Close
}
}
-private long adjustTimeout(long timeout, long startTime)
+private void shutdownTaskPool(final long timeout)
{
-long now = System.currentTimeMillis();
-timeout -= now - startTime;
-if (timeout 0)
+_taskPool.shutdown();
+
+if (!_taskPool.isTerminated())
{
-timeout = 0;
+try
+{
+_taskPool.awaitTermination(timeout, TimeUnit.MILLISECONDS);
+}
+catch (InterruptedException e)
+{
+_logger.info(Interrupted while shutting down connection
thread pool.);
+}
}
-
svn commit: r1631819 - /qpid/trunk/qpid/tools/setup.py
Author: mcpierce Date: Tue Oct 14 17:08:53 2014 New Revision: 1631819 URL: http://svn.apache.org/r1631819 Log: QPID-6150: Add __init__.py to setup.py for linear store. The file was not being included in the source tarball. Modified: qpid/trunk/qpid/tools/setup.py Modified: qpid/trunk/qpid/tools/setup.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/setup.py?rev=1631819r1=1631818r2=1631819view=diff == --- qpid/trunk/qpid/tools/setup.py (original) +++ qpid/trunk/qpid/tools/setup.py Tue Oct 14 17:08:53 2014 @@ -49,7 +49,8 @@ setup(name=qpid-tools, src/py/qmf-tool], data_files=[(libexec, [src/py/qpid-qls-analyze]), (share/qpid-tools/python/qlslibs, - [src/py/qlslibs/anal.py, + [src/py/qlslibs/__init__.py, +src/py/qlslibs/anal.py, src/py/qlslibs/efp.py, src/py/qlslibs/err.py, src/py/qlslibs/jrnl.py, - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631830 - in /qpid/trunk/qpid/doc/book/src/java-broker: ./ concepts/ images/ management/channels/ management/managing/
Author: kwall
Date: Tue Oct 14 17:41:50 2014
New Revision: 1631830
URL: http://svn.apache.org/r1631830
Log:
QPID-6108: [Java Broker Documentation] Address some comments from Andrew Macbean
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png
qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-ContextVar.png
qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml
qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml
qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml?rev=1631830r1=1631829r2=1631830view=diff
==
---
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
(original)
+++
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
Tue Oct 14 17:41:50 2014
@@ -55,9 +55,14 @@
example
titlePerforming store backup by using
classnameBDBBackup/classname class
directly/title
-command java -cp qpid-bdbstore-qpidCurrentRelease;.jar
- org.apache.qpid.server.store.berkeleydb.BDBBackup -fromdir
- ${QPID_WORK}/lt;nodenamegt;/config -todir
path/to/backup/folder/command
+cmdsynopsis
+ commandjava/command
+ arg choice=plain-cp qpid-bdbstore-qpidCurrentRelease;.jar/arg
+ arg
choice=plainorg.apache.qpid.server.store.berkeleydb.BDBBackup/arg
+ sbr/
+ arg choice=plain-fromdir
replaceable${QPID_WORK}/lt;nodenamegt;/config/replaceable/arg
+ arg choice=plain-todir
replaceablepath/to/backup/folder/replaceable/arg
+/cmdsynopsis
/example
paraIn the example above BDBBackup utility is called from
qpid-bdbstore-qpidCurrentRelease;.jar to backup the store at
@@ -67,12 +72,15 @@
running this script in a similar way./para
example
titlePerforming store backup by using
classnamebackup.sh/classname bash script/title
-commandbackup.sh -fromdir ${QPID_WORK}/lt;nodenamegt;/config -todir
- path/to/backup/folder/command
+cmdsynopsis
+ commandbackup.sh/command
+ arg choice=plain-fromdir
replaceable${QPID_WORK}/lt;nodenamegt;/config/replaceable/arg
+ arg choice=plain-todir
replaceablepath/to/backup/folder/replaceable/arg
+/cmdsynopsis
/example
/section
section id=Java-Broker-Backup-And-Recovery-Virtualhost-Node-BDB-HA
- titleBDB/title
+ titleBDB-HA/title
paraSee xref
linkend=Java-Broker-Backup-And-Recovery-Virtualhost-Node-BDB//para
/section
section id=Java-Broker-Backup-And-Recovery-Virtualhost-Node-Derby
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml?rev=1631830r1=1631829r2=1631830view=diff
==
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
(original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
Tue Oct 14 17:41:50 2014
@@ -116,8 +116,8 @@
/listitem
listitem
paraSelect one Broker instance to host the first node instance.
This choice is an
-arbitrary one. The node is special only whilst creating group.
Once creation is complete,
-all nodes will be considered equal./para
+arbitrary one. The node is special only whilst creating group.
Once creation is
+complete, all nodes will be considered equal./para
/listitem
listitem
para
@@ -198,12 +198,13 @@
contact it and introduce itself into the group. At this
stage, the group will have
two nodes, with the second node in the replica role./para
/listitem
- listitemRepeat these steps until you have added all the nodes
to the
-group./listitem
+ listitem
+paraRepeat these steps until you have added all the nodes to
the group./para
+ /listitem
/orderedlist
para
svn commit: r1631911 - /qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
Author: robbie
Date: Tue Oct 14 22:21:26 2014
New Revision: 1631911
URL: http://svn.apache.org/r1631911
Log:
PROTON-711: fix test compilation under Java6
Modified:
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java?rev=1631911r1=1631910r2=1631911view=diff
==
---
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/test/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformerTest.java
Tue Oct 14 22:21:26 2014
@@ -337,7 +337,7 @@ public class JMSMappingOutboundTransform
private TextMessage createMockTextMessage() throws Exception
{
TextMessage mockTextMessage = Mockito.mock(TextMessage.class);
-
Mockito.when(mockTextMessage.getPropertyNames()).thenReturn(Collections.emptyEnumeration());
+
Mockito.when(mockTextMessage.getPropertyNames()).thenReturn(Collections.enumeration(Collections.emptySet()));
return mockTextMessage;
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
git commit: Start work on testing and improving the JMS transformation utility which handles conversions of foreign messages and destinations.
Repository: qpid-jms
Updated Branches:
refs/heads/master e3039f140 - a0f228bad
Start work on testing and improving the JMS transformation utility which
handles conversions of foreign messages and destinations.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a0f228ba
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a0f228ba
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a0f228ba
Branch: refs/heads/master
Commit: a0f228bad6a1c3117ab66c25a1d425db1c7e213f
Parents: e3039f1
Author: Timothy Bish tabish...@gmail.com
Authored: Tue Oct 14 18:46:13 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Tue Oct 14 18:46:13 2014 -0400
--
.../jms/message/JmsMessageTransformation.java | 17 +-
.../message/JmsMessageTransformationTest.java | 216 +++
2 files changed, 229 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a0f228ba/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
index 404cabd..c160cc8 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
@@ -45,9 +45,6 @@ import org.apache.qpid.jms.JmsTopic;
*/
public final class JmsMessageTransformation {
-private JmsMessageTransformation() {
-}
-
/**
* Creates a an available JMS message from another provider.
*
@@ -63,9 +60,19 @@ public final class JmsMessageTransformation {
JmsDestination result = null;
if (destination != null) {
+
if (destination instanceof JmsDestination) {
return (JmsDestination) destination;
-
+} else if (destination instanceof Queue destination instanceof
Topic) {
+String queueName = ((Queue) destination).getQueueName();
+String topicName = ((Topic) destination).getTopicName();
+if (queueName != null topicName == null) {
+return new JmsQueue(queueName);
+} else if (queueName == null topicName != null) {
+return new JmsTopic(topicName);
+} else {
+throw new JMSException(Could not transform destination:
+ destination);
+}
} else {
if (destination instanceof TemporaryQueue) {
result = new JmsTemporaryQueue(((TemporaryQueue)
destination).getQueueName());
@@ -75,6 +82,8 @@ public final class JmsMessageTransformation {
result = new JmsQueue(((Queue)
destination).getQueueName());
} else if (destination instanceof Topic) {
result = new JmsTopic(((Topic)
destination).getTopicName());
+} else {
+throw new JMSException(Could not transform destination:
+ destination);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a0f228ba/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
new file mode 100644
index 000..3904439
--- /dev/null
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
@@ -0,0 +1,216 @@
+/**
+ * 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.jms.message;
+
+import static org.junit.Assert.assertEquals;
+import static
