From 66b884c24c54d5386b74e745dd05a354d076d26c Mon Sep 17 00:00:00 2001 From: Dave Renshaw Date: Mon, 18 Dec 2006 16:24:31 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@225233 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/sam/constants.xml | 35 ++++++++++++------- .../sam/functions/SAM-Connection-commit.xml | 5 +-- .../sam/functions/SAM-Connection-connect.xml | 13 ++----- .../sam/functions/SAM-Connection-receive.xml | 6 ++-- .../sam/functions/SAM-Connection-rollback.xml | 5 +-- .../sam/functions/SAM-Connection-send.xml | 4 +-- reference/sam/reference.xml | 7 +--- 7 files changed, 33 insertions(+), 42 deletions(-) diff --git a/reference/sam/constants.xml b/reference/sam/constants.xml index b5864b47f2..91a9c124d3 100644 --- a/reference/sam/constants.xml +++ b/reference/sam/constants.xml @@ -1,5 +1,5 @@ - +
&reftitle.constants; &extension.constants; @@ -59,6 +59,17 @@ + + + SAM_CORRELID + (string) + + + + Attribute used on receive, send and remove requests to identify specific messages. + + + SAM_DELIVERYMODE @@ -147,6 +158,17 @@ + + + SAM_MESSAGEID + (string) + + + + Attribute used on receive and remove requests to identify specific messages. + + + SAM_NON_PERSISTENT @@ -230,17 +252,6 @@ - - - SAM_SELECT - (string) - - - - Receive attribute used to set the required message selector. - - - SAM_STRING diff --git a/reference/sam/functions/SAM-Connection-commit.xml b/reference/sam/functions/SAM-Connection-commit.xml index 6d22dbd4d7..3bacf5bf1b 100644 --- a/reference/sam/functions/SAM-Connection-commit.xml +++ b/reference/sam/functions/SAM-Connection-commit.xml @@ -1,5 +1,5 @@ - + SAMConnection::commit() @@ -13,9 +13,6 @@ Calling the "commit" method on a Connection object commits (completes) all in-flight transactions that are part of the current unit of work. - - Warning: This method is not currently implemented. - SAMConnection diff --git a/reference/sam/functions/SAM-Connection-connect.xml b/reference/sam/functions/SAM-Connection-connect.xml index b273c5ce6a..1853adab4d 100644 --- a/reference/sam/functions/SAM-Connection-connect.xml +++ b/reference/sam/functions/SAM-Connection-connect.xml @@ -1,5 +1,5 @@ - + SAMConnection::connect() @@ -170,9 +170,6 @@ none The password to be used when the Messaging Server to which the connection is being made requires authentication. - - Warning: Not yet implemented! - @@ -180,19 +177,13 @@ SAM_AUTO Indicates how transactions are handled on this connection. The value may be SAM_AUTO (the default) to allow automatic handling on a per operation basis or SAM_MANUAL to allow the PHP script to control the transaction boundaries. If SAM_MANUAL is used any in-flight transactions will be rolled back if the script is terminated or the connection is closed without a commit being executed. - - Warning: Not yet implemented! - - + SAM_USERID none The user id to be used when the Messaging Server to which the connection is being made requires authentication. - - Warning: Not yet implemented! - diff --git a/reference/sam/functions/SAM-Connection-receive.xml b/reference/sam/functions/SAM-Connection-receive.xml index adc0e60e1e..2da29b9cda 100644 --- a/reference/sam/functions/SAM-Connection-receive.xml +++ b/reference/sam/functions/SAM-Connection-receive.xml @@ -1,5 +1,5 @@ - + SAMConnection::receive() @@ -102,13 +102,13 @@ if (!$msg) { Receiving a message from a queue with options - In this example the SAM_SELECT option is used to specify a selector string to be used to identify the message to receive and also a wait timeout of 10 seconds is specified. + In this example the SAM_CORRELID option is used to specify a correlation id string to be used to identify the message to receive. A wait timeout of 10 seconds is also specified. receive('queue://receive/test', array(SAM_SELECT => $token, SAM_WAIT => 10000)); +$msg = $conn->receive('queue://receive/test', array(SAM_CORRELID => $token, SAM_WAIT => 10000)); ?> ]]> diff --git a/reference/sam/functions/SAM-Connection-rollback.xml b/reference/sam/functions/SAM-Connection-rollback.xml index a76e29a3e3..89ce2f2340 100644 --- a/reference/sam/functions/SAM-Connection-rollback.xml +++ b/reference/sam/functions/SAM-Connection-rollback.xml @@ -1,5 +1,5 @@ - + SAMConnection::rollback() @@ -16,9 +16,6 @@ boolrollback - - Warning: This method is not currently implemented. - diff --git a/reference/sam/functions/SAM-Connection-send.xml b/reference/sam/functions/SAM-Connection-send.xml index 022178fe33..0527e9e3dc 100644 --- a/reference/sam/functions/SAM-Connection-send.xml +++ b/reference/sam/functions/SAM-Connection-send.xml @@ -1,5 +1,5 @@ - + SAMConnection::send() @@ -168,7 +168,7 @@ if (!$correlid) { // The Send failed! echo "Send failed ($conn->errno) $conn->error"; } else { - $resp = $conn->receive('queue://receive/test', array(SAM_SELECT => $correlid)); + $resp = $conn->receive('queue://receive/test', array(SAM_CORRELID => $correlid)); } ?> ]]> diff --git a/reference/sam/reference.xml b/reference/sam/reference.xml index a8398b93cd..7273f79dff 100644 --- a/reference/sam/reference.xml +++ b/reference/sam/reference.xml @@ -1,5 +1,5 @@ - + SAM - Simple Asynchronous Messaging SAM @@ -7,11 +7,6 @@
&reftitle.intro; - - - &warn.experimental; - - This extension provides access to the functionality of messaging and queueing systems, such as the IBM WebSphere MQSeries family of products, from PHP scripts. The interface is designed