[1/3] qpid-jms git commit: remove some stale dependencyManagement entries
Repository: qpid-jms
Updated Branches:
refs/heads/master fa4dd26ec - 8b368bc73
remove some stale dependencyManagement entries
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/fb7dc643
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/fb7dc643
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/fb7dc643
Branch: refs/heads/master
Commit: fb7dc6430e05674048d2ca5a650987e28a0545c3
Parents: fa4dd26
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 12:00:30 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 12:00:30 2015 +
--
pom.xml | 11 ---
1 file changed, 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fb7dc643/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f04f804..b5fec48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
jetty-version8.1.16.v20140903/jetty-version
mockito-version1.10.19/mockito-version
hamcrest-version1.3/hamcrest-version
-xalan-version2.7.2/xalan-version
netty-version4.0.17.Final/netty-version
!-- Maven Plugin Version for this Project --
@@ -113,11 +112,6 @@
/dependency
dependency
groupIdorg.apache.qpid/groupId
-artifactIdqpid-jms-selector/artifactId
-version${project.version}/version
- /dependency
- dependency
-groupIdorg.apache.qpid/groupId
artifactIdproton-j/artifactId
version${proton-version}/version
/dependency
@@ -159,11 +153,6 @@
artifactIdslf4j-log4j12/artifactId
version${slf4j-version}/version
/dependency
- dependency
-groupIdxalan/groupId
-artifactIdxalan/artifactId
-version${xalan-version}/version
- /dependency
/dependencies
/dependencyManagement
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[2/3] qpid-jms git commit: group dependencyManagement entries in parent pom according to usage
group dependencyManagement entries in parent pom according to usage
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e4321f69
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e4321f69
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e4321f69
Branch: refs/heads/master
Commit: e4321f69cc1ca5d0ae422eb9920fcace0f523306
Parents: fb7dc64
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 12:24:03 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 12:25:40 2015 +
--
pom.xml | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4321f69/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b5fec48..cd41126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
hamcrest-version1.3/hamcrest-version
netty-version4.0.17.Final/netty-version
-!-- Maven Plugin Version for this Project --
+!-- Maven Plugin Versions for this Project --
maven-javacc-plugin-version2.6/maven-javacc-plugin-version
maven-surefire-plugin-version2.16/maven-surefire-plugin-version
maven-assembly-plugin-version2.4/maven-assembly-plugin-version
@@ -97,9 +97,7 @@
dependencyManagement
dependencies
- !-- === --
- !-- Internal QpidJMS Dependencies --
- !-- === --
+ !-- Internal module dependencies --
dependency
groupIdorg.apache.qpid/groupId
artifactIdqpid-jms-client/artifactId
@@ -110,6 +108,7 @@
artifactIdqpid-jms-discovery/artifactId
version${project.version}/version
/dependency
+ !-- Required dependencies --
dependency
groupIdorg.apache.qpid/groupId
artifactIdproton-j/artifactId
@@ -126,6 +125,18 @@
version${netty-version}/version
/dependency
dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+version${slf4j-version}/version
+ /dependency
+ !-- Logging impl dependency, e.g for the tests or examples --
+ dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-log4j12/artifactId
+version${slf4j-version}/version
+ /dependency
+ !-- Test dependencies --
+ dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
version${junit-version}/version
@@ -143,16 +154,6 @@
version${hamcrest-version}/version
scopetest/scope
/dependency
- dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-api/artifactId
-version${slf4j-version}/version
- /dependency
- dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-log4j12/artifactId
-version${slf4j-version}/version
- /dependency
/dependencies
/dependencyManagement
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[3/3] qpid-jms git commit: add some additional config for the release plugin
add some additional config for the release plugin
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8b368bc7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8b368bc7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8b368bc7
Branch: refs/heads/master
Commit: 8b368bc7362f9589b1bdbf38e5d12de351e42e8c
Parents: e4321f6
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 12:42:48 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 12:42:48 2015 +
--
pom.xml | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8b368bc7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cd41126..6cd0131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,13 @@
version${maven-compiler-plugin-version}/version
/plugin
plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-release-plugin/artifactId
+ configuration
+autoVersionSubmodulestrue/autoVersionSubmodules
+ /configuration
+/plugin
+plugin
groupIdorg.codehaus.mojo/groupId
artifactIdjavacc-maven-plugin/artifactId
version${maven-javacc-plugin-version}/version
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[2/3] qpid-jms git commit: add the generated selector parse, make the generation an optional step via a profile which generates in-place
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d1f0b32b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
new file mode 100644
index 000..1b2c2cb
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
@@ -0,0 +1,488 @@
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version
5.0 */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/**
+ * 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.selector.parser;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (without unicode processing).
+ */
+
+public class SimpleCharStream
+{
+/** Whether parser is static. */
+ public static final boolean staticFlag = false;
+ int bufsize;
+ int available;
+ int tokenBegin;
+/** Position in buffer. */
+ public int bufpos = -1;
+ protected int bufline[];
+ protected int bufcolumn[];
+
+ protected int column = 0;
+ protected int line = 1;
+
+ protected boolean prevCharIsCR = false;
+ protected boolean prevCharIsLF = false;
+
+ protected java.io.Reader inputStream;
+
+ protected char[] buffer;
+ protected int maxNextCharInd = 0;
+ protected int inBuf = 0;
+ protected int tabSize = 8;
+
+ protected void setTabSize(int i) { tabSize = i; }
+ protected int getTabSize(int i) { return tabSize; }
+
+
+ protected void ExpandBuff(boolean wrapAround)
+ {
+char[] newbuffer = new char[bufsize + 2048];
+int newbufline[] = new int[bufsize + 2048];
+int newbufcolumn[] = new int[bufsize + 2048];
+
+try
+{
+ if (wrapAround)
+ {
+System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize -
tokenBegin);
+System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+buffer = newbuffer;
+
+System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize -
tokenBegin);
+System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+bufline = newbufline;
+
+System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize -
tokenBegin);
+System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin,
bufpos);
+bufcolumn = newbufcolumn;
+
+maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+ }
+ else
+ {
+System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize -
tokenBegin);
+buffer = newbuffer;
+
+System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize -
tokenBegin);
+bufline = newbufline;
+
+System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize -
tokenBegin);
+bufcolumn = newbufcolumn;
+
+maxNextCharInd = (bufpos -= tokenBegin);
+ }
+}
+catch (Throwable t)
+{
+ throw new Error(t.getMessage());
+}
+
+
+bufsize += 2048;
+available = bufsize;
+tokenBegin = 0;
+ }
+
+ protected void FillBuff() throws java.io.IOException
+ {
+if (maxNextCharInd == available)
+{
+ if (available == bufsize)
+ {
+if (tokenBegin 2048)
+{
+ bufpos = maxNextCharInd = 0;
+ available = tokenBegin;
+}
+else if (tokenBegin 0)
+ bufpos = maxNextCharInd = 0;
+else
+ ExpandBuff(false);
+ }
+ else if (available tokenBegin)
+available = bufsize;
+ else if ((tokenBegin - available) 2048)
+ExpandBuff(true);
+ else
+available = tokenBegin;
+}
+
+int i;
+try {
+ if ((i = inputStream.read(buffer, maxNextCharInd, available -
maxNextCharInd)) == -1)
+ {
+inputStream.close();
+throw new java.io.IOException();
+ }
+ else
+
[1/3] qpid-jms git commit: rename+repackage the generated selector parser
Repository: qpid-jms
Updated Branches:
refs/heads/master 8b368bc73 - d1f0b32ba
rename+repackage the generated selector parser
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/ca69a07c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/ca69a07c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/ca69a07c
Branch: refs/heads/master
Commit: ca69a07cd9455c47d477370031b94adeb0af20e1
Parents: 8b368bc
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 14:16:50 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 14:16:50 2015 +
--
.../qpid/jms/selector/SelectorParser.java | 4 +-
.../src/main/javacc/SelectorParserImpl.jj | 566 +++
qpid-jms-client/src/main/javacc/StrictParser.jj | 566 ---
3 files changed, 568 insertions(+), 568 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ca69a07c/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
index 28b96d9..87e74b2 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
@@ -20,7 +20,7 @@ import java.io.StringReader;
import org.apache.qpid.jms.selector.filter.BooleanExpression;
import org.apache.qpid.jms.selector.filter.FilterException;
-import org.apache.qpid.jms.selector.strict.StrictParser;
+import org.apache.qpid.jms.selector.parser.SelectorParserImpl;
public class SelectorParser {
@@ -35,7 +35,7 @@ public class SelectorParser {
} else {
try {
BooleanExpression e = null;
-StrictParser parser = new StrictParser(new StringReader(sql));
+SelectorParserImpl parser = new SelectorParserImpl(new
StringReader(sql));
e = parser.JmsSelector();
cache.put(sql, e);
return e;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ca69a07c/qpid-jms-client/src/main/javacc/SelectorParserImpl.jj
--
diff --git a/qpid-jms-client/src/main/javacc/SelectorParserImpl.jj
b/qpid-jms-client/src/main/javacc/SelectorParserImpl.jj
new file mode 100755
index 000..c60b7ee
--- /dev/null
+++ b/qpid-jms-client/src/main/javacc/SelectorParserImpl.jj
@@ -0,0 +1,566 @@
+/**
+ * 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.
+ */
+
+//
+// OPTIONS
+//
+options {
+ STATIC = false;
+ UNICODE_INPUT = true;
+ // some performance optimizations
+ ERROR_REPORTING = false;
+}
+
+//
+// PARSER
+//
+
+PARSER_BEGIN(SelectorParserImpl)
+/**
+ * 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
svn commit: r1663719 [1/2] - in /qpid/branches/QPID-6262-JavaBrokerNIO: ./ qpid/ qpid/cpp/ qpid/cpp/CMakeModules/ qpid/cpp/include/qpid/types/ qpid/cpp/src/ qpid/cpp/src/qpid/ qpid/cpp/src/qpid/amqp/
Author: kwall Date: Tue Mar 3 14:58:01 2015 New Revision: 1663719 URL: http://svn.apache.org/r1663719 Log: merge from trunk Added: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake - copied unchanged from r1663687, qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/Transaction.cpp - copied unchanged from r1663687, qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transaction.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/Transaction.h - copied unchanged from r1663687, qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transaction.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/sys/aix/ - copied from r1663687, qpid/trunk/qpid/cpp/src/qpid/sys/aix/ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/tests/interop_tests.py - copied unchanged from r1663687, qpid/trunk/qpid/cpp/src/tests/interop_tests.py qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tests/src/py/qpid_tests/broker_1_0/tx.py - copied unchanged from r1663687, qpid/trunk/qpid/tests/src/py/qpid_tests/broker_1_0/tx.py Removed: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake Modified: qpid/branches/QPID-6262-JavaBrokerNIO/ (props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/ (props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/CMakeLists.txt qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/include/qpid/types/Variant.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/ (props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/CMakeLists.txt (contents, props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/amqp.cmake qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/config.h.cmake qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/legacystore.cmake qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/linearstore.cmake qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/Options.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/Url.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/CharSequence.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/Descriptor.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/Descriptor.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/Encoder.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/Encoder.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/amqp/descriptors.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/ (props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/Queue.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Connection.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Exception.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Session.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/broker/amqp/Session.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/client/ConnectionHandler.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/types/Variant.cpp qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/types/encodings.h qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/tests/ (props changed) qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/tests/BrokerFixture.h
svn commit: r1663719 [2/2] - in /qpid/branches/QPID-6262-JavaBrokerNIO: ./ qpid/ qpid/cpp/ qpid/cpp/CMakeModules/ qpid/cpp/include/qpid/types/ qpid/cpp/src/ qpid/cpp/src/qpid/ qpid/cpp/src/qpid/amqp/
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp?rev=1663719r1=1663718r2=1663719view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp
Tue Mar 3 14:58:01 2015
@@ -20,34 +20,53 @@
*/
#include PnData.h
#include qpid/types/encodings.h
+#include qpid/log/Statement.h
namespace qpid {
namespace messaging {
namespace amqp {
using types::Variant;
+using namespace types::encodings;
-void PnData::write(const Variant::Map map)
+// TODO aconway 2014-11-20: PnData duplicates functionality of
qpid::amqp::Encoder,Decoder.
+// Collapse them all into a single proton-based codec.
+
+void PnData::put(const Variant::Map map)
{
pn_data_put_map(data);
pn_data_enter(data);
for (Variant::Map::const_iterator i = map.begin(); i != map.end(); ++i) {
-pn_data_put_string(data, str(i-first));
-write(i-second);
+pn_data_put_string(data, bytes(i-first));
+put(i-second);
}
pn_data_exit(data);
}
-void PnData::write(const Variant::List list)
+
+void PnData::put(const Variant::List list)
{
pn_data_put_list(data);
pn_data_enter(data);
for (Variant::List::const_iterator i = list.begin(); i != list.end(); ++i)
{
-write(*i);
+put(*i);
}
pn_data_exit(data);
}
-void PnData::write(const Variant value)
+
+void PnData::put(const Variant value)
{
+// Open data descriptors associated with the value.
+const Variant::List descriptors = value.getDescriptors();
+for (Variant::List::const_iterator i = descriptors.begin(); i !=
descriptors.end(); ++i) {
+pn_data_put_described(data);
+pn_data_enter(data);
+if (i-getType() == types::VAR_STRING)
+pn_data_put_symbol(data, bytes(i-asString()));
+else
+pn_data_put_ulong(data, i-asUint64());
+}
+
+// Put the variant value
switch (value.getType()) {
case qpid::types::VAR_VOID:
pn_data_put_null(data);
@@ -65,61 +84,70 @@ void PnData::write(const Variant value)
pn_data_put_double(data, value.asDouble());
break;
case qpid::types::VAR_STRING:
-pn_data_put_string(data, str(value.asString()));
+if (value.getEncoding() == ASCII)
+pn_data_put_symbol(data, bytes(value.asString()));
+else if (value.getEncoding() == BINARY)
+pn_data_put_binary(data, bytes(value.asString()));
+else
+pn_data_put_string(data, bytes(value.asString()));
break;
case qpid::types::VAR_MAP:
-write(value.asMap());
+put(value.asMap());
break;
case qpid::types::VAR_LIST:
-write(value.asList());
+put(value.asList());
break;
default:
break;
}
+
+// Close any descriptors.
+for (Variant::List::const_iterator i = descriptors.begin(); i !=
descriptors.end(); ++i)
+pn_data_exit(data);
}
-bool PnData::read(qpid::types::Variant value)
+bool PnData::get(qpid::types::Variant value)
{
-return read(pn_data_type(data), value);
+return get(pn_data_type(data), value);
}
-void PnData::readList(qpid::types::Variant::List value)
+void PnData::getList(qpid::types::Variant::List value)
{
size_t count = pn_data_get_list(data);
pn_data_enter(data);
for (size_t i = 0; i count pn_data_next(data); ++i) {
qpid::types::Variant e;
-if (read(e)) value.push_back(e);
+if (get(e)) value.push_back(e);
}
pn_data_exit(data);
}
-void PnData::readMap(qpid::types::Variant::Map value)
+void PnData::getMap(qpid::types::Variant::Map value)
{
size_t count = pn_data_get_list(data);
pn_data_enter(data);
for (size_t i = 0; i (count/2) pn_data_next(data); ++i) {
-std::string key = str(pn_data_get_symbol(data));
+std::string key = string(pn_data_get_symbol(data));
pn_data_next(data);
qpid::types::Variant e;
-if (read(e)) value[key]= e;
+if (get(e)) value[key]= e;
}
pn_data_exit(data);
}
-void PnData::readArray(qpid::types::Variant::List value)
+void PnData::getArray(qpid::types::Variant::List value)
{
size_t count = pn_data_get_array(data);
pn_type_t type = pn_data_get_array_type(data);
pn_data_enter(data);
for (size_t i = 0; i count pn_data_next(data); ++i) {
qpid::types::Variant e;
-if (read(type, e)) value.push_back(e);
+if (get(type, e)) value.push_back(e);
}
pn_data_exit(data);
}
-bool PnData::read(pn_type_t type, qpid::types::Variant value)
+bool PnData::get(pn_type_t type, qpid::types::Variant
[3/3] qpid-jms git commit: add the generated selector parse, make the generation an optional step via a profile which generates in-place
add the generated selector parse, make the generation an optional step via a
profile which generates in-place
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d1f0b32b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d1f0b32b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d1f0b32b
Branch: refs/heads/master
Commit: d1f0b32ba63033641796da37021510a6cef1a312
Parents: ca69a07
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 14:54:06 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 14:54:06 2015 +
--
qpid-jms-client/pom.xml | 96 +-
.../jms/selector/parser/ParseException.java | 204 +++
.../jms/selector/parser/SelectorParserImpl.java | 1193 ++
.../parser/SelectorParserImplConstants.java | 121 ++
.../parser/SelectorParserImplTokenManager.java | 1055
.../jms/selector/parser/SimpleCharStream.java | 488 +++
.../apache/qpid/jms/selector/parser/Token.java | 148 +++
.../qpid/jms/selector/parser/TokenMgrError.java | 164 +++
.../src/main/javacc/SelectorParserImpl.jj |1 +
9 files changed, 3400 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d1f0b32b/qpid-jms-client/pom.xml
--
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 39e2c39..fc1a45e 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -90,76 +90,6 @@
/includes
/resource
/resources
-plugins
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdjavacc-maven-plugin/artifactId
-executions
- execution
-phasegenerate-sources/phase
-configuration
- sourceDirectory${basedir}/src/main/javacc/sourceDirectory
-
outputDirectory${basedir}/target/generated-sources/javacc/outputDirectory
-/configuration
-goals
- goaljavacc/goal
-/goals
- /execution
-/executions
- /plugin
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdbuild-helper-maven-plugin/artifactId
-executions
- execution
-idadd-source/id
-phasegenerate-sources/phase
-goals
- goaladd-source/goal
-/goals
-configuration
- sources
-source${basedir}/target/generated-sources/javacc/source
- /sources
-/configuration
- /execution
-/executions
- /plugin
-/plugins
-pluginManagement
- plugins
-!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence
- on the Maven build itself. --
-plugin
- groupIdorg.eclipse.m2e/groupId
- artifactIdlifecycle-mapping/artifactId
- version1.0.0/version
- configuration
-lifecycleMappingMetadata
- pluginExecutions
-pluginExecution
- pluginExecutionFilter
-groupIdorg.codehaus.mojo/groupId
-artifactId
- javacc-maven-plugin
-/artifactId
-versionRange[2.6,)/versionRange
-goals
- goaljavacc/goal
-/goals
- /pluginExecutionFilter
- action
-execute
- runOnIncrementaltrue/runOnIncremental
-/execute
- /action
-/pluginExecution
- /pluginExecutions
-/lifecycleMappingMetadata
- /configuration
-/plugin
- /plugins
-/pluginManagement
/build
reporting
@@ -176,4 +106,30 @@
/plugins
/reporting
+ profiles
+profile
+ idgenerate-selector-parser/id
+ build
+plugins
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdjavacc-maven-plugin/artifactId
+executions
+ execution
+idgenerate-selector-parser/id
+phasegenerate-sources/phase
+goals
+ goaljavacc/goal
+/goals
+configuration
+ sourceDirectory${basedir}/src/main/javacc/sourceDirectory
+
outputDirectory${basedir}/src/main/java/org/apache/qpid/jms/selector/parser/outputDirectory
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
+ /profiles
/project
svn commit: r1663573 - in /qpid/trunk/qpid/java/broker-core/src: main/java/org/apache/qpid/server/binding/ main/java/org/apache/qpid/server/configuration/store/ main/java/org/apache/qpid/server/exchan
Author: rgodfrey
Date: Tue Mar 3 09:30:49 2015
New Revision: 1663573
URL: http://svn.apache.org/r1663573
Log:
QPID-6428 : [Java Broker] Use StoreConfigurationChangeListener to manage
storage of all configured objects
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1663573r1=1663572r2=1663573view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
Tue Mar 3 09:30:49 2015
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.binding;
-import java.security.AccessControlException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -45,10 +44,8 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.util.StateChangeListener;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class BindingImpl
extends AbstractConfiguredObjectBindingImpl
@@ -108,26 +105,6 @@ public class BindingImpl
}
}
-@Override
-protected void onCreate()
-{
-super.onCreate();
-try
-{
-
_queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this);
-}
-catch(AccessControlException e)
-{
-deleted();
-throw e;
-}
-if (isDurable())
-{
-
_queue.getVirtualHost().getDurableConfigurationStore().create(asObjectRecord());
-}
-
-}
-
private static MapString, Object enhanceWithDurable(MapString, Object
attributes,
final AMQQueue queue,
final ExchangeImpl
exchange)
@@ -263,12 +240,6 @@ public class BindingImpl
{
_arguments = arguments;
BindingImpl.super.setAttribute(ARGUMENTS,
getActualAttributes().get(ARGUMENTS), arguments);
-if (isDurable())
-{
-VirtualHostImpl?, ?, ? vhost =
-(VirtualHostImpl?, ?, ?)
_exchange.getParent(VirtualHost.class);
-vhost.getDurableConfigurationStore().update(true,
asObjectRecord());
-}
}
}
);
@@ -278,6 +249,8 @@ public class BindingImpl
@Override
public void validateOnCreate()
{
+
_queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this);
+
AMQQueue queue = getAMQQueue();
MapString, Object arguments = getArguments();
if (arguments!=null !arguments.isEmpty()
FilterSupport.argumentsContainFilter(arguments))
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java?rev=1663573r1=1663572r2=1663573view=diff
==
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
(original)
+++
svn commit: r1663733 - /qpid/branches/QPID-6262-JavaBrokerNIO/
Author: kwall Date: Tue Mar 3 16:25:55 2015 New Revision: 1663733 URL: http://svn.apache.org/r1663733 Log: merge from trunk Modified: qpid/branches/QPID-6262-JavaBrokerNIO/ (props changed) Propchange: qpid/branches/QPID-6262-JavaBrokerNIO/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 16:25:55 2015 @@ -3,4 +3,4 @@ /qpid/branches/java-broker-bdb-ha2:1576683-1583556 /qpid/branches/java-network-refactor:805429-825319 /qpid/branches/mcpierce-QPID-4719:1477004-1477093 -/qpid/trunk:1643238-1663687 +/qpid/trunk:1643238-1663731 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-jms git commit: Ensure that pending requests also fail when connection is lost otherwise they can hang. Added some tests that showed this intermittently happening.
Repository: qpid-jms
Updated Branches:
refs/heads/master d1f0b32ba - f29381d98
Ensure that pending requests also fail when connection is lost otherwise
they can hang. Added some tests that showed this intermittently
happening.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f29381d9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f29381d9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f29381d9
Branch: refs/heads/master
Commit: f29381d9869865ff0a5c4e0f1fd4ece61196f604
Parents: d1f0b32
Author: Timothy Bish tabish...@gmail.com
Authored: Tue Mar 3 11:00:54 2015 -0500
Committer: Timothy Bish tabish...@gmail.com
Committed: Tue Mar 3 11:01:36 2015 -0500
--
.../qpid/jms/provider/amqp/AmqpProvider.java| 35 ++---
.../org/apache/qpid/jms/JmsConnectionTest.java | 27
.../jms/consumer/JmsMessageConsumerTest.java| 136 +++
.../apache/qpid/jms/session/JmsSessionTest.java | 33 +
.../qpid/jms/support/AmqpTestSupport.java | 14 ++
5 files changed, 229 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f29381d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 0face7b..71e00d3 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -48,6 +48,7 @@ import org.apache.qpid.jms.meta.JmsSessionId;
import org.apache.qpid.jms.meta.JmsSessionInfo;
import org.apache.qpid.jms.meta.JmsTransactionInfo;
import org.apache.qpid.jms.provider.AsyncResult;
+import org.apache.qpid.jms.provider.NoOpAsyncResult;
import org.apache.qpid.jms.provider.Provider;
import org.apache.qpid.jms.provider.ProviderClosedException;
import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
@@ -92,6 +93,7 @@ public class AmqpProvider implements Provider,
TransportListener {
// brokers that don't currently handle the unsigned range well.
private static final int DEFAULT_CHANNEL_MAX = 32767;
private static final AtomicInteger PROVIDER_SEQUENCE = new AtomicInteger();
+private static final NoOpAsyncResult NOOP_REQUEST = new NoOpAsyncResult();
private ProviderListener listener;
private AmqpConnection connection;
@@ -177,7 +179,7 @@ public class AmqpProvider implements Provider,
TransportListener {
if (connection != null) {
connection.close(request);
-pumpToProtonTransport();
+pumpToProtonTransport(request);
} else {
request.onSuccess();
}
@@ -294,7 +296,7 @@ public class AmqpProvider implements Provider,
TransportListener {
}
});
-pumpToProtonTransport();
+pumpToProtonTransport(request);
} catch (Exception error) {
request.onFailure(error);
}
@@ -321,7 +323,7 @@ public class AmqpProvider implements Provider,
TransportListener {
}
});
-pumpToProtonTransport();
+pumpToProtonTransport(request);
} catch (Exception error) {
request.onFailure(error);
}
@@ -348,7 +350,7 @@ public class AmqpProvider implements Provider,
TransportListener {
}
});
-pumpToProtonTransport();
+pumpToProtonTransport(request);
} catch (Exception error) {
request.onFailure(error);
}
@@ -404,7 +406,7 @@ public class AmqpProvider implements Provider,
TransportListener {
}
});
-pumpToProtonTransport();
+pumpToProtonTransport(request);
} catch (Exception error) {
request.onFailure(error);
}
@@ -433,7 +435,7 @@ public class AmqpProvider implements Provider,
TransportListener {
}
boolean couldSend = producer.send(envelope, request);
-pumpToProtonTransport();
+pumpToProtonTransport(request);
if (couldSend envelope.isSendAsync()) {
svn commit: r1663731 - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: broker-core/src/main/java/org/apache/qpid/server/model/ broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/serve
Author: kwall
Date: Tue Mar 3 16:20:07 2015
New Revision: 1663731
URL: http://svn.apache.org/r1663731
Log:
Bug fix: Prevent NPE possibility if closing an object takes too long.
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1663731r1=1663730r2=1663731view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Tue Mar 3 16:20:07 2015
@@ -2035,9 +2035,9 @@ public abstract class AbstractConfigured
}
remaining = startTime + timeout -
System.currentTimeMillis();
-if(remaining 0)
+if(remaining = 0)
{
-throw new TimeoutException(Completion did not occur
within given tiemout: + timeout);
+throw new TimeoutException(Completion did not occur
within given timeout: + timeout);
}
}
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1663731r1=1663730r2=1663731view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Tue Mar 3 16:20:07 2015
@@ -1277,7 +1277,8 @@ public class AMQChannel
// stop all subscriptions
_rollingBack = true;
-boolean requiresSuspend = _suspended.compareAndSet(false,true);
+boolean requiresSuspend = _suspended.compareAndSet(false,true); //
TODO This is probably superfluous owing to the
+// message assignment suspended logic in NBC.
// ensure all subscriptions have seen the change to the channel state
for(ConsumerTarget_0_8 sub : _tag2SubscriptionTargetMap.values())
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[2/2] qpid-proton git commit: PROTON-831: minor tweak to accomodate older python; patch from Irina Boverman.
PROTON-831: minor tweak to accomodate older python; patch from Irina Boverman. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8ea52ddd Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8ea52ddd Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8ea52ddd Branch: refs/heads/master Commit: 8ea52ddd32e340eb4d1125e30bc3b1208527f17a Parents: fca40c5 Author: Gordon Sim g...@redhat.com Authored: Tue Mar 3 13:45:40 2015 + Committer: Gordon Sim g...@redhat.com Committed: Tue Mar 3 13:46:36 2015 + -- proton-c/bindings/python/proton/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ea52ddd/proton-c/bindings/python/proton/__init__.py -- diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py index ac2c15e..c200e9c 100644 --- a/proton-c/bindings/python/proton/__init__.py +++ b/proton-c/bindings/python/proton/__init__.py @@ -2855,7 +2855,7 @@ class Sender(Link): yield str(count) count += 1 self.tag_generator = simple_tags() -return next(self.tag_generator) +return self.tag_generator.next() class Receiver(Link): - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[1/2] qpid-proton git commit: NO-JIRA: Fix a couple of example scenarios in line with recent change to sync_client.py
Repository: qpid-proton Updated Branches: refs/heads/master 89b0f3e16 - 8ea52ddd3 NO-JIRA: Fix a couple of example scenarios in line with recent change to sync_client.py Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/fca40c5e Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/fca40c5e Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/fca40c5e Branch: refs/heads/master Commit: fca40c5ed01a0be88ae54b9b66faa999d6f5615d Parents: 89b0f3e Author: Gordon Sim g...@redhat.com Authored: Tue Mar 3 13:39:24 2015 + Committer: Gordon Sim g...@redhat.com Committed: Tue Mar 3 13:46:26 2015 + -- examples/python/server_tx.py | 3 ++- examples/python/test_examples.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fca40c5e/examples/python/server_tx.py -- diff --git a/examples/python/server_tx.py b/examples/python/server_tx.py index 4a245e2..96b83cb 100755 --- a/examples/python/server_tx.py +++ b/examples/python/server_tx.py @@ -62,7 +62,8 @@ class TxServer(MessagingHandler): sender = self.container.create_sender(self.conn, event.message.reply_to) self.senders[event.message.reply_to] = sender -response = Message(address=event.message.reply_to, body=event.message.body.upper()) +response = Message(address=event.message.reply_to, body=event.message.body.upper(), + correlation_id=event.message.correlation_id) self.container.declare_transaction(self.conn, handler=TxRequest(response, sender, event.delivery)) def on_connection_open(self, event): http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fca40c5e/examples/python/test_examples.py -- diff --git a/examples/python/test_examples.py b/examples/python/test_examples.py index b46b85b..49abb8a 100644 --- a/examples/python/test_examples.py +++ b/examples/python/test_examples.py @@ -77,7 +77,7 @@ class ExamplesTest(unittest.TestCase): self.test_client_server(client=['client.py', '-a', 'localhost:/examples'], server=['server_direct.py'], sleep=0.5) def test_sync_client_server_direct(self): -self.test_client_server(client=['sync_client.py', 'localhost:/examples'], server=['server_direct.py'], sleep=0.5) +self.test_client_server(client=['sync_client.py', '-a', 'localhost:/examples'], server=['server_direct.py'], sleep=0.5) def test_db_send_recv(self): self.maxDiff = None - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[1/3] qpid-jms git commit: update to latest apache parent pom v16, remove some version overrides, remove some unused properties
Repository: qpid-jms
Updated Branches:
refs/heads/master f29381d98 - 5cd279a62
update to latest apache parent pom v16, remove some version overrides, remove
some unused properties
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5cd279a6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5cd279a6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5cd279a6
Branch: refs/heads/master
Commit: 5cd279a627f78248dc1c4a4085c6efc45a0136fc
Parents: 546eb45
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 15:56:46 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 16:52:01 2015 +
--
pom.xml | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5cd279a6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4adef38..8852b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
parent
groupIdorg.apache/groupId
artifactIdapache/artifactId
-version14/version
+version16/version
/parent
modelVersion4.0.0/modelVersion
@@ -57,12 +57,8 @@
!-- Maven Plugin Versions for this Project --
maven-javacc-plugin-version2.6/maven-javacc-plugin-version
-maven-surefire-plugin-version2.16/maven-surefire-plugin-version
-maven-assembly-plugin-version2.4/maven-assembly-plugin-version
-maven-release-plugin-version2.4.1/maven-release-plugin-version
maven-eclipse-plugin-version2.9/maven-eclipse-plugin-version
maven-idea-plugin-version2.5/maven-idea-plugin-version
-maven-compiler-plugin-version3.1/maven-compiler-plugin-version
findbugs-maven-plugin-version3.0.0/findbugs-maven-plugin-version
jacoco-plugin-version0.7.2.201409121644/jacoco-plugin-version
@@ -165,7 +161,6 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
- version${maven-surefire-plugin-version}/version
configuration
runOrder${surefire.runOrder}/runOrder
redirectTestOutputToFile${maven.test.redirectTestOutputToFile}/redirectTestOutputToFile
@@ -200,11 +195,6 @@
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-compiler-plugin/artifactId
- version${maven-compiler-plugin-version}/version
-/plugin
-plugin
- groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-release-plugin/artifactId
configuration
autoVersionSubmodulestrue/autoVersionSubmodules
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[3/3] qpid-jms git commit: remove stale pluginManagement entry
remove stale pluginManagement entry
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c7ef435a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c7ef435a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c7ef435a
Branch: refs/heads/master
Commit: c7ef435aa9233048fe32056534f347b44ab88530
Parents: f29381d
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 15:25:41 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 16:52:01 2015 +
--
pom.xml | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7ef435a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6cd0131..03a1254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
maven-idea-plugin-version2.5/maven-idea-plugin-version
maven-compiler-plugin-version3.1/maven-compiler-plugin-version
findbugs-maven-plugin-version3.0.0/findbugs-maven-plugin-version
-build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version
jacoco-plugin-version0.7.2.201409121644/jacoco-plugin-version
!-- Test properties --
@@ -215,11 +214,6 @@
version${maven-javacc-plugin-version}/version
/plugin
plugin
- groupIdorg.codehaus.mojo/groupId
- artifactIdbuild-helper-maven-plugin/artifactId
- version${build-helper-maven-plugin-version}/version
-/plugin
-plugin
groupIdorg.jacoco/groupId
artifactIdjacoco-maven-plugin/artifactId
version${jacoco-plugin-version}/version
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-jms git commit: We only need one LRUCache instance.
Repository: qpid-jms
Updated Branches:
refs/heads/master 289ba89fe - cd01efb83
We only need one LRUCache instance.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cd01efb8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cd01efb8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cd01efb8
Branch: refs/heads/master
Commit: cd01efb83bfd1701cf06d7b5ea144f2e5ebccf3c
Parents: 289ba89
Author: Timothy Bish tabish...@gmail.com
Authored: Tue Mar 3 13:43:44 2015 -0500
Committer: Timothy Bish tabish...@gmail.com
Committed: Tue Mar 3 13:43:44 2015 -0500
--
.../org/apache/qpid/jms/selector/LRUCache.java | 91
.../qpid/jms/selector/SelectorParser.java | 1 +
2 files changed, 1 insertion(+), 91 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd01efb8/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/LRUCache.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/LRUCache.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/LRUCache.java
deleted file mode 100755
index 6e9858d..000
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/LRUCache.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 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.selector;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * A Simple LRU Cache
- *
- * @param K
- * @param V
- */
-
-public class LRUCacheK, V extends LinkedHashMapK, V {
-private static final long serialVersionUID = -342098639681884413L;
-protected int maxCacheSize = 1;
-
-/**
- * Default constructor for an LRU Cache The default capacity is 1
- */
-public LRUCache() {
-this(0,1, 0.75f, true);
-}
-
-/**
- * Constructs a LRUCache with a maximum capacity
- *
- * @param maximumCacheSize
- */
-public LRUCache(int maximumCacheSize) {
-this(0, maximumCacheSize, 0.75f, true);
-}
-
-/**
- * Constructs an empty ttLRUCache/tt instance with the specified
- * initial capacity, maximumCacheSize,load factor and ordering mode.
- *
- * @param initialCapacity the initial capacity.
- * @param maximumCacheSize
- * @param loadFactor the load factor.
- * @param accessOrder the ordering mode - tttrue/tt for access-order,
- *ttfalse/tt for insertion-order.
- * @throws IllegalArgumentException if the initial capacity is negative or
- * the load factor is non-positive.
- */
-
-public LRUCache(int initialCapacity, int maximumCacheSize, float
loadFactor, boolean accessOrder) {
-super(initialCapacity, loadFactor, accessOrder);
-this.maxCacheSize = maximumCacheSize;
-}
-
-/**
- * @return Returns the maxCacheSize.
- */
-public int getMaxCacheSize() {
-return maxCacheSize;
-}
-
-/**
- * @param maxCacheSize The maxCacheSize to set.
- */
-public void setMaxCacheSize(int maxCacheSize) {
-this.maxCacheSize = maxCacheSize;
-}
-
-protected boolean removeEldestEntry(Map.EntryK,V eldest) {
-if( size() maxCacheSize ) {
-onCacheEviction(eldest);
-return true;
-}
-return false;
-}
-
-protected void onCacheEviction(Map.EntryK,V eldest) {
-}
-}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd01efb8/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
index 87e74b2..ef9b558 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
+++
svn commit: r1663799 - in /qpid/site: docs/components/messenger/index.html docs/components/protocol-engine/index.html docs/download.html input/components/messenger/index.md input/components/protocol-e
Author: jross Date: Tue Mar 3 21:36:36 2015 New Revision: 1663799 URL: http://svn.apache.org/r1663799 Log: QPID-6334: Fix proton md5 and sha links Modified: qpid/site/docs/components/messenger/index.html qpid/site/docs/components/protocol-engine/index.html qpid/site/docs/download.html qpid/site/input/components/messenger/index.md qpid/site/input/components/protocol-engine/index.md qpid/site/input/download.md Modified: qpid/site/docs/components/messenger/index.html URL: http://svn.apache.org/viewvc/qpid/site/docs/components/messenger/index.html?rev=1663799r1=1663798r2=1663799view=diff == --- qpid/site/docs/components/messenger/index.html (original) +++ qpid/site/docs/components/messenger/index.html Tue Mar 3 21:36:36 2015 @@ -122,7 +122,7 @@ application speak AMQP./p trtdemLanguages/em/tdtdC, Java, Perl, PHP, Python, Ruby/td/tr trtdemPlatforms/em/tdtdLinux, OS X, JVM/td/tr trtdemAMQP versions/em/tdtd1.0/td/tr -trtdemDownload/em/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a [a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/SHA1SUM;SHA1/a]/td/tr +trtdemDownload/em/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a [a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.md5;MD5/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.sha;SHA/a]/td/tr trtdemSource location/em/tdtda href=http://svn.apache.org/repos/asf/qpid/proton/trunk/;http://svn.apache.org/repos/asf/qpid/proton/trunk//a/td/tr /tbody /table Modified: qpid/site/docs/components/protocol-engine/index.html URL: http://svn.apache.org/viewvc/qpid/site/docs/components/protocol-engine/index.html?rev=1663799r1=1663798r2=1663799view=diff == --- qpid/site/docs/components/protocol-engine/index.html (original) +++ qpid/site/docs/components/protocol-engine/index.html Tue Mar 3 21:36:36 2015 @@ -121,7 +121,7 @@ application speak AMQP./p trtdemLanguages/em/tdtdC, Java, Perl, PHP, Python, Ruby/td/tr trtdemPlatforms/em/tdtdLinux, OS X, JVM/td/tr trtdemAMQP versions/em/tdtd1.0/td/tr -trtdemDownload/em/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a [a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/SHA1SUM;SHA1/a]/td/tr +trtdemDownload/em/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a [a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.md5;MD5/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.sha;SHA/a]/td/tr trtdemSource location/em/tdtda href=http://svn.apache.org/repos/asf/qpid/proton/trunk/;http://svn.apache.org/repos/asf/qpid/proton/trunk//a/td/tr /tbody /table Modified: qpid/site/docs/download.html URL: http://svn.apache.org/viewvc/qpid/site/docs/download.html?rev=1663799r1=1663798r2=1663799view=diff == --- qpid/site/docs/download.html (original) +++ qpid/site/docs/download.html Tue Mar 3 21:36:36 2015 @@ -126,8 +126,8 @@ the files you download./p table tbody trtdemContent/em/tdtdemDownload/em/tdtdemVerify/em/td/tr -trtda href=/components/messenger/index.htmlAMQP Messenger/a/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a/tdtda href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/SHA1SUM;SHA1/a/td/tr -trtda href=/components/messenger/index.htmlAMQP Protocol Engine/a/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a/tdtda href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/SHA1SUM;SHA1/a/td/tr +trtda href=/components/messenger/index.htmlAMQP Messenger/a/tdtda href=http://www.apache.org/dyn/closer.cgi/qpid/proton/0.8/qpid-proton-0.8.tar.gz;qpid-proton-0.8.tar.gz/a/tdtda href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.asc;ASC/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.md5;MD5/a, a href=http://www.apache.org/dist/qpid/proton/0.8/qpid-proton-0.8.tar.gz.sha;SHA/a/td/tr +trtda href=/components/messenger/index.htmlAMQP Protocol Engine/a/tdtda
qpid-jms git commit: Fix the error message for getChar
Repository: qpid-jms
Updated Branches:
refs/heads/master cd01efb83 - a8e68e4e6
Fix the error message for getChar
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a8e68e4e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a8e68e4e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a8e68e4e
Branch: refs/heads/master
Commit: a8e68e4e6de195c30e0dead313d87495ef871a4c
Parents: cd01efb
Author: Timothy Bish tabish...@gmail.com
Authored: Tue Mar 3 16:54:49 2015 -0500
Committer: Timothy Bish tabish...@gmail.com
Committed: Tue Mar 3 16:54:49 2015 -0500
--
.../src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a8e68e4e/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
index 659d4f7..e5184cd 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
@@ -99,7 +99,7 @@ public class JmsMapMessage extends JmsMessage implements
MapMessage {
} else if (value instanceof Character) {
return ((Character) value).charValue();
} else {
-throw new MessageFormatException(Cannot read a short from +
value.getClass().getSimpleName());
+throw new MessageFormatException(Cannot read a char from +
value.getClass().getSimpleName());
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1663828 - /qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
Author: shuston
Date: Tue Mar 3 23:09:54 2015
New Revision: 1663828
URL: http://svn.apache.org/r1663828
Log:
Fix possible double-free discussed in QPID-6368
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h?rev=1663828r1=1663827r2=1663828view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h Tue Mar 3 23:09:54
2015
@@ -25,7 +25,6 @@
#include string
#include qpid/broker/Persistable.h
#include qpid/management/Manageable.h
-#include boost/shared_ptr.hpp
namespace qpid {
namespace broker {
@@ -51,12 +50,12 @@ public:
class PersistableQueue : public Persistable
{
public:
-typedef boost::shared_ptrPersistableQueue shared_ptr;
-
virtual const std::string getName() const = 0;
virtual ~PersistableQueue() {
-if (externalQueueStore)
+if (externalQueueStore) {
delete externalQueueStore;
+ externalQueueStore = 0;
+}
};
virtual void setExternalQueueStore(ExternalQueueStore* inst) = 0;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-proton git commit: PROTON-825: fix blocking receive (also modified blocking helloworld example to use this)
Repository: qpid-proton Updated Branches: refs/heads/master 8ea52ddd3 - 048517947 PROTON-825: fix blocking receive (also modified blocking helloworld example to use this) Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/04851794 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/04851794 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/04851794 Branch: refs/heads/master Commit: 0485179476fba82414cc1d7871fd939a985a6ecd Parents: 8ea52dd Author: Gordon Sim g...@redhat.com Authored: Tue Mar 3 17:32:36 2015 + Committer: Gordon Sim g...@redhat.com Committed: Tue Mar 3 17:32:36 2015 + -- examples/python/helloworld_blocking.py | 12 +--- proton-c/bindings/python/proton/utils.py | 6 -- 2 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/04851794/examples/python/helloworld_blocking.py -- diff --git a/examples/python/helloworld_blocking.py b/examples/python/helloworld_blocking.py index d9a24a9..62b6105 100755 --- a/examples/python/helloworld_blocking.py +++ b/examples/python/helloworld_blocking.py @@ -22,14 +22,12 @@ from proton import Message from proton.utils import BlockingConnection from proton.handlers import IncomingMessageHandler -class HelloWorldReceiver(IncomingMessageHandler): -def on_message(self, event): -print event.message.body -event.connection.close() - conn = BlockingConnection(localhost:5672) -conn.create_receiver(examples, handler=HelloWorldReceiver()) +receiver = conn.create_receiver(examples) sender = conn.create_sender(examples) sender.send(Message(body=uHello World!)); -conn.run() +msg = receiver.receive(timeout=30) +print msg.body +receiver.accept() +conn.close() http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/04851794/proton-c/bindings/python/proton/utils.py -- diff --git a/proton-c/bindings/python/proton/utils.py b/proton-c/bindings/python/proton/utils.py index d5e2e0a..fabe887 100644 --- a/proton-c/bindings/python/proton/utils.py +++ b/proton-c/bindings/python/proton/utils.py @@ -83,13 +83,15 @@ class BlockingSender(BlockingLink): return delivery class Fetcher(MessagingHandler): -def __init__(self, prefetch): +def __init__(self, connection, prefetch): super(Fetcher, self).__init__(prefetch=prefetch, auto_accept=False) +self.connection = connection self.incoming = collections.deque([]) self.unsettled = collections.deque([]) def on_message(self, event): self.incoming.append((event.message, event.delivery)) +self.connection.container.yield_() # Wake up the wait() loop to handle the message. def on_link_error(self, event): if event.link.state Endpoint.LOCAL_ACTIVE: @@ -207,7 +209,7 @@ class BlockingConnection(Handler): if prefetch is None: prefetch = 1 else: -fetcher = Fetcher(credit) +fetcher = Fetcher(self, credit) return BlockingReceiver( self, self.container.create_receiver(self.conn, utf8(address), name=utf8(name), dynamic=dynamic, handler=handler or fetcher, options=options), fetcher, credit=prefetch) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[2/3] qpid-jms git commit: group required and test dependency version properties, add missing property for jms spec
group required and test dependency version properties, add missing property for
jms spec
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/546eb45d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/546eb45d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/546eb45d
Branch: refs/heads/master
Commit: 546eb45d6aee6be2c31d12bca3a7210478856f91
Parents: c7ef435
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 15:47:01 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 16:52:01 2015 +
--
pom.xml | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/546eb45d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 03a1254..4adef38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,15 +43,17 @@
target-version1.7/target-version
!-- Dependency Versions for this Project --
-junit-version4.12/junit-version
+proton-version0.8/proton-version
+netty-version4.0.17.Final/netty-version
slf4j-version1.7.10/slf4j-version
+geronimo-jms-1-1-spec-version1.1.1/geronimo-jms-1-1-spec-version
+!-- Test Dependency Versions for this Project --
activemq-version5.11.1/activemq-version
-proton-version0.8/proton-version
+junit-version4.12/junit-version
fuse-joram-tests-version1.0/fuse-joram-tests-version
jetty-version8.1.16.v20140903/jetty-version
mockito-version1.10.19/mockito-version
hamcrest-version1.3/hamcrest-version
-netty-version4.0.17.Final/netty-version
!-- Maven Plugin Versions for this Project --
maven-javacc-plugin-version2.6/maven-javacc-plugin-version
@@ -116,7 +118,7 @@
dependency
groupIdorg.apache.geronimo.specs/groupId
artifactIdgeronimo-jms_1.1_spec/artifactId
-version1.1.1/version
+version${geronimo-jms-1-1-spec-version}/version
/dependency
dependency
groupIdio.netty/groupId
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[4/4] qpid-jms git commit: fix directory screwup that somehow made it past multiple 'clean install' runs
fix directory screwup that somehow made it past multiple 'clean install' runs
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/289ba89f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/289ba89f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/289ba89f
Branch: refs/heads/master
Commit: 289ba89feeccd5cadeb33462d5cf7a647e20c438
Parents: 475a888
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 17:44:27 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 17:44:27 2015 +
--
qpid-jms-client/pom.xml |2 +-
.../jms/selector/parser/ParseException.java | 204 +++
.../jms/selector/parser/SelectorParserImpl.java | 1193 ++
.../parser/SelectorParserImplConstants.java | 121 ++
.../parser/SelectorParserImplTokenManager.java | 1055
.../jms/selector/parser/SimpleCharStream.java | 488 +++
.../apache/qpid/jms/selector/parser/Token.java | 148 +++
.../qpid/jms/selector/parser/TokenMgrError.java | 164 +++
.../jms/selector/parser/ParseException.java | 204 ---
.../jms/selector/parser/SelectorParserImpl.java | 1193 --
.../parser/SelectorParserImplConstants.java | 121 --
.../parser/SelectorParserImplTokenManager.java | 1055
.../jms/selector/parser/SimpleCharStream.java | 488 ---
.../apache/qpid/jms/selector/parser/Token.java | 148 ---
.../qpid/jms/selector/parser/TokenMgrError.java | 164 ---
15 files changed, 3374 insertions(+), 3374 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/289ba89f/qpid-jms-client/pom.xml
--
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index fc1a45e..686786b 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -123,7 +123,7 @@
/goals
configuration
sourceDirectory${basedir}/src/main/javacc/sourceDirectory
-
outputDirectory${basedir}/src/main/java/org/apache/qpid/jms/selector/parser/outputDirectory
+ outputDirectory${basedir}/src/main/java/outputDirectory
/configuration
/execution
/executions
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/289ba89f/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
new file mode 100644
index 000..3f98bb7
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
@@ -0,0 +1,204 @@
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0
*/
+/* JavaCCOptions:KEEP_LINE_COL=null */
+/**
+ * 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.selector.parser;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+ /**
+ * The version identifier for this Serializable class.
+ * Increment only if the iserialized/i form of the
+ * class changes.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * This constructor is used by the method generateParseException
+ * in the generated parser. Calling this constructor generates
+ * a new object of this type with the fields currentToken,
+ * expectedTokenSequences, and tokenImage set.
+ */
+ public ParseException(Token currentTokenVal,
+
[1/4] qpid-jms git commit: consolidate tests
Repository: qpid-jms
Updated Branches:
refs/heads/master 5cd279a62 - 289ba89fe
consolidate tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/475a8889
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/475a8889
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/475a8889
Branch: refs/heads/master
Commit: 475a8889c3e452235530442eb944371bb862e5a6
Parents: 5cd279a
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 17:41:57 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 17:41:57 2015 +
--
.../qpid/jms/selector/SelectorParserTest.java | 420 ++
.../apache/qpid/jms/selector/SelectorTest.java | 444 ---
2 files changed, 420 insertions(+), 444 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a8889/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
index 73eca85..1fd2afc 100755
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
@@ -16,12 +16,16 @@
*/
package org.apache.qpid.jms.selector;
+import java.util.HashMap;
+
import junit.framework.TestCase;
import org.apache.qpid.jms.selector.SelectorParser;
import org.apache.qpid.jms.selector.filter.BooleanExpression;
import org.apache.qpid.jms.selector.filter.ComparisonExpression;
import org.apache.qpid.jms.selector.filter.Expression;
+import org.apache.qpid.jms.selector.filter.FilterException;
+import org.apache.qpid.jms.selector.filter.Filterable;
import org.apache.qpid.jms.selector.filter.LogicExpression;
import org.apache.qpid.jms.selector.filter.PropertyExpression;
import org.slf4j.Logger;
@@ -61,4 +65,420 @@ public class SelectorParserTest extends TestCase {
protected BooleanExpression parse(String text) throws Exception {
return SelectorParser.parse(text);
}
+
+public void testBooleanSelector() throws Exception {
+MockMessage message = createMessage();
+
+assertSelector(message, (trueProp OR falseProp) AND trueProp, true);
+assertSelector(message, (trueProp OR falseProp) AND falseProp,
false);
+}
+
+public void testJMSPropertySelectors() throws Exception {
+MockMessage message = createMessage();
+message.setJMSType(selector-test);
+message.setJMSMessageID(id:test:1:1:1:1);
+
+assertSelector(message, JMSType = 'selector-test', true);
+assertSelector(message, JMSType = 'crap', false);
+
+assertSelector(message, JMSMessageID = 'id:test:1:1:1:1', true);
+assertSelector(message, JMSMessageID = 'id:not-test:1:1:1:1', false);
+
+message = createMessage();
+message.setJMSType(1001);
+
+assertSelector(message, JMSType='1001', true);
+assertSelector(message, JMSType='1001' OR JMSType='1002', true);
+assertSelector(message, JMSType = 'crap', false);
+}
+
+public void testBasicSelectors() throws Exception {
+MockMessage message = createMessage();
+
+assertSelector(message, name = 'James', true);
+assertSelector(message, rank 100, true);
+assertSelector(message, rank = 123, true);
+assertSelector(message, rank = 124, false);
+}
+
+public void testPropertyTypes() throws Exception {
+MockMessage message = createMessage();
+assertSelector(message, byteProp = 123, true);
+assertSelector(message, byteProp = 10, false);
+assertSelector(message, byteProp2 = 33, true);
+assertSelector(message, byteProp2 = 10, false);
+
+assertSelector(message, shortProp = 123, true);
+assertSelector(message, shortProp = 10, false);
+
+assertSelector(message, shortProp = 123, true);
+assertSelector(message, shortProp = 10, false);
+
+assertSelector(message, intProp = 123, true);
+assertSelector(message, intProp = 10, false);
+
+assertSelector(message, longProp = 123, true);
+assertSelector(message, longProp = 10, false);
+
+assertSelector(message, floatProp = 123, true);
+assertSelector(message, floatProp = 10, false);
+
+assertSelector(message, doubleProp = 123, true);
+assertSelector(message, doubleProp = 10, false);
+}
+
+public void testAndSelectors() throws Exception {
+MockMessage message = createMessage();
+
+assertSelector(message, name = 'James' and rank 200, true);
+
[2/4] qpid-jms git commit: fix directory screwup that somehow made it past multiple 'clean install' runs
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/289ba89f/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
deleted file mode 100644
index e545521..000
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
+++ /dev/null
@@ -1,1055 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line.
SelectorParserImplTokenManager.java */
-/**
- * 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.selector.parser;
-import java.io.*;
-import java.util.*;
-import org.apache.qpid.jms.selector.filter.*;
-
-/** Token Manager. */
-public class SelectorParserImplTokenManager implements
SelectorParserImplConstants
-{
-
- /** Debug output. */
- public java.io.PrintStream debugStream = System.out;
- /** Set debug output. */
- public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private int jjStopAtPos(int pos, int kind)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- return pos + 1;
-}
-private int jjMoveStringLiteralDfa0_0()
-{
- switch(curChar)
- {
- case 9:
- jjmatchedKind = 2;
- return jjMoveNfa_0(5, 0);
- case 10:
- jjmatchedKind = 3;
- return jjMoveNfa_0(5, 0);
- case 12:
- jjmatchedKind = 5;
- return jjMoveNfa_0(5, 0);
- case 13:
- jjmatchedKind = 4;
- return jjMoveNfa_0(5, 0);
- case 32:
- jjmatchedKind = 1;
- return jjMoveNfa_0(5, 0);
- case 37:
- jjmatchedKind = 40;
- return jjMoveNfa_0(5, 0);
- case 40:
- jjmatchedKind = 33;
- return jjMoveNfa_0(5, 0);
- case 41:
- jjmatchedKind = 35;
- return jjMoveNfa_0(5, 0);
- case 42:
- jjmatchedKind = 38;
- return jjMoveNfa_0(5, 0);
- case 43:
- jjmatchedKind = 36;
- return jjMoveNfa_0(5, 0);
- case 44:
- jjmatchedKind = 34;
- return jjMoveNfa_0(5, 0);
- case 45:
- jjmatchedKind = 37;
- return jjMoveNfa_0(5, 0);
- case 47:
- jjmatchedKind = 39;
- return jjMoveNfa_0(5, 0);
- case 60:
- jjmatchedKind = 31;
- return jjMoveStringLiteralDfa1_0(0x11000L);
- case 61:
- jjmatchedKind = 27;
- return jjMoveNfa_0(5, 0);
- case 62:
- jjmatchedKind = 29;
- return jjMoveStringLiteralDfa1_0(0x4000L);
- case 65:
- return jjMoveStringLiteralDfa1_0(0x200L);
- case 66:
- return jjMoveStringLiteralDfa1_0(0x800L);
- case 69:
- return jjMoveStringLiteralDfa1_0(0x2000L);
- case 70:
- return jjMoveStringLiteralDfa1_0(0x2L);
- case 73:
- return jjMoveStringLiteralDfa1_0(0xc000L);
- case 76:
- return jjMoveStringLiteralDfa1_0(0x1000L);
- case 78:
- return jjMoveStringLiteralDfa1_0(0x40100L);
- case 79:
- return jjMoveStringLiteralDfa1_0(0x400L);
- case 84:
- return jjMoveStringLiteralDfa1_0(0x1L);
- case 97:
- return jjMoveStringLiteralDfa1_0(0x200L);
- case 98:
- return jjMoveStringLiteralDfa1_0(0x800L);
- case 101:
- return jjMoveStringLiteralDfa1_0(0x2000L);
- case 102:
- return jjMoveStringLiteralDfa1_0(0x2L);
- case 105:
- return jjMoveStringLiteralDfa1_0(0xc000L);
- case 108:
- return jjMoveStringLiteralDfa1_0(0x1000L);
- case 110:
- return jjMoveStringLiteralDfa1_0(0x40100L);
- case 111:
- return jjMoveStringLiteralDfa1_0(0x400L);
- case 116:
- return jjMoveStringLiteralDfa1_0(0x1L);
- default :
- return jjMoveNfa_0(5, 0);
- }
-}
-private int
[3/4] qpid-jms git commit: fix directory screwup that somehow made it past multiple 'clean install' runs
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/289ba89f/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
new file mode 100644
index 000..1b2c2cb
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
@@ -0,0 +1,488 @@
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version
5.0 */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/**
+ * 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.selector.parser;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (without unicode processing).
+ */
+
+public class SimpleCharStream
+{
+/** Whether parser is static. */
+ public static final boolean staticFlag = false;
+ int bufsize;
+ int available;
+ int tokenBegin;
+/** Position in buffer. */
+ public int bufpos = -1;
+ protected int bufline[];
+ protected int bufcolumn[];
+
+ protected int column = 0;
+ protected int line = 1;
+
+ protected boolean prevCharIsCR = false;
+ protected boolean prevCharIsLF = false;
+
+ protected java.io.Reader inputStream;
+
+ protected char[] buffer;
+ protected int maxNextCharInd = 0;
+ protected int inBuf = 0;
+ protected int tabSize = 8;
+
+ protected void setTabSize(int i) { tabSize = i; }
+ protected int getTabSize(int i) { return tabSize; }
+
+
+ protected void ExpandBuff(boolean wrapAround)
+ {
+char[] newbuffer = new char[bufsize + 2048];
+int newbufline[] = new int[bufsize + 2048];
+int newbufcolumn[] = new int[bufsize + 2048];
+
+try
+{
+ if (wrapAround)
+ {
+System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize -
tokenBegin);
+System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+buffer = newbuffer;
+
+System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize -
tokenBegin);
+System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+bufline = newbufline;
+
+System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize -
tokenBegin);
+System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin,
bufpos);
+bufcolumn = newbufcolumn;
+
+maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+ }
+ else
+ {
+System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize -
tokenBegin);
+buffer = newbuffer;
+
+System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize -
tokenBegin);
+bufline = newbufline;
+
+System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize -
tokenBegin);
+bufcolumn = newbufcolumn;
+
+maxNextCharInd = (bufpos -= tokenBegin);
+ }
+}
+catch (Throwable t)
+{
+ throw new Error(t.getMessage());
+}
+
+
+bufsize += 2048;
+available = bufsize;
+tokenBegin = 0;
+ }
+
+ protected void FillBuff() throws java.io.IOException
+ {
+if (maxNextCharInd == available)
+{
+ if (available == bufsize)
+ {
+if (tokenBegin 2048)
+{
+ bufpos = maxNextCharInd = 0;
+ available = tokenBegin;
+}
+else if (tokenBegin 0)
+ bufpos = maxNextCharInd = 0;
+else
+ ExpandBuff(false);
+ }
+ else if (available tokenBegin)
+available = bufsize;
+ else if ((tokenBegin - available) 2048)
+ExpandBuff(true);
+ else
+available = tokenBegin;
+}
+
+int i;
+try {
+ if ((i = inputStream.read(buffer, maxNextCharInd, available -
maxNextCharInd)) == -1)
+ {
+inputStream.close();
+throw new java.io.IOException();
+ }
+ else
+maxNextCharInd += i;
+ return;
+}
+catch(java.io.IOException e) {
+ --bufpos;
+ backup(0);
+ if (tokenBegin == -1)
+
svn commit: r1663708 - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: broker-core/src/main/java/org/apache/qpid/server/protocol/ broker-core/src/main/java/org/apache/qpid/server/transport/ broke
Author: kwall
Date: Tue Mar 3 14:15:30 2015
New Revision: 1663708
URL: http://svn.apache.org/r1663708
Log:
channel block/unblock now async, remove unnecessary selector bumps
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java?rev=1663708r1=1663707r2=1663708view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
Tue Mar 3 14:15:30 2015
@@ -116,5 +116,5 @@ public interface AMQSessionModelT exten
void transportStateChanged();
-void processPendingMessages();
+void processPending();
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1663708r1=1663707r2=1663708view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Tue Mar 3 14:15:30 2015
@@ -623,6 +623,8 @@ public class NonBlockingConnection imple
@Override
public void send(final ByteBuffer msg)
{
+assert
Thread.currentThread().getName().startsWith(SelectorThread.IO_THREAD_NAME_PREFIX)
: Send called by unexpected thread + Thread.currentThread().getName();
+
if (_closed.get())
{
throw new SenderClosedException(I/O for thread +
_remoteSocketAddress + is already closed);
@@ -634,7 +636,5 @@ public class NonBlockingConnection imple
@Override
public void flush()
{
-getSelector().wakeup();
-
}
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java?rev=1663708r1=1663707r2=1663708view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
Tue Mar 3 14:15:30 2015
@@ -36,11 +36,9 @@ import
[1/3] qpid-jms git commit: remove 'convert strings' prefix and machinery, we dont use it
Repository: qpid-jms
Updated Branches:
refs/heads/master fd2139c27 - fa4dd26ec
remove 'convert strings' prefix and machinery, we dont use it
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8540359c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8540359c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8540359c
Branch: refs/heads/master
Commit: 8540359c7b39ba2d3315c35891dc3d38f45271c1
Parents: fd2139c
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 11:04:47 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 11:04:47 2015 +
--
.../qpid/jms/selector/SelectorParser.java | 30 +
.../selector/filter/ArithmeticExpression.java | 14 ---
.../selector/filter/ComparisonExpression.java | 44 +---
3 files changed, 3 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8540359c/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
index 87cfd6c..28b96d9 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/SelectorParser.java
@@ -19,15 +19,12 @@ package org.apache.qpid.jms.selector;
import java.io.StringReader;
import org.apache.qpid.jms.selector.filter.BooleanExpression;
-import org.apache.qpid.jms.selector.filter.ComparisonExpression;
import org.apache.qpid.jms.selector.filter.FilterException;
import org.apache.qpid.jms.selector.strict.StrictParser;
public class SelectorParser {
private static final LRUCacheObject, Object cache = new LRUCacheObject,
Object(100);
-private static final String CONVERT_STRING_EXPRESSIONS_PREFIX =
convert_string_expressions:;
-private static final String NO_CONVERT_STRING_EXPRESSIONS_PREFIX =
no_convert_string_expressions:;
public static BooleanExpression parse(String sql) throws FilterException {
Object result = cache.get(sql);
@@ -36,39 +33,16 @@ public class SelectorParser {
} else if (result instanceof BooleanExpression) {
return (BooleanExpression) result;
} else {
-String actual = sql;
-boolean convertStringExpressions = false;
-while (true) {
-if (actual.startsWith(CONVERT_STRING_EXPRESSIONS_PREFIX)) {
-convertStringExpressions = true;
-actual =
actual.substring(CONVERT_STRING_EXPRESSIONS_PREFIX.length());
-continue;
-}
-if (actual.startsWith(NO_CONVERT_STRING_EXPRESSIONS_PREFIX)) {
-convertStringExpressions = false;
-actual =
actual.substring(NO_CONVERT_STRING_EXPRESSIONS_PREFIX.length());
-continue;
-}
-break;
-}
-
-if (convertStringExpressions) {
-ComparisonExpression.CONVERT_STRING_EXPRESSIONS.set(true);
-}
try {
BooleanExpression e = null;
-StrictParser parser = new StrictParser(new
StringReader(actual));
+StrictParser parser = new StrictParser(new StringReader(sql));
e = parser.JmsSelector();
cache.put(sql, e);
return e;
} catch (Throwable e) {
-FilterException fe = new FilterException(actual, e);
+FilterException fe = new FilterException(sql, e);
cache.put(sql, fe);
throw fe;
-} finally {
-if (convertStringExpressions) {
-ComparisonExpression.CONVERT_STRING_EXPRESSIONS.remove();
-}
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8540359c/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
index 8aa0c25..7b8bb03 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
@@ -24,7 +24,6 @@ public abstract class ArithmeticExpression extends
[3/3] qpid-jms git commit: update checks to be more reliable
update checks to be more reliable
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/fa4dd26e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/fa4dd26e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/fa4dd26e
Branch: refs/heads/master
Commit: fa4dd26ec6920d293bf7fb3ba007758bcd9fa151
Parents: 8633f4f
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 11:50:43 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 11:50:43 2015 +
--
.../jms/integration/SessionIntegrationTest.java | 45
1 file changed, 28 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fa4dd26e/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index c65b789..acbef10 100644
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -52,6 +52,7 @@ import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.provider.amqp.AmqpConnectionProperties;
import org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper;
import org.apache.qpid.jms.test.QpidJmsTestCase;
+import org.apache.qpid.jms.test.Wait;
import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
import org.apache.qpid.jms.test.testpeer.basictypes.TerminusDurability;
import org.apache.qpid.jms.test.testpeer.describedtypes.Accepted;
@@ -1192,17 +1193,23 @@ public class SessionIntegrationTest extends
QpidJmsTestCase {
testPeer.remotelyEndLastOpenedSession(true);
Queue queue = session.createQueue(myQueue);
-MessageProducer producer = session.createProducer(queue);
+final MessageProducer producer = session.createProducer(queue);
testPeer.waitForAllHandlersToComplete(1000);
-// Verify the producer is now marked closed
-try {
-producer.getDestination();
-fail(Expected ISE to be thrown due to being closed);
-} catch (IllegalStateException jmsise) {
-// expected
-}
+// Verify the producer gets marked closed
+testPeer.waitForAllHandlersToComplete(1000);
+assertTrue(producer never closed., Wait.waitFor(new
Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+try {
+producer.getDestination();
+} catch (IllegalStateException jmsise) {
+return true;
+}
+return false;
+}
+}, 2000, 10));
// Try closing it explicitly, should effectively no-op in client.
// The test peer will throw during close if it sends anything.
@@ -1224,17 +1231,21 @@ public class SessionIntegrationTest extends
QpidJmsTestCase {
testPeer.remotelyEndLastOpenedSession(true);
Queue queue = session.createQueue(myQueue);
-MessageConsumer consumer = session.createConsumer(queue);
+final MessageConsumer consumer = session.createConsumer(queue);
+// Verify the consumer gets marked closed
testPeer.waitForAllHandlersToComplete(1000);
-
-// Verify the consumer is now marked closed
-try {
-consumer.getMessageListener();
-fail(Expected ISE to be thrown due to being closed);
-} catch (IllegalStateException jmsise) {
-// expected
-}
+assertTrue(consumer never closed., Wait.waitFor(new
Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+try {
+consumer.getMessageListener();
+} catch (IllegalStateException jmsise) {
+return true;
+}
+return false;
+}
+}, 2000, 10));
// Try closing it explicitly, should effectively no-op in client.
// The test peer will throw during close if it sends anything.
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[2/3] qpid-jms git commit: remove xquery and xpath expressions we arent using, drop xalan build dependency
remove xquery and xpath expressions we arent using, drop xalan build dependency
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8633f4f7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8633f4f7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8633f4f7
Branch: refs/heads/master
Commit: 8633f4f7e8c33152fa95e3e2ef8b1dbb0e504f17
Parents: 8540359
Author: Robert Gemmell rob...@apache.org
Authored: Tue Mar 3 11:40:03 2015 +
Committer: Robert Gemmell rob...@apache.org
Committed: Tue Mar 3 11:47:33 2015 +
--
qpid-jms-client/pom.xml | 9 --
.../jms/selector/filter/UnaryExpression.java| 8 --
.../jms/selector/filter/XPathExpression.java| 78 -
.../jms/selector/filter/XQueryExpression.java | 50
.../selector/filter/XalanXPathEvaluator.java| 115 ---
qpid-jms-client/src/main/javacc/StrictParser.jj | 12 --
.../qpid/jms/selector/SelectorParserTest.java | 7 --
.../apache/qpid/jms/selector/SelectorTest.java | 41 ---
8 files changed, 320 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8633f4f7/qpid-jms-client/pom.xml
--
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index d2c4813..39e2c39 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -72,15 +72,6 @@
artifactIdhamcrest-all/artifactId
scopetest/scope
/dependency
-
-!-- === --
-!-- Build Dependencies --
-!-- === --
-dependency
- groupIdxalan/groupId
- artifactIdxalan/artifactId
- optionaltrue/optional
-/dependency
/dependencies
build
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8633f4f7/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
index 1233447..854a659 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
@@ -151,14 +151,6 @@ public abstract class UnaryExpression implements
Expression {
};
}
-public static BooleanExpression createXPath(final String xpath) {
-return new XPathExpression(xpath);
-}
-
-public static BooleanExpression createXQuery(final String xpath) {
-return new XQueryExpression(xpath);
-}
-
public static BooleanExpression createBooleanCast(Expression left) {
return new BooleanUnaryExpression(left) {
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8633f4f7/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/XPathExpression.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/XPathExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/XPathExpression.java
deleted file mode 100755
index ebfc38f..000
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/XPathExpression.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * 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.selector.filter;
-
-/**
- * Used to evaluate an XPath Expression in a JMS selector.
- */
-public final class XPathExpression implements BooleanExpression {
-
-public static XPathEvaluatorFactory XPATH_EVALUATOR_FACTORY = null;
-static {
-// Install the xalan xpath evaluator if it available.
-new XalanXPathEvaluator(//root).evaluate(root/root);
-try {
-XPATH_EVALUATOR_FACTORY = new
svn commit: r1663717 [3/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/src/main/java/org/apache/qpid/
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
Tue Mar 3 14:56:40 2015
@@ -22,6 +22,8 @@ package org.apache.qpid.server.security.
import org.apache.log4j.Logger;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
@@ -36,7 +38,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
@@ -45,9 +46,9 @@ public abstract class AbstractPasswordFi
protected static final String DEFAULT_ENCODING = utf-8;
private final Pattern _regexp = Pattern.compile(:);
-private final MapString, U _userMap = new HashMapString, U();
+private final MapString, U _userMap = new HashMap();
private final ReentrantLock _userUpdate = new ReentrantLock();
-private final Random _random = new Random();
+private final FileHelper _fileHelper = new FileHelper();
private File _passwordFile;
public final void open(File passwordFile) throws IOException
@@ -181,7 +182,7 @@ public abstract class AbstractPasswordFi
try
{
_userUpdate.lock();
-final MapString, U newUserMap = new HashMapString, U();
+final MapString, U newUserMap = new HashMap();
BufferedReader reader = null;
try
@@ -224,71 +225,33 @@ public abstract class AbstractPasswordFi
protected abstract Logger getLogger();
-protected File createTempFileOnSameFilesystem()
-{
-File liveFile = _passwordFile;
-File tmp;
-
-do
-{
-tmp = new File(liveFile.getPath() + _random.nextInt() + .tmp);
-}
-while(tmp.exists());
-tmp.deleteOnExit();
-return tmp;
-}
-
-protected void swapTempFileToLive(final File temp) throws IOException
+protected void savePasswordFile() throws IOException
{
-File live = _passwordFile;
-// Remove any existing .old file
-final File old = new File(live.getAbsoluteFile() + .old);
-if (old.exists())
+try
{
-old.delete();
-}
+_userUpdate.lock();
-// Create an new .old file
-if(!live.renameTo(old))
-{
-//unable to rename the existing file to the backup name
-getLogger().error(Could not backup the existing password file);
-throw new IOException(Could not backup the existing password
file);
+_fileHelper.writeFileSafely(_passwordFile.toPath(), new
BaseActionFile,IOException()
+{
+@Override
+public void performAction(File file) throws IOException
+{
+writeToFile(file);
+}
+});
}
-
-// Move temp file to be the new live file
-if(!temp.renameTo(live))
+finally
{
-//failed to rename the new file to the required filename
-if(!old.renameTo(live))
-{
-//unable to return the backup to required filename
-getLogger().error(
-Could not rename the new password file into place,
and unable to restore original file);
-throw new IOException(Could not rename the new password file
into place, and unable to restore original file);
-}
-
-getLogger().error(Could not rename the new password file into
place);
-throw new IOException(Could not rename the new password file into
place);
+_userUpdate.unlock();
}
}
-protected void savePasswordFile() throws IOException
+private void writeToFile(File tmp) throws IOException
{
-try
-{
-_userUpdate.lock();
-
-BufferedReader reader = null;
-PrintStream writer = null;
-
-File tmp = createTempFileOnSameFilesystem();
-
-
svn commit: r1663717 [1/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/src/main/java/org/apache/qpid/
Author: kwall Date: Tue Mar 3 14:56:40 2015 New Revision: 1663717 URL: http://svn.apache.org/r1663717 Log: merge from trunk Added: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConnectionValidator.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConnectionValidator.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFilterFactory.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFilterFactory.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNode.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNode.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ - copied from r1663687, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java - copied unchanged from r1663687, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ - copied from r1663687, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/resources/ - copied from r1663687, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/resources/
svn commit: r1663717 [2/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/src/main/java/org/apache/qpid/
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
Tue Mar 3 14:56:40 2015
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.binding;
-import java.security.AccessControlException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -45,10 +44,8 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.util.StateChangeListener;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class BindingImpl
extends AbstractConfiguredObjectBindingImpl
@@ -108,26 +105,6 @@ public class BindingImpl
}
}
-@Override
-protected void onCreate()
-{
-super.onCreate();
-try
-{
-
_queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this);
-}
-catch(AccessControlException e)
-{
-deleted();
-throw e;
-}
-if (isDurable())
-{
-
_queue.getVirtualHost().getDurableConfigurationStore().create(asObjectRecord());
-}
-
-}
-
private static MapString, Object enhanceWithDurable(MapString, Object
attributes,
final AMQQueue queue,
final ExchangeImpl
exchange)
@@ -263,12 +240,6 @@ public class BindingImpl
{
_arguments = arguments;
BindingImpl.super.setAttribute(ARGUMENTS,
getActualAttributes().get(ARGUMENTS), arguments);
-if (isDurable())
-{
-VirtualHostImpl?, ?, ? vhost =
-(VirtualHostImpl?, ?, ?)
_exchange.getParent(VirtualHost.class);
-vhost.getDurableConfigurationStore().update(true,
asObjectRecord());
-}
}
}
);
@@ -278,6 +249,8 @@ public class BindingImpl
@Override
public void validateOnCreate()
{
+
_queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this);
+
AMQQueue queue = getAMQQueue();
MapString, Object arguments = getArguments();
if (arguments!=null !arguments.isEmpty()
FilterSupport.argumentsContainFilter(arguments))
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
Tue Mar 3 14:56:40 2015
@@ -48,6 +48,7 @@ public class BrokerProperties
public static final String PROPERTY_QPID_HOME = QPID_HOME;
public static final String PROPERTY_QPID_WORK = QPID_WORK;
public static final String PROPERTY_LOG_RECORDS_BUFFER_SIZE =
qpid.broker_log_records_buffer_size;
+public static final String POSIX_FILE_PERMISSIONS =
qpid.default_posix_file_permissions;
private BrokerProperties()
{
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
svn commit: r1663717 [6/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/src/main/java/org/apache/qpid/
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
Tue Mar 3 14:56:40 2015
@@ -20,13 +20,18 @@
*/
package org.apache.qpid.client.handler;
+import java.nio.ByteBuffer;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.failover.ConnectionRedirectException;
import org.apache.qpid.client.protocol.AMQProtocolSession;
import org.apache.qpid.client.state.StateAwareMethodListener;
import org.apache.qpid.framing.ConnectionRedirectBody;
+import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.transport.TransportException;
public class ConnectionRedirectMethodHandler implements
StateAwareMethodListenerConnectionRedirectBody
{
@@ -65,7 +70,21 @@ public class ConnectionRedirectMethodHan
}
-session.failover(host, port);
+session.notifyError(new ConnectionRedirectException(host,port));
+
+ByteBufferSender sender = session.getSender();
+
+// Close the open TCP connection
+try
+{
+sender.close();
+}
+catch(TransportException e)
+{
+//Ignore, they are already logged by the Sender and this
+//is a connection-close being processed by the IoReceiver
+//which will as it closes initiate failover if necessary.
+}
}
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Tue Mar 3 14:56:40 2015
@@ -799,14 +799,6 @@ public class AMQProtocolHandler implemen
return _writtenBytes;
}
-public void failover(String host, int port)
-{
-_failoverHandler.setHost(host);
-_failoverHandler.setPort(port);
-// see javadoc for FailoverHandler to see rationale for separate thread
-startFailoverThread();
-}
-
public void blockUntilNotFailingOver() throws InterruptedException
{
synchronized(_failoverLatchChange)
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
Tue Mar 3 14:56:40 2015
@@ -386,11 +386,6 @@ public class AMQProtocolSession implemen
return _protocolHandler.getSender();
}
-public void failover(String host, int port)
-{
-_protocolHandler.failover(host, port);
-}
-
protected AMQShortString generateQueueName()
{
int id;
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
Tue Mar 3 14:56:40 2015
@@ -20,6 +20,10 @@
*/
svn commit: r1663717 [4/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ amqp-1-0-client/src/main/java/org/apache/qpid/
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
Tue Mar 3 14:56:40 2015
@@ -65,8 +65,8 @@ import org.apache.qpid.filter.selector.P
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.JMSSelectorFilter;
-import org.apache.qpid.server.filter.SimpleFilterManager;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.ExclusivityPolicy;
@@ -154,15 +154,7 @@ public class SendingLink_1_0 implements
actualFilters.put(entry.getKey(),
entry.getValue());
}
-catch (ParseException e)
-{
-Error error = new Error();
-error.setCondition(AmqpError.INVALID_FIELD);
-error.setDescription(Invalid JMS Selector: +
selectorFilter.getValue());
-
error.setInfo(Collections.singletonMap(Symbol.valueOf(field),
Symbol.valueOf(filter)));
-throw new AmqpErrorException(error);
-}
-catch (SelectorParsingException e)
+catch (ParseException | SelectorParsingException e)
{
Error error = new Error();
error.setCondition(AmqpError.INVALID_FIELD);
@@ -374,8 +366,16 @@ public class SendingLink_1_0 implements
{
name = getEndpoint().getName();
}
+
+FilterManager filters = null;
+if(messageFilter != null)
+{
+filters = new FilterManager();
+filters.add(messageFilter.getName(), messageFilter);
+}
+
_consumer = _queue.addConsumer(_target,
- messageFilter == null ? null :
new SimpleFilterManager(messageFilter),
+ filters,
Message_1_0.class, name,
options);
}
catch (MessageSource.ExistingExclusiveConsumer e)
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js?rev=1663717r1=1663716r2=1663717view=diff
==
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
Tue Mar 3 14:56:40 2015
@@ -34,10 +34,11 @@ define([dojo/_base/xhr,
show: function (data)
{
this.containerNode = domConstruct.create(div, {innerHTML:
template}, data.containerNode);
-parser.parse(this.containerNode);
-
-
registry.byId(addVirtualHost.storeUnderfullSize).set(regExpGen,
util.numericOrContextVarRegexp);
-registry.byId(addVirtualHost.storeOverfullSize).set(regExpGen,
util.numericOrContextVarRegexp);
+parser.parse(this.containerNode).then(function(instances)
+{
+
registry.byId(addVirtualHost.storeUnderfullSize).set(regExpGen,
util.numericOrContextVarRegexp);
+
registry.byId(addVirtualHost.storeOverfullSize).set(regExpGen,
util.numericOrContextVarRegexp);
+});
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
URL:
