date:20120530

svn commit: r1344180 - /qpid/proton/trunk/proton-c/tests/engine.py

2012-05-30 Thread rhs

Author: rhs
Date: Wed May 30 10:12:45 2012
New Revision: 1344180

URL: http://svn.apache.org/viewvc?rev=1344180view=rev
Log:
added assert info

Modified:
qpid/proton/trunk/proton-c/tests/engine.py

Modified: qpid/proton/trunk/proton-c/tests/engine.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/tests/engine.py?rev=1344180r1=1344179r2=1344180view=diff
==
--- qpid/proton/trunk/proton-c/tests/engine.py (original)
+++ qpid/proton/trunk/proton-c/tests/engine.py Wed May 30 10:12:45 2012
@@ -305,7 +305,8 @@ class TransferTest(Test):
 self.pump()
 d = pn_work_head(self.c1)
 assert d is not None
-assert pn_delivery_tag(d) == tag
+tag = pn_delivery_tag(d)
+assert tag == tag, tag
 assert pn_writable(d)
 
 n = pn_send(self.snd, this is a test)
@@ -377,7 +378,9 @@ class TransferTest(Test):
 
 self.pump()
 
-assert pn_remote_disp(sd) == pn_local_disp(rd) == PN_ACCEPTED
+rdisp = pn_remote_disp(sd)
+ldisp = pn_local_disp(rd)
+assert rdisp == ldisp == PN_ACCEPTED, (rdisp, ldisp)
 assert pn_updated(sd)
 
 pn_disposition(sd, PN_ACCEPTED)



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1344181 [2/2] - in /qpid/proton/trunk/proton-c: CMakeLists.txt docs/ docs/api/ docs/api/CMakeLists.txt docs/api/user.doxygen.in include/proton/driver.h include/proton/engine.h include/pro

2012-05-30 Thread rhs

Modified: qpid/proton/trunk/proton-c/include/proton/engine.h
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/engine.h?rev=1344181r1=1344180r2=1344181view=diff
==
--- qpid/proton/trunk/proton-c/include/proton/engine.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/engine.h Wed May 30 10:14:50 2012
@@ -27,11 +27,17 @@
 #include sys/types.h
 #include proton/errors.h
 
+/** @file
+ * API for the proton Engine.
+ *
+ * @todo
+ */
+
 typedef struct pn_error_t pn_error_t;
 typedef struct pn_transport_t pn_transport_t;
