You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2009/09/17 18:21:21 UTC
svn commit: r816261 [8/8] - in /qpid/branches/java-network-refactor: ./
qpid/cpp/bindings/qmf/python/ qpid/cpp/bindings/qmf/ruby/
qpid/cpp/bindings/qmf/tests/ qpid/cpp/include/qpid/messaging/ qpid/cpp/src/
qpid/cpp/src/qmf/ qpid/cpp/src/qpid/acl/ qpid/...
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:520691-726139
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:443187-726139
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:805429-816233
Modified: qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile (original)
+++ qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile Thu Sep 17 16:21:13 2009
@@ -18,9 +18,10 @@
test.port=15672
test.mport=18999
+#Note : Management will start open second port on: mport + 100 : 19099
test.port.ssl=15671
-test.port.alt=15772
-test.port.alt.ssl=15771
+test.port.alt=25672
+test.port.alt.ssl=25671
test.exclude=true
profile.excludes=08TransientExcludes
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:520691-726139
-/qpid/trunk/qpid/java/test-profiles/default.testprofile:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:805429-816233
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:520691-726139
-/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:805429-816233
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:520691-726139
-/qpid/trunk/qpid/java/test-profiles/java.testprofile:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:805429-816233
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:520691-726139
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:443187-726139
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:805429-816233
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1,2 +1,2 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:520691-726139
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:805429-812920
+/incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:805429-816233
Propchange: qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:520691-726139
+/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
Propchange: qpid/branches/java-network-refactor/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -0,0 +1 @@
+/incubator/qpid/trunk/qpid/python/qpid/concurrency.py:443187-726139
Modified: qpid/branches/java-network-refactor/qpid/python/qpid/datatypes.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/python/qpid/datatypes.py?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/python/qpid/datatypes.py (original)
+++ qpid/branches/java-network-refactor/qpid/python/qpid/datatypes.py Thu Sep 17 16:21:13 2009
@@ -234,6 +234,24 @@
def add(self, lower, upper = None):
self.add_range(Range(lower, upper))
+ def empty(self):
+ for r in self.ranges:
+ if r.lower <= r.upper:
+ return False
+ return True
+
+ def max(self):
+ if self.ranges:
+ return self.ranges[-1].upper
+ else:
+ return None
+
+ def min(self):
+ if self.ranges:
+ return self.ranges[0].lower
+ else:
+ return None
+
def __iter__(self):
return iter(self.ranges)
Modified: qpid/branches/java-network-refactor/qpid/python/qpid/delegates.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/python/qpid/delegates.py?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/python/qpid/delegates.py (original)
+++ qpid/branches/java-network-refactor/qpid/python/qpid/delegates.py Thu Sep 17 16:21:13 2009
@@ -139,12 +139,18 @@
class Client(Delegate):
+ ppid = 0
+ try:
+ ppid = os.getppid()
+ except:
+ pass
+
PROPERTIES = {"product": "qpid python client",
"version": "development",
"platform": os.name,
"qpid.client_process": os.path.basename(sys.argv[0]),
"qpid.client_pid": os.getpid(),
- "qpid.client_ppid": os.getppid()}
+ "qpid.client_ppid": ppid}
def __init__(self, connection, username="guest", password="guest",
mechanism="PLAIN", heartbeat=None):
Modified: qpid/branches/java-network-refactor/qpid/python/qpid/ops.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/python/qpid/ops.py?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/python/qpid/ops.py (original)
+++ qpid/branches/java-network-refactor/qpid/python/qpid/ops.py Thu Sep 17 16:21:13 2009
@@ -74,10 +74,7 @@
def dispatch(self, target, *args):
handler = "do_%s" % self.NAME
- if hasattr(target, handler):
- getattr(target, handler)(self, *args)
- else:
- print "UNHANDLED:", target, args
+ getattr(target, handler)(self, *args)
def __repr__(self, extras=()):
return "%s(%s)" % (self.__class__.__name__,
Modified: qpid/branches/java-network-refactor/qpid/python/tests/datatypes.py
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/python/tests/datatypes.py?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/python/tests/datatypes.py (original)
+++ qpid/branches/java-network-refactor/qpid/python/tests/datatypes.py Thu Sep 17 16:21:13 2009
@@ -148,6 +148,34 @@
assert range.lower == 0
assert range.upper == 8
+ def testEmpty(self):
+ s = RangedSet()
+ assert s.empty()
+ s.add(0, -1)
+ assert s.empty()
+ s.add(0, 0)
+ assert not s.empty()
+
+ def testMinMax(self):
+ s = RangedSet()
+ assert s.max() is None
+ assert s.min() is None
+ s.add(0, 10)
+ assert s.max() == 10
+ assert s.min() == 0
+ s.add(0, 5)
+ assert s.max() == 10
+ assert s.min() == 0
+ s.add(0, 11)
+ assert s.max() == 11
+ assert s.min() == 0
+ s.add(15, 20)
+ assert s.max() == 20
+ assert s.min() == 0
+ s.add(-10, -5)
+ assert s.max() == 20
+ assert s.min() == -10
+
class RangeTest(TestCase):
def testIntersect1(self):
Propchange: qpid/branches/java-network-refactor/qpid/python/tests_0-9/queue.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid/python/tests_0-9/queue.py:520691-726139
+/incubator/qpid/trunk/qpid/python/tests_0-9/queue.py:443187-726139
Propchange: qpid/branches/java-network-refactor/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 16:21:13 2009
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:520691-726139
+/incubator/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:443187-726139
Modified: qpid/branches/java-network-refactor/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/specs/management-schema.xml?rev=816261&r1=816260&r2=816261&view=diff
==============================================================================
--- qpid/branches/java-network-refactor/qpid/specs/management-schema.xml (original)
+++ qpid/branches/java-network-refactor/qpid/specs/management-schema.xml Thu Sep 17 16:21:13 2009
@@ -169,7 +169,7 @@
<property name="type" type="sstr" access="RO"/>
<property name="durable" type="bool" access="RO"/>
<property name="autoDelete" type="bool" access="RO"/>
- <property name="altExchange" type="objId" access="RO" optional="y"/>
+ <property name="altExchange" type="objId" references="Exchange" access="RO" optional="y"/>
<property name="arguments" type="map" access="RO" desc="Arguments supplied in exchange.declare"/>
<statistic name="producerCount" type="hilo32" desc="Current producers on exchange"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org