Hello community, here is the log from the commit of package php5-pear-Horde_Scribe for openSUSE:Factory checked in at Tue Aug 16 11:50:43 CEST 2011.
-------- --- php5-pear-Horde_Scribe/php5-pear-Horde_Scribe.changes 2011-06-09 15:02:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5-pear-Horde_Scribe/php5-pear-Horde_Scribe.changes 2011-08-15 00:06:36.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Aug 14 22:06:01 UTC 2011 - [email protected] + +- version 1.0.1 +- [cjh] Add dependency on Horde_Thrift. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Horde_Scribe-1.0.0.tgz New: ---- Horde_Scribe-1.0.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Scribe.spec ++++++ --- /var/tmp/diff_new_pack.OfYz3R/_old 2011-08-16 11:49:45.000000000 +0200 +++ /var/tmp/diff_new_pack.OfYz3R/_new 2011-08-16 11:49:45.000000000 +0200 @@ -22,16 +22,16 @@ Summary: PEAR: Scribe Name: php5-pear-Horde_Scribe -Version: 1.0.0 +Version: 1.0.1 Release: 1 -License: Apache 2.0 +License: ASL 2.0 Group: Development/Libraries/PHP Source0: http://pear.horde.org/get/Horde_Scribe-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Scribe BuildRequires: php5-pear >= 1.4.7 BuildRequires: php5-pear-channel-horde -Requires: php5-pear-channel-horde +Requires: php5-pear-channel-horde php5-pear-Horde_Thrift BuildArch: noarch %define pear_name Horde_Scribe %define pear_sname horde_scribe @@ -74,23 +74,24 @@ # Install XML package description mkdir -p %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml -cp -p package.xml %{buildroot}%{xmldir}/Horde_Scribe.xml +cp -p package.xml %{buildroot}%{xmldir}/%{pear_name}.xml %clean rm -rf %{buildroot} %post -pear install --nodeps --soft --force --register-only %{xmldir}/Horde_Scribe.xml +pear install --nodeps --soft --force --register-only %{xmldir}/%{pear_name}.xml %postun if [ "$1" -eq "0" ]; then - pear uninstall --nodeps --ignore-errors --register-only pear.horde.org/Horde_Scribe + pear uninstall --nodeps --ignore-errors --register-only pear.horde.org/%{pear_name} fi %files %defattr(-,root,root) %{peardir}/* -%{xmldir}/Horde_Scribe.xml +%{xmldir}/%{pear_name}.xml +%{_docdir}/%{name} %changelog ++++++ Horde_Scribe-1.0.0.tgz -> Horde_Scribe-1.0.1.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.0/examples/Horde/Scribe/scribe.php new/Horde_Scribe-1.0.0/examples/Horde/Scribe/scribe.php --- old/Horde_Scribe-1.0.0/examples/Horde/Scribe/scribe.php 2011-04-06 01:18:10.000000000 +0200 +++ new/Horde_Scribe-1.0.0/examples/Horde/Scribe/scribe.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -<?php -/** - * Simple Scribe logging example - * - * @category Horde - * @package Scribe - */ - -require 'Horde/Autoloader.php'; - -$scribe = new Horde_Scribe_Client(); -$scribe->connect('localhost', 1463); -$scribe->log('keyword', 'This is a message for the keyword category'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.0/lib/Horde/Scribe/Client.php new/Horde_Scribe-1.0.0/lib/Horde/Scribe/Client.php --- old/Horde_Scribe-1.0.0/lib/Horde/Scribe/Client.php 2011-04-06 01:18:10.000000000 +0200 +++ new/Horde_Scribe-1.0.0/lib/Horde/Scribe/Client.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -<?php -/** - * @category Horde - * @package Scribe - */ - -/** - * @category Horde - * @package Scribe - */ -class Horde_Scribe_Client implements Horde_Scribe -{ - /** - * @var TFramedTransport - */ - private $_transport; - - /** - * @var scribeClient - */ - private $_client; - - public function connect($host = 'localhost', $port = 1463) - { - $socket = new TSocket($host, $port, true); - $this->_transport = new TFramedTransport($socket); - $protocol = new TBinaryProtocol($this->_transport, false, false); - $this->_client = new scribeClient($protocol, $protocol); - } - - public function log($category, $message) - { - $this->logMulti(array($this->makeEntry($category, $message))); - } - - public function logMulti(array $messages) - { - $this->_transport->open(); - $this->_client->Log($messages); - $this->_transport->close(); - } - - public function makeEntry($category, $message) - { - return new LogEntry(array('category' => $category, 'message' => $message)); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.0/lib/Horde/Scribe.php new/Horde_Scribe-1.0.0/lib/Horde/Scribe.php --- old/Horde_Scribe-1.0.0/lib/Horde/Scribe.php 2011-04-06 01:18:10.000000000 +0200 +++ new/Horde_Scribe-1.0.0/lib/Horde/Scribe.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<?php -/** - * Fake class to autoload Scribe and required Thrift classes - */ -interface Horde_Scribe extends Horde_Thrift -{ -} - -include_once $GLOBALS['THRIFT_ROOT'] . '/scribe.php'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php new/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php --- old/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php 2011-04-06 01:18:10.000000000 +0200 +++ new/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -<?php -/** - * Autogenerated by Thrift - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - */ -include_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php'; - -include_once $GLOBALS['THRIFT_ROOT'].'/packages/fb303/fb303_types.php'; - -$GLOBALS['E_ResultCode'] = array( - 'OK' => 0, - 'TRY_LATER' => 1, -); - -final class ResultCode { - const OK = 0; - const TRY_LATER = 1; - static public $__names = array( - 0 => 'OK', - 1 => 'TRY_LATER', - ); -} - -class LogEntry { - static $_TSPEC; - - public $category = null; - public $message = null; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 1 => array( - 'var' => 'category', - 'type' => TType::STRING, - ), - 2 => array( - 'var' => 'message', - 'type' => TType::STRING, - ), - ); - } - if (is_array($vals)) { - if (isset($vals['category'])) { - $this->category = $vals['category']; - } - if (isset($vals['message'])) { - $this->message = $vals['message']; - } - } - } - - public function getName() { - return 'LogEntry'; - } - - public function read($input) - { - $xfer = 0; - $fname = null; - $ftype = 0; - $fid = 0; - $xfer += $input->readStructBegin($fname); - while (true) - { - $xfer += $input->readFieldBegin($fname, $ftype, $fid); - if ($ftype == TType::STOP) { - break; - } - switch ($fid) - { - case 1: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->category); - } else { - $xfer += $input->skip($ftype); - } - break; - case 2: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->message); - } else { - $xfer += $input->skip($ftype); - } - break; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('LogEntry'); - if ($this->category !== null) { - $xfer += $output->writeFieldBegin('category', TType::STRING, 1); - $xfer += $output->writeString($this->category); - $xfer += $output->writeFieldEnd(); - } - if ($this->message !== null) { - $xfer += $output->writeFieldBegin('message', TType::STRING, 2); - $xfer += $output->writeString($this->message); - $xfer += $output->writeFieldEnd(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - -?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/scribe.php new/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/scribe.php --- old/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/scribe.php 2011-04-06 01:18:10.000000000 +0200 +++ new/Horde_Scribe-1.0.0/lib/Horde/Thrift/thrift_root/scribe.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,285 +0,0 @@ -<?php -/** - * Autogenerated by Thrift - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - */ -include_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php'; - -include_once $GLOBALS['THRIFT_ROOT'].'/packages/scribe/scribe_types.php'; -include_once $GLOBALS['THRIFT_ROOT'].'/packages/fb303/FacebookService.php'; - -interface scribeIf extends FacebookServiceIf { - public function Log($messages); -} - -class scribeClient extends FacebookServiceClient implements scribeIf { - public function __construct($input, $output=null) { - parent::__construct($input, $output); - } - - public function Log($messages) - { - $this->send_Log($messages); - return $this->recv_Log(); - } - - public function send_Log($messages) - { - $args = new scribe_Log_args(); - $args->messages = $messages; - $bin_accel = ($this->output_ instanceof TProtocol::$TBINARYPROTOCOLACCELERATED) && function_exists('thrift_protocol_write_binary'); - if ($bin_accel) - { - thrift_protocol_write_binary($this->output_, 'Log', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); - } - else - { - $this->output_->writeMessageBegin('Log', TMessageType::CALL, $this->seqid_); - $args->write($this->output_); - $this->output_->writeMessageEnd(); - $this->output_->getTransport()->flush(); - } - } - - public function recv_Log() - { - $bin_accel = ($this->input_ instanceof TProtocol::$TBINARYPROTOCOLACCELERATED) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, 'scribe_Log_result', $this->input_->isStrictRead()); - else - { - $rseqid = 0; - $fname = null; - $mtype = 0; - - $this->input_->readMessageBegin($fname, $mtype, $rseqid); - if ($mtype == TMessageType::EXCEPTION) { - $x = new TApplicationException(); - $x->read($this->input_); - $this->input_->readMessageEnd(); - throw $x; - } - $result = new scribe_Log_result(); - $result->read($this->input_); - $this->input_->readMessageEnd(); - } - if ($result->success !== null) { - return $result->success; - } - throw new Exception("Log failed: unknown result"); - } - -} - -// HELPER FUNCTIONS AND STRUCTURES - -class scribe_Log_args { - static $_TSPEC; - - public $messages = null; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 1 => array( - 'var' => 'messages', - 'type' => TType::LST, - 'etype' => TType::STRUCT, - 'elem' => array( - 'type' => TType::STRUCT, - 'class' => 'LogEntry', - ), - ), - ); - } - if (is_array($vals)) { - if (isset($vals['messages'])) { - $this->messages = $vals['messages']; - } - } - } - - public function getName() { - return 'scribe_Log_args'; - } - - public function read($input) - { - $xfer = 0; - $fname = null; - $ftype = 0; - $fid = 0; - $xfer += $input->readStructBegin($fname); - while (true) - { - $xfer += $input->readFieldBegin($fname, $ftype, $fid); - if ($ftype == TType::STOP) { - break; - } - switch ($fid) - { - case 1: - if ($ftype == TType::LST) { - $this->messages = array(); - $_size0 = 0; - $_etype3 = 0; - $xfer += $input->readListBegin($_etype3, $_size0); - for ($_i4 = 0; $_i4 < $_size0; ++$_i4) - { - $elem5 = null; - $elem5 = new LogEntry(); - $xfer += $elem5->read($input); - $this->messages []= $elem5; - } - $xfer += $input->readListEnd(); - } else { - $xfer += $input->skip($ftype); - } - break; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('scribe_Log_args'); - if ($this->messages !== null) { - if (!is_array($this->messages)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('messages', TType::LST, 1); - { - $output->writeListBegin(TType::STRUCT, count($this->messages)); - { - foreach ($this->messages as $iter6) - { - $xfer += $iter6->write($output); - } - } - $output->writeListEnd(); - } - $xfer += $output->writeFieldEnd(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - -class scribe_Log_result { - static $_TSPEC; - - public $success = null; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 0 => array( - 'var' => 'success', - 'type' => TType::I32, - ), - ); - } - if (is_array($vals)) { - if (isset($vals['success'])) { - $this->success = $vals['success']; - } - } - } - - public function getName() { - return 'scribe_Log_result'; - } - - public function read($input) - { - $xfer = 0; - $fname = null; - $ftype = 0; - $fid = 0; - $xfer += $input->readStructBegin($fname); - while (true) - { - $xfer += $input->readFieldBegin($fname, $ftype, $fid); - if ($ftype == TType::STOP) { - break; - } - switch ($fid) - { - case 0: - if ($ftype == TType::I32) { - $xfer += $input->readI32($this->success); - } else { - $xfer += $input->skip($ftype); - } - break; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('scribe_Log_result'); - if ($this->success !== null) { - $xfer += $output->writeFieldBegin('success', TType::I32, 0); - $xfer += $output->writeI32($this->success); - $xfer += $output->writeFieldEnd(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - -class scribeProcessor extends FacebookServiceProcessor { - public function __construct($handler) { - parent::__construct($handler); - } - - public function process($input, $output) { - $rseqid = 0; - $fname = null; - $mtype = 0; - - $input->readMessageBegin($fname, $mtype, $rseqid); - $methodname = 'process_'.$fname; - if (!method_exists($this, $methodname)) { - $input->skip(TType::STRUCT); - $input->readMessageEnd(); - $x = new TApplicationException('Function '.$fname.' not implemented.', TApplicationException::UNKNOWN_METHOD); - $output->writeMessageBegin($fname, TMessageType::EXCEPTION, $rseqid); - $x->write($output); - $output->writeMessageEnd(); - $output->getTransport()->flush(); - return; - } - $this->$methodname($rseqid, $input, $output); - return true; - } - - protected function process_Log($seqid, $input, $output) { - $args = new scribe_Log_args(); - $args->read($input); - $input->readMessageEnd(); - $result = new scribe_Log_result(); - $result->success = $this->handler_->Log($args->messages); - $output->writeMessageBegin('Log', TMessageType::REPLY, $seqid); - $result->write($output); - $output->getTransport()->flush(); - } -} -?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.1/doc/Horde/Scribe/examples/scribe.php new/Horde_Scribe-1.0.1/doc/Horde/Scribe/examples/scribe.php --- old/Horde_Scribe-1.0.1/doc/Horde/Scribe/examples/scribe.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Horde_Scribe-1.0.1/doc/Horde/Scribe/examples/scribe.php 2011-07-27 16:42:47.000000000 +0200 @@ -0,0 +1,13 @@ +<?php +/** + * Simple Scribe logging example + * + * @category Horde + * @package Scribe + */ + +require 'Horde/Autoloader.php'; + +$scribe = new Horde_Scribe_Client(); +$scribe->connect('localhost', 1463); +$scribe->log('keyword', 'This is a message for the keyword category'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.1/lib/Horde/Scribe/Client.php new/Horde_Scribe-1.0.1/lib/Horde/Scribe/Client.php --- old/Horde_Scribe-1.0.1/lib/Horde/Scribe/Client.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Horde_Scribe-1.0.1/lib/Horde/Scribe/Client.php 2011-07-27 16:42:47.000000000 +0200 @@ -0,0 +1,47 @@ +<?php +/** + * @category Horde + * @package Scribe + */ + +/** + * @category Horde + * @package Scribe + */ +class Horde_Scribe_Client implements Horde_Scribe +{ + /** + * @var TFramedTransport + */ + private $_transport; + + /** + * @var scribeClient + */ + private $_client; + + public function connect($host = 'localhost', $port = 1463) + { + $socket = new TSocket($host, $port, true); + $this->_transport = new TFramedTransport($socket); + $protocol = new TBinaryProtocol($this->_transport, false, false); + $this->_client = new scribeClient($protocol, $protocol); + } + + public function log($category, $message) + { + $this->logMulti(array($this->makeEntry($category, $message))); + } + + public function logMulti(array $messages) + { + $this->_transport->open(); + $this->_client->Log($messages); + $this->_transport->close(); + } + + public function makeEntry($category, $message) + { + return new LogEntry(array('category' => $category, 'message' => $message)); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.1/lib/Horde/Scribe.php new/Horde_Scribe-1.0.1/lib/Horde/Scribe.php --- old/Horde_Scribe-1.0.1/lib/Horde/Scribe.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Horde_Scribe-1.0.1/lib/Horde/Scribe.php 2011-07-27 16:42:47.000000000 +0200 @@ -0,0 +1,9 @@ +<?php +/** + * Fake class to autoload Scribe and required Thrift classes + */ +interface Horde_Scribe extends Horde_Thrift +{ +} + +include_once $GLOBALS['THRIFT_ROOT'] . '/scribe.php'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php new/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php --- old/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php 2011-07-27 16:42:47.000000000 +0200 @@ -0,0 +1,117 @@ +<?php +/** + * Autogenerated by Thrift + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + */ +include_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php'; + +include_once $GLOBALS['THRIFT_ROOT'].'/packages/fb303/fb303_types.php'; + +$GLOBALS['E_ResultCode'] = array( + 'OK' => 0, + 'TRY_LATER' => 1, +); + +final class ResultCode { + const OK = 0; + const TRY_LATER = 1; + static public $__names = array( + 0 => 'OK', + 1 => 'TRY_LATER', + ); +} + +class LogEntry { + static $_TSPEC; + + public $category = null; + public $message = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'category', + 'type' => TType::STRING, + ), + 2 => array( + 'var' => 'message', + 'type' => TType::STRING, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['category'])) { + $this->category = $vals['category']; + } + if (isset($vals['message'])) { + $this->message = $vals['message']; + } + } + } + + public function getName() { + return 'LogEntry'; + } + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) + { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) + { + case 1: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->category); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->message); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) { + $xfer = 0; + $xfer += $output->writeStructBegin('LogEntry'); + if ($this->category !== null) { + $xfer += $output->writeFieldBegin('category', TType::STRING, 1); + $xfer += $output->writeString($this->category); + $xfer += $output->writeFieldEnd(); + } + if ($this->message !== null) { + $xfer += $output->writeFieldBegin('message', TType::STRING, 2); + $xfer += $output->writeString($this->message); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + +?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/scribe.php new/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/scribe.php --- old/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/scribe.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Horde_Scribe-1.0.1/lib/Horde/Thrift/thrift_root/scribe.php 2011-07-27 16:42:47.000000000 +0200 @@ -0,0 +1,285 @@ +<?php +/** + * Autogenerated by Thrift + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + */ +include_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php'; + +include_once $GLOBALS['THRIFT_ROOT'].'/packages/scribe/scribe_types.php'; +include_once $GLOBALS['THRIFT_ROOT'].'/packages/fb303/FacebookService.php'; + +interface scribeIf extends FacebookServiceIf { + public function Log($messages); +} + +class scribeClient extends FacebookServiceClient implements scribeIf { + public function __construct($input, $output=null) { + parent::__construct($input, $output); + } + + public function Log($messages) + { + $this->send_Log($messages); + return $this->recv_Log(); + } + + public function send_Log($messages) + { + $args = new scribe_Log_args(); + $args->messages = $messages; + $bin_accel = ($this->output_ instanceof TProtocol::$TBINARYPROTOCOLACCELERATED) && function_exists('thrift_protocol_write_binary'); + if ($bin_accel) + { + thrift_protocol_write_binary($this->output_, 'Log', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + } + else + { + $this->output_->writeMessageBegin('Log', TMessageType::CALL, $this->seqid_); + $args->write($this->output_); + $this->output_->writeMessageEnd(); + $this->output_->getTransport()->flush(); + } + } + + public function recv_Log() + { + $bin_accel = ($this->input_ instanceof TProtocol::$TBINARYPROTOCOLACCELERATED) && function_exists('thrift_protocol_read_binary'); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, 'scribe_Log_result', $this->input_->isStrictRead()); + else + { + $rseqid = 0; + $fname = null; + $mtype = 0; + + $this->input_->readMessageBegin($fname, $mtype, $rseqid); + if ($mtype == TMessageType::EXCEPTION) { + $x = new TApplicationException(); + $x->read($this->input_); + $this->input_->readMessageEnd(); + throw $x; + } + $result = new scribe_Log_result(); + $result->read($this->input_); + $this->input_->readMessageEnd(); + } + if ($result->success !== null) { + return $result->success; + } + throw new Exception("Log failed: unknown result"); + } + +} + +// HELPER FUNCTIONS AND STRUCTURES + +class scribe_Log_args { + static $_TSPEC; + + public $messages = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'messages', + 'type' => TType::LST, + 'etype' => TType::STRUCT, + 'elem' => array( + 'type' => TType::STRUCT, + 'class' => 'LogEntry', + ), + ), + ); + } + if (is_array($vals)) { + if (isset($vals['messages'])) { + $this->messages = $vals['messages']; + } + } + } + + public function getName() { + return 'scribe_Log_args'; + } + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) + { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) + { + case 1: + if ($ftype == TType::LST) { + $this->messages = array(); + $_size0 = 0; + $_etype3 = 0; + $xfer += $input->readListBegin($_etype3, $_size0); + for ($_i4 = 0; $_i4 < $_size0; ++$_i4) + { + $elem5 = null; + $elem5 = new LogEntry(); + $xfer += $elem5->read($input); + $this->messages []= $elem5; + } + $xfer += $input->readListEnd(); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) { + $xfer = 0; + $xfer += $output->writeStructBegin('scribe_Log_args'); + if ($this->messages !== null) { + if (!is_array($this->messages)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('messages', TType::LST, 1); + { + $output->writeListBegin(TType::STRUCT, count($this->messages)); + { + foreach ($this->messages as $iter6) + { + $xfer += $iter6->write($output); + } + } + $output->writeListEnd(); + } + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + +class scribe_Log_result { + static $_TSPEC; + + public $success = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 0 => array( + 'var' => 'success', + 'type' => TType::I32, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['success'])) { + $this->success = $vals['success']; + } + } + } + + public function getName() { + return 'scribe_Log_result'; + } + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) + { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) + { + case 0: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->success); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) { + $xfer = 0; + $xfer += $output->writeStructBegin('scribe_Log_result'); + if ($this->success !== null) { + $xfer += $output->writeFieldBegin('success', TType::I32, 0); + $xfer += $output->writeI32($this->success); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + +class scribeProcessor extends FacebookServiceProcessor { + public function __construct($handler) { + parent::__construct($handler); + } + + public function process($input, $output) { + $rseqid = 0; + $fname = null; + $mtype = 0; + + $input->readMessageBegin($fname, $mtype, $rseqid); + $methodname = 'process_'.$fname; + if (!method_exists($this, $methodname)) { + $input->skip(TType::STRUCT); + $input->readMessageEnd(); + $x = new TApplicationException('Function '.$fname.' not implemented.', TApplicationException::UNKNOWN_METHOD); + $output->writeMessageBegin($fname, TMessageType::EXCEPTION, $rseqid); + $x->write($output); + $output->writeMessageEnd(); + $output->getTransport()->flush(); + return; + } + $this->$methodname($rseqid, $input, $output); + return true; + } + + protected function process_Log($seqid, $input, $output) { + $args = new scribe_Log_args(); + $args->read($input); + $input->readMessageEnd(); + $result = new scribe_Log_result(); + $result->success = $this->handler_->Log($args->messages); + $output->writeMessageBegin('Log', TMessageType::REPLY, $seqid); + $result->write($output); + $output->getTransport()->flush(); + } +} +?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.xml new/package.xml --- old/package.xml 2011-04-06 01:18:10.000000000 +0200 +++ new/package.xml 2011-07-27 16:42:47.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<package packagerversion="1.9.2" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0"; xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd";> +<package packagerversion="1.9.3" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0"; xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd";> <name>Horde_Scribe</name> <channel>pear.horde.org</channel> <summary>Scribe</summary> @@ -10,10 +10,10 @@ <email>[email protected]</email> <active>yes</active> </lead> - <date>2011-04-06</date> - <time>01:18:10</time> + <date>2011-07-27</date> + <time>16:42:47</time> <version> - <release>1.0.0</release> + <release>1.0.1</release> <api>1.0.0</api> </version> <stability> @@ -22,11 +22,11 @@ </stability> <license uri="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0</license> <notes> -* First stable release for Horde 4. +* [cjh] Add dependency on Horde_Thrift. </notes> <contents> <dir baseinstalldir="/" name="/"> - <file baseinstalldir="/" md5sum="81495ed0794745745f8290307b8314ef" name="examples/Horde/Scribe/scribe.php" role="php" /> + <file baseinstalldir="/" md5sum="81495ed0794745745f8290307b8314ef" name="doc/Horde/Scribe/examples/scribe.php" role="doc" /> <file baseinstalldir="/" md5sum="a3a65deea8c8891bab5ce2a2836e99d9" name="lib/Horde/Scribe/Client.php" role="php" /> <file baseinstalldir="/" md5sum="dee3718425ae79b3d5a126a1a12b3bfb" name="lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php" role="php" /> <file baseinstalldir="/" md5sum="9ccacfc871e7d8d9915aaa84d5285633" name="lib/Horde/Thrift/thrift_root/scribe.php" role="php" /> @@ -41,11 +41,15 @@ <pearinstaller> <min>1.7.0</min> </pearinstaller> + <package> + <name>Horde_Thrift</name> + <channel>pear.horde.org</channel> + </package> </required> </dependencies> <phprelease> <filelist> - <install as="examples/Horde/Scribe/scribe.php" name="examples/Horde/Scribe/scribe.php" /> + <install as="examples/scribe.php" name="doc/Horde/Scribe/examples/scribe.php" /> <install as="Horde/Scribe.php" name="lib/Horde/Scribe.php" /> <install as="Horde/Scribe/Client.php" name="lib/Horde/Scribe/Client.php" /> <install as="Horde/Thrift/thrift_root/scribe.php" name="lib/Horde/Thrift/thrift_root/scribe.php" /> @@ -129,5 +133,20 @@ * First stable release for Horde 4. </notes> </release> + <release> + <version> + <release>1.0.1</release> + <api>1.0.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2011-07-27</date> + <license uri="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0</license> + <notes> +* [cjh] Add dependency on Horde_Thrift. + </notes> + </release> </changelog> </package> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