-typedef struct pn_connection_t pn_connection_t;
-typedef struct pn_session_t pn_session_t;
-typedef struct pn_link_t pn_link_t;
+typedef struct pn_connection_t pn_connection_t; /** Connection */
+typedef struct pn_session_t pn_session_t;   /** Session */
+typedef struct pn_link_t pn_link_t; /** Link */
 typedef struct pn_delivery_t pn_delivery_t;
 
 typedef struct pn_delivery_tag_t {
@@ -41,18 +47,23 @@ typedef struct pn_delivery_tag_t {
 
 #define pn_dtag(BYTES, SIZE) ((pn_delivery_tag_t) {(SIZE), (BYTES)})
 
-typedef int pn_state_t;
+typedef int pn_state_t; /** encodes the state of an endpoint */
 
-#define PN_LOCAL_UNINIT (1)
-#define PN_LOCAL_ACTIVE (2)
-#define PN_LOCAL_CLOSED (4)
-#define PN_REMOTE_UNINIT (8)
-#define PN_REMOTE_ACTIVE (16)
-#define PN_REMOTE_CLOSED (32)
+#define PN_LOCAL_UNINIT (1)/** local endpoint requires initialization */
+#define PN_LOCAL_ACTIVE (2)/** local endpoint is active */
+#define PN_LOCAL_CLOSED (4)/** local endpoint is closed */
+#define PN_REMOTE_UNINIT (8)   /** remote endpoint pending initialization by 
peer */
+#define PN_REMOTE_ACTIVE (16)  /** remote endpoint is active */
+#define PN_REMOTE_CLOSED (32)  /** remote endpoint has closed */
 
 #define PN_LOCAL_MASK (PN_LOCAL_UNINIT | PN_LOCAL_ACTIVE | PN_LOCAL_CLOSED)
 #define PN_REMOTE_MASK (PN_REMOTE_UNINIT | PN_REMOTE_ACTIVE | PN_REMOTE_CLOSED)
 
+/** @enum pn_disposition_t
+ * The state/outcome of a message transfer.
+ *
+ * @todo document each value
+ */
 typedef enum pn_disposition_t {
   PN_RECEIVED=1,
   PN_ACCEPTED=2,
@@ -68,25 +79,135 @@ typedef int pn_trace_t;
 #define PN_TRACE_FRM (2)
 
 // connection
+
+/** Factory to construct a new Connection.
+ *
+ * @return pointer to a new connection object.
+ */
 pn_connection_t *pn_connection();
 
+/** Retrieve the state of the connection.
+ *
+ * @param[in] connection the connection
+ * @return the connection's state flags
+ */
 pn_state_t pn_connection_state(pn_connection_t *connection);
+/** @todo: needs documentation */
 pn_error_t *pn_connection_error(pn_connection_t *connection);
+/** @todo: needs documentation */
 char *pn_connection_container(pn_connection_t *connection);
+/** @todo: needs documentation */
 void pn_connection_set_container(pn_connection_t *connection, const char 
*container);
+/** @todo: needs documentation */
 char *pn_connection_hostname(pn_connection_t *connection);
+/** @todo: needs documentation */
 void pn_connection_set_hostname(pn_connection_t *connection, const char 
*hostname);
 
+/** Extracts the first delivery on the connection that has pending
+ *  operations.
+ *
+ * Retrieves the first delivery on the Connection that has pending
+ * operations. A readable delivery indicates message data is waiting
+ * to be read. A writable delivery indicates that message data may be
+ * sent. An updated delivery indicates that the delivery's disposition
+ * has changed. A delivery will never be both readable and writible,
+ * but it may be both readable and updated or both writiable and
+ * updated.
+ *
+ * @param[in] connection the connection
+ * @return the first delivery object that needs to be serviced, else
+ * NULL if none
+ */
 pn_delivery_t *pn_work_head(pn_connection_t *connection);
+
+/** Get the next delivery on the connection that needs has pending
+ *  operations.
+ *
+ * @param[in] delivery the previous delivery retrieved from
+ * either pn_work_head() or pn_work_next()
+ * @return the next delivery that has pending operations, else
+ * NULL if none
+ */
 pn_delivery_t *pn_work_next(pn_delivery_t *delivery);
 
+/** Factory for creating a new session on the connection.
+ *
+ * A new session is created for the connection, and is added to the
+ * set of sessions maintained by the connection.
+ *
+ * @param[in] connection the session will exist over this connection
+ * @return pointer to new session
+ */
 pn_session_t *pn_session(pn_connection_t *connection);
+
+/** Factory for creating the connection's transport.
+ *
+ * The transport used by the connection to interface with the network.
+ * There can only be one transport associated with a connection.
+ *
+ * @param[in] connection connection that will use the transport
+ * @return pointer to new session
+ */
 pn_transport_t *pn_transport(pn_connection_t *connection);
 
+/** Retrieve the first Session that

svn commit: r1344202 - in /qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl: DeliveryImpl.java TransportImpl.java TransportSession.java

2012-05-30 Thread rgodfrey

Author: rgodfrey
Date: Wed May 30 11:30:59 2012
New Revision: 1344202

URL: http://svn.apache.org/viewvc?rev=1344202view=rev
Log:
Proton-j : allow for multiple transfer frames

Modified:

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportSession.java

Modified: 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1344202r1=1344201r2=1344202view=diff
==
--- 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
 (original)
+++ 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
 Wed May 30 11:30:59 2012
@@ -52,6 +52,7 @@ public class DeliveryImpl implements Del
 private TransportDelivery _transportDelivery;
 private byte[] _data;
 private int _dataSize;
+private boolean _complete;
 
 public DeliveryImpl(final byte[] tag, final LinkImpl link, DeliveryImpl 
previous)
 {
@@ -169,7 +170,7 @@ public class DeliveryImpl implements Del
 {
 clearFlag(IO_WORK);
 }
-return consumed;  //TODO - Implement
+return (_complete  consumed == 0) ? TransportImpl.END_OF_STREAM : 
consumed;  //TODO - Implement
 }
 
 private void clearFlag(int ioWork)
@@ -236,8 +237,9 @@ public class DeliveryImpl implements Del
 }
 }
 
-void clearTransportWork()
+DeliveryImpl clearTransportWork()
 {
+DeliveryImpl next = _transportWorkNext;
 getLink().getConnectionImpl().removeTransportWork(this);
 if(_transportWorkPrev != null)
 {
@@ -250,11 +252,17 @@ public class DeliveryImpl implements Del
 }
 _transportWorkNext = null;
 _transportWorkPrev = null;
+return next;
 }
 
 void addToTransportWorkList()
 {
-getLink().getConnectionImpl().addTransportWork(this);
+if(_transportWorkNext == null
+_transportWorkPrev == null
+getLink().getConnectionImpl().getTransportWorkHead() != this)
+{
+getLink().getConnectionImpl().addTransportWork(this);
+}
 }
 
 
@@ -281,6 +289,10 @@ public class DeliveryImpl implements Del
 
 void setTransportWorkNext(DeliveryImpl transportWorkNext)
 {
+if(transportWorkNext == this)
+{
+(new Exception(Aaaargh)).printStackTrace();
+}
 _transportWorkNext = transportWorkNext;
 }
 
@@ -323,7 +335,8 @@ public class DeliveryImpl implements Del
 }
 System.arraycopy(bytes,offset,_data,_dataSize,length);
 _dataSize+=length;
-addToWorkList();
+//addToWorkList();
+addToTransportWorkList();
 return length;  //TODO - Implement.
 }
 
@@ -342,7 +355,7 @@ public class DeliveryImpl implements Del
 return _dataSize;  //TODO - Implement.
 }
 
-public void setData(byte[] data)
+void setData(byte[] data)
 {
 _data = data;
 }
@@ -370,4 +383,9 @@ public class DeliveryImpl implements Del
  getLink().current() == this
  _dataSize  0;
 }
+
+void setComplete()
+{
+_complete = true;
+}
 }

Modified: 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1344202r1=1344201r2=1344202view=diff
==
--- 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
 (original)
+++ 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
 Wed May 30 11:30:59 2012
@@ -205,8 +205,8 @@ public class TransportImpl extends Endpo
 
 
 TransportLink transportLink = sender.getTransportLink();
+
 UnsignedInteger deliveryId = transportLink.getDeliveryCount();
-
transportLink.setDeliveryCount(deliveryId.add(UnsignedInteger.ONE));
 TransportDelivery transportDelivery = new 
TransportDelivery(deliveryId, delivery, transportLink);
 
 
@@ -214,6 +214,10 @@ public class TransportImpl extends Endpo
 transfer.setDeliveryId(deliveryId);
 transfer.setDeliveryTag(new Binary(delivery.getTag()));
 transfer.setHandle(transportLink.getLocalHandle());
+if(delivery.getLink().current() == delivery)
+{
+transfer.setMore(true);
+}
 transfer.setMessageFormat(UnsignedInteger.ZERO);

svn commit: r1344209 - in /qpid/proton/trunk: ./ design/ design/src/proton/ proton-c/ proton-c/tests/ proton-j/ tests/ tests/proton_tests/

2012-05-30 Thread rhs

Author: rhs
Date: Wed May 30 11:54:35 2012
New Revision: 1344209

URL: http://svn.apache.org/viewvc?rev=1344209view=rev
Log:
moved python tests from proton-c to top level and made them switchable between 
the c and java engine; added config.sh to set up JYTHONPATH and PYTHONPATH

Added:
qpid/proton/trunk/config.sh
qpid/proton/trunk/proton-c/xproton.py
qpid/proton/trunk/proton-j/xproton.py
qpid/proton/trunk/tests/proton_tests/   (props changed)
  - copied from r1344181, qpid/proton/trunk/proton-c/tests/
Removed:
qpid/proton/trunk/proton-c/tests/
Modified:
qpid/proton/trunk/design/   (props changed)
qpid/proton/trunk/design/src/proton/package.html
qpid/proton/trunk/proton-j/   (props changed)
qpid/proton/trunk/tests/proton-test
qpid/proton/trunk/tests/proton_tests/__init__.py
qpid/proton/trunk/tests/proton_tests/engine.py

Added: qpid/proton/trunk/config.sh
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/config.sh?rev=1344209view=auto
==
--- qpid/proton/trunk/config.sh (added)
+++ qpid/proton/trunk/config.sh Wed May 30 11:54:35 2012
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# 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.
+#
+
+export PROTON_HOME=$(dirname $(readlink -f $0))
+
+if [ -z $CPROTON_BUILD ]; then
+if [ -d $PROTON_HOME/proton-c/build ]; then
+export PYTHON_BINDINGS=$PROTON_HOME/proton-c/build/bindings/python
+else
+export PYTHON_BINDINGS=$PROTON_HOME/proton-c/bindings/python
+fi
+else
+export PYTHON_BINDINGS=$CPROTON_BUILD/bindings/python
+fi
+
+export PYTHONPATH=$PROTON_HOME/tests:$PROTON_HOME/proton-c:$PYTHON_BINDINGS
+export 
JYTHONPATH=$PROTON_HOME/tests:$PROTON_HOME/proton-j:$PROTON_HOME/proton-j/dist/lib/qpidproton.jar

Propchange: qpid/proton/trunk/design/
--
--- svn:ignore (added)
+++ svn:ignore Wed May 30 11:54:35 2012
@@ -0,0 +1,2 @@
+build
+dist

Modified: qpid/proton/trunk/design/src/proton/package.html
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/design/src/proton/package.html?rev=1344209r1=1344208r2=1344209view=diff
==
--- qpid/proton/trunk/design/src/proton/package.html (original)
+++ qpid/proton/trunk/design/src/proton/package.html Wed May 30 11:54:35 2012
@@ -68,9 +68,9 @@
   /pre
 
   p
-Additionally each endpoint has a local and remote error slot which
-may be filled with additional information regarding why the
-endpoint was transitioned to CLOSED.
+Additionally each endpoint has an error slot which may be filled
+with additional information regarding error conditions, e.g. why
+the remote endpoint was transitioned to CLOSED.
   /p
 
   h3Questions:/h3

Added: qpid/proton/trunk/proton-c/xproton.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/xproton.py?rev=1344209view=auto
==
--- qpid/proton/trunk/proton-c/xproton.py (added)
+++ qpid/proton/trunk/proton-c/xproton.py Wed May 30 11:54:35 2012
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+from cproton import *

Propchange: qpid/proton/trunk/proton-j/
--
--- svn:ignore (added)
+++ svn:ignore Wed May 30 11:54:35 2012
@@ -0,0 +1,3 @@
+build

svn commit: r1344211 - /qpid/proton/trunk/config.sh

2012-05-30 Thread rhs

Author: rhs
Date: Wed May 30 12:01:41 2012
New Revision: 1344211

URL: http://svn.apache.org/viewvc?rev=1344211view=rev
Log:
fixed to work when sourced from other directories

Modified:
qpid/proton/trunk/config.sh

Modified: qpid/proton/trunk/config.sh
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/config.sh?rev=1344211r1=1344210r2=1344211view=diff
==
--- qpid/proton/trunk/config.sh (original)
+++ qpid/proton/trunk/config.sh Wed May 30 12:01:41 2012
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-export PROTON_HOME=$(dirname $(readlink -f $0))
+export PROTON_HOME=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
 
 if [ -z $CPROTON_BUILD ]; then
 if [ -d $PROTON_HOME/proton-c/build ]; then



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1344245 - /qpid/proton/trunk/proton-j/jproton.py

2012-05-30 Thread rhs

Author: rhs
Date: Wed May 30 13:21:36 2012
New Revision: 1344245

URL: http://svn.apache.org/viewvc?rev=1344245view=rev
Log:
added stub for pn_trace

Modified:
qpid/proton/trunk/proton-j/jproton.py

Modified: qpid/proton/trunk/proton-j/jproton.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/jproton.py?rev=1344245r1=1344244r2=1344245view=diff
==
--- qpid/proton/trunk/proton-j/jproton.py (original)
+++ qpid/proton/trunk/proton-j/jproton.py Wed May 30 13:21:36 2012
@@ -111,6 +111,10 @@ def pn_session_close(s):
 def pn_transport(c):
   return c.transport()
 
+def pn_trace(t, lvl):
+  # XXX: fix up later
+  pass
+
 def pn_output(t, size):
   output = zeros(size, b)
   n = t.output(output, 0, size)



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1344276 - /qpid/trunk/qpid/java/systests/etc/

2012-05-30 Thread robbie

Author: robbie
Date: Wed May 30 14:34:39 2012
New Revision: 1344276

URL: http://svn.apache.org/viewvc?rev=1344276view=rev
Log:
QPID-4029: update the systest configuration to be self-contained, separating 
the tests config from the example config files to allow modifiying them in 
isolation

Added:
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-settings.xml
Modified:
qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml
qpid/trunk/qpid/java/systests/etc/config-systests-derby-mem.xml
qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml
qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml
qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml
qpid/trunk/qpid/java/systests/etc/config-systests.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml

Modified: qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml?rev=1344276r1=1344275r2=1344276view=diff
==
--- qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml Wed May 30 
14:34:39 2012
@@ -25,6 +25,5 @@
 xml fileName=${QPID_HOME}/${test.config} optional=true/
 xml fileName=${QPID_HOME}/etc/config-systests-bdb-settings.xml/
 xml fileName=${QPID_HOME}/etc/config-systests-settings.xml/
-xml fileName=${QPID_HOME}/etc/config.xml/
 /override
 /configuration

Modified: qpid/trunk/qpid/java/systests/etc/config-systests-derby-mem.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-derby-mem.xml?rev=1344276r1=1344275r2=1344276view=diff
==
--- qpid/trunk/qpid/java/systests/etc/config-systests-derby-mem.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-derby-mem.xml Wed May 30 
14:34:39 2012
@@ -25,6 +25,5 @@
 xml fileName=${QPID_HOME}/${test.config} optional=true/
 xml 
fileName=${QPID_HOME}/etc/config-systests-derby-mem-settings.xml/
 xml fileName=${QPID_HOME}/etc/config-systests-settings.xml/
-xml fileName=${QPID_HOME}/etc/config.xml/
 /override
 /configuration

Modified: qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml?rev=1344276r1=1344275r2=1344276view=diff
==
--- qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml Wed May 30 
14:34:39 2012
@@ -25,6 +25,5 @@
 xml fileName=${QPID_HOME}/${test.config} optional=true/
 xml fileName=${QPID_HOME}/etc/config-systests-derby-settings.xml/
 xml fileName=${QPID_HOME}/etc/config-systests-settings.xml/
-xml fileName=${QPID_HOME}/etc/config.xml/
 /override
 /configuration

Modified: qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml?rev=1344276r1=1344275r2=1344276view=diff
==
--- qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml Wed May 30 
14:34:39 2012
@@ -26,6 +26,5 @@
 xml fileName=${QPID_FIREWALL_CONFIG_SETTINGS} optional=true/
 xml 
fileName=${QPID_HOME}/etc/config-systests-firewall-settings.xml/
 xml fileName=${QPID_HOME}/etc/config-systests-settings.xml/
-xml fileName=${QPID_HOME}/etc/config.xml/
 /override
 /configuration

Modified: qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml?rev=1344276r1=1344275r2=1344276view=diff
==
--- qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml Wed May 30 
14:34:39 2012
@@ -20,7 +20,17 @@
  -
  --
 broker
+prefix${QPID_HOME}/prefix
+work${QPID_WORK}/work
+conf${prefix}/etc/conf
+
+plugin-directory${QPID_HOME}/lib/plugins/plugin-directory
+cache-directory${QPID_WORK}/cache/cache-directory
+
 connector
+!-- To enable SSL edit the keystorePath and keystorePassword

svn commit: r1344343 - in /qpid/proton/trunk/proton-j: ./ src/org/apache/qpid/proton/engine/impl/ src/org/apache/qpid/proton/type/messaging/ src/org/apache/qpid/proton/type/transport/

2012-05-30 Thread rgodfrey

Author: rgodfrey
Date: Wed May 30 16:39:47 2012
New Revision: 1344343

URL: http://svn.apache.org/viewvc?rev=1344343view=rev
Log:
proton-j : get disposition working

Added:

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryStateConverter.java
Modified:
qpid/proton/trunk/proton-j/jproton.py

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportSession.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/type/messaging/Accepted.java

qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/type/transport/Disposition.java

Modified: qpid/proton/trunk/proton-j/jproton.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/jproton.py?rev=1344343r1=1344342r2=1344343view=diff
==
--- qpid/proton/trunk/proton-j/jproton.py (original)
+++ qpid/proton/trunk/proton-j/jproton.py Wed May 30 16:39:47 2012
@@ -197,3 +197,6 @@ def pn_remote_disp(d):
 def pn_local_disp(d):
   if(d.getLocalState() == Accepted.getInstance()):
 return PN_ACCEPTED
+
+def pn_settle(d):
+  d.settle()

Modified: 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1344343r1=1344342r2=1344343view=diff
==
--- 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
 (original)
+++ 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
 Wed May 30 16:39:47 2012
@@ -53,6 +53,8 @@ public class DeliveryImpl implements Del
 private byte[] _data;
 private int _dataSize;
 private boolean _complete;
+private boolean _updated;
+private boolean _done;
 
 public DeliveryImpl(final byte[] tag, final LinkImpl link, DeliveryImpl 
previous)
 {
@@ -104,6 +106,7 @@ public class DeliveryImpl implements Del
 public void settle()
 {
 _settled = true;
+setTransportFlag(DELIVERY_STATE_CHANGED);
 }
 
 DeliveryImpl getLinkNext()
@@ -388,4 +391,26 @@ public class DeliveryImpl implements Del
 {
 _complete = true;
 }
+
+void setRemoteDeliveryState(DeliveryState remoteDeliveryState)
+{
+_remoteDeliveryState = remoteDeliveryState;
+_updated = true;
+}
+
+public boolean isUpdated()
+{
+return _updated;
+}
+
+
+void setDone()
+{
+_done = true;
+}
+
+boolean isDone()
+{
+return _done;
+}
 }

Added: 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryStateConverter.java
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryStateConverter.java?rev=1344343view=auto
==
--- 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryStateConverter.java
 (added)
+++ 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryStateConverter.java
 Wed May 30 16:39:47 2012
@@ -0,0 +1,37 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.proton.engine.impl;
+
+import org.apache.qpid.proton.engine.Accepted;
+
+class DeliveryStateConverter
+{
+
+public static org.apache.qpid.proton.engine.DeliveryState 
convert(org.apache.qpid.proton.type.transport.DeliveryState state)
+{
+if(state instanceof org.apache.qpid.proton.type.messaging.Accepted)
+{
+return Accepted.getInstance();
+}
+return null;
+}
+}

Modified: 
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL:

svn commit: r1344458 - /qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp

2012-05-30 Thread shuston

Author: shuston
Date: Wed May 30 20:58:40 2012
New Revision: 1344458

URL: http://svn.apache.org/viewvc?rev=1344458view=rev
Log:
NO-JIRA Fix signed/unsigned warnings on RHEL 5 w/ Boost 1.33.1

Modified:
qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp

Modified: qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=1344458r1=1344457r2=1344458view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Wed May 30 20:58:40 2012
@@ -1425,40 +1425,40 @@ QPID_AUTO_TEST_CASE(testSetPositionFifo)
 // Verify the front of the queue
 TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Don't 
acquire
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(1, c-last.position); // Numbered from 1
+BOOST_CHECK_EQUAL(1u, c-last.position); // Numbered from 1
 BOOST_CHECK_EQUAL(1, getContent(c-last.payload));
 // Verify the back of the queue
 QueuedMessage qm;
-BOOST_CHECK_EQUAL(10, q-getPosition());
+BOOST_CHECK_EQUAL(10u, q-getPosition());
 BOOST_CHECK(q-find(q-getPosition(), qm)); // Back of the queue
 BOOST_CHECK_EQUAL(10, getContent(qm.payload));
-BOOST_CHECK_EQUAL(10, q-getMessageCount());
+BOOST_CHECK_EQUAL(10u, q-getMessageCount());
 
 // Using setPosition to introduce a gap in sequence numbers.
 q-setPosition(15);
-BOOST_CHECK_EQUAL(10, q-getMessageCount());
-BOOST_CHECK_EQUAL(15, q-getPosition());
+BOOST_CHECK_EQUAL(10u, q-getMessageCount());
+BOOST_CHECK_EQUAL(15u, q-getPosition());
 BOOST_CHECK(q-find(10, qm)); // Back of the queue
 BOOST_CHECK_EQUAL(10, getContent(qm.payload));
 q-deliver(contentMessage(16));
 c-setPosition(9);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(10, c-last.position);
+BOOST_CHECK_EQUAL(10u, c-last.position);
 BOOST_CHECK_EQUAL(10, getContent(c-last.payload));
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(16, c-last.position);
+BOOST_CHECK_EQUAL(16u, c-last.position);
 BOOST_CHECK_EQUAL(16, getContent(c-last.payload));
 
 // Using setPosition to trunkcate the queue
 q-setPosition(5);
-BOOST_CHECK_EQUAL(5, q-getMessageCount());
+BOOST_CHECK_EQUAL(5u, q-getMessageCount());
 q-deliver(contentMessage(6a));
 c-setPosition(4);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(5, c-last.position);
+BOOST_CHECK_EQUAL(5u, c-last.position);
 BOOST_CHECK_EQUAL(5, getContent(c-last.payload));
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(6, c-last.position);
+BOOST_CHECK_EQUAL(6u, c-last.position);
 BOOST_CHECK_EQUAL(6a, getContent(c-last.payload));
 BOOST_CHECK(!q-dispatch(c)); // No more messages.
 }
@@ -1476,22 +1476,22 @@ QPID_AUTO_TEST_CASE(testSetPositionLvq) 
 m-insertCustomProperty(key, values[i]);
 q-deliver(m);
 }
-BOOST_CHECK_EQUAL(3, q-getMessageCount());
+BOOST_CHECK_EQUAL(3u, q-getMessageCount());
 // Verify the front of the queue
 TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Don't 
acquire
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(4, c-last.position); // Numbered from 1
+BOOST_CHECK_EQUAL(4u, c-last.position); // Numbered from 1
 BOOST_CHECK_EQUAL(4, getContent(c-last.payload));
 // Verify the back of the queue
 QueuedMessage qm;
-BOOST_CHECK_EQUAL(6, q-getPosition());
+BOOST_CHECK_EQUAL(6u, q-getPosition());
 BOOST_CHECK(q-find(q-getPosition(), qm)); // Back of the queue
 BOOST_CHECK_EQUAL(6, getContent(qm.payload));
 
 q-setPosition(5);
 c-setPosition(4);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(5, c-last.position); // Numbered from 1
+BOOST_CHECK_EQUAL(5u, c-last.position); // Numbered from 1
 BOOST_CHECK(!q-dispatch(c));
 }
 
@@ -1513,11 +1513,11 @@ QPID_AUTO_TEST_CASE(testSetPositionPrior
 q-setPosition(3);
 TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Browse in 
FIFO order
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(1, c-last.position);
+BOOST_CHECK_EQUAL(1u, c-last.position);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(2, c-last.position);
+BOOST_CHECK_EQUAL(2u, c-last.position);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(3, c-last.position);
+BOOST_CHECK_EQUAL(3u, c-last.position);
 BOOST_CHECK(!q-dispatch(c));
 
 intrusive_ptrMessage m = contentMessage(4a);
@@ -1525,22 +1525,22 @@ QPID_AUTO_TEST_CASE(testSetPositionPrior
 -setPriority(4);
 q-deliver(m);
 BOOST_CHECK(q-dispatch(c));
-BOOST_CHECK_EQUAL(4, c-last.position);
+BOOST_CHECK_EQUAL(4u, c-last.position);
 BOOST_CHECK_EQUAL(4a, getContent(c-last.payload));
 
 // But consumers see priority order
 c.reset(new TestConsumer(test, true));
 BOOST_CHECK(q-dispatch(c));
-

svn commit: r1344180 - /qpid/proton/trunk/proton-c/tests/engine.py

svn commit: r1344181 [2/2] - in /qpid/proton/trunk/proton-c: CMakeLists.txt docs/ docs/api/ docs/api/CMakeLists.txt docs/api/user.doxygen.in include/proton/driver.h include/proton/engine.h include/pro

svn commit: r1344202 - in /qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl: DeliveryImpl.java TransportImpl.java TransportSession.java

svn commit: r1344209 - in /qpid/proton/trunk: ./ design/ design/src/proton/ proton-c/ proton-c/tests/ proton-j/ tests/ tests/proton_tests/

svn commit: r1344211 - /qpid/proton/trunk/config.sh

svn commit: r1344245 - /qpid/proton/trunk/proton-j/jproton.py

svn commit: r1344276 - /qpid/trunk/qpid/java/systests/etc/

svn commit: r1344343 - in /qpid/proton/trunk/proton-j: ./ src/org/apache/qpid/proton/engine/impl/ src/org/apache/qpid/proton/type/messaging/ src/org/apache/qpid/proton/type/transport/

svn commit: r1344458 - /qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp

9 matches

Site Navigation

Mail list logo

Footer information