dsr Mon Dec 18 16:24:16 2006 UTC
Modified files:
/phpdoc/en/reference/sam/functions SAM-Connection-commit.xml
SAM-Connection-connect.xml
SAM-Connection-receive.xml
SAM-Connection-rollback.xml
SAM-Connection-send.xml
Log:
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml
diff -u phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml:1.3
phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml:1.4
--- phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml:1.3 Fri Dec
8 17:20:48 2006
+++ phpdoc/en/reference/sam/functions/SAM-Connection-commit.xml Mon Dec 18
16:24:16 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id='function.SAM-Connection-commit'>
<refnamediv>
<refname>SAMConnection::commit()</refname>
@@ -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.
</para>
- <para>
- Warning: This method is not currently implemented.
- </para>
<classsynopsis>
<ooclass><classname>SAMConnection</classname></ooclass>
<methodsynopsis>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml
diff -u phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml:1.3
phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml:1.4
--- phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml:1.3 Fri Dec
8 17:20:48 2006
+++ phpdoc/en/reference/sam/functions/SAM-Connection-connect.xml Mon Dec
18 16:24:16 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id='function.SAM-Connection-connect'>
<refnamediv>
<refname>SAMConnection::connect()</refname>
@@ -170,9 +170,6 @@
<entry>none</entry>
<entry>
The password to be used when the Messaging Server to which the
connection is being made requires authentication.
- <para>
- Warning: Not yet implemented!
- </para>
</entry>
</row>
<row>
@@ -180,19 +177,13 @@
<entry>SAM_AUTO</entry>
<entry>
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.
- <para>
- Warning: Not yet implemented!
- </para>
- </entry>
+ </entry>
</row>
<row>
<entry>SAM_USERID</entry>
<entry>none</entry>
<entry>
The user id to be used when the Messaging Server to which the
connection is being made requires authentication.
- <para>
- Warning: Not yet implemented!
- </para>
</entry>
</row>
<row>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml
diff -u phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml:1.3
phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml:1.4
--- phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml:1.3 Fri Dec
8 17:20:48 2006
+++ phpdoc/en/reference/sam/functions/SAM-Connection-receive.xml Mon Dec
18 16:24:16 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id='function.SAM-Connection-receive'>
<refnamediv>
<refname>SAMConnection::receive()</refname>
@@ -102,13 +102,13 @@
<example>
<title>Receiving a message from a queue with options</title>
<para>
- 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.
</para>
<programlisting role="php">
<![CDATA[
<?php
-$msg = $conn->receive('queue://receive/test', array(SAM_SELECT => $token,
SAM_WAIT => 10000));
+$msg = $conn->receive('queue://receive/test', array(SAM_CORRELID => $token,
SAM_WAIT => 10000));
?>
]]>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml
diff -u phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml:1.3
phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml:1.4
--- phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml:1.3 Fri Dec
8 17:20:48 2006
+++ phpdoc/en/reference/sam/functions/SAM-Connection-rollback.xml Mon Dec
18 16:24:16 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id='function.SAM-Connection-rollback'>
<refnamediv>
<refname>SAMConnection::rollback()</refname>
@@ -16,9 +16,6 @@
<type>bool</type><methodname>rollback</methodname><void/>
</methodsynopsis>
</classsynopsis>
- <para>
- Warning: This method is not currently implemented.
- </para>
</refsect1>
<refsect1 role="returnvalues">
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sam/functions/SAM-Connection-send.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/sam/functions/SAM-Connection-send.xml
diff -u phpdoc/en/reference/sam/functions/SAM-Connection-send.xml:1.3
phpdoc/en/reference/sam/functions/SAM-Connection-send.xml:1.4
--- phpdoc/en/reference/sam/functions/SAM-Connection-send.xml:1.3 Fri Dec
8 17:20:48 2006
+++ phpdoc/en/reference/sam/functions/SAM-Connection-send.xml Mon Dec 18
16:24:16 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id='function.SAM-Connection-send'>
<refnamediv>
<refname>SAMConnection::send()</refname>
@@ -168,7 +168,7 @@
// 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));
}
?>
]]>
