matthew
2010-09-10 14:31:34 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22932] laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php: WindowsAzure query object integration</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22932</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-10 07:31:33 -0700 (Fri, 10 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>WindowsAzure query object integration
- Removed _assembleQuery method, and implemented usage of WindowsAzure query
object</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterWindowsAzurephp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterWindowsAzurephp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php (22931 => 22932)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php 2010-09-10 14:31:25 UTC (rev 22931)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php 2010-09-10 14:31:33 UTC (rev 22932)
</span><span class="lines">@@ -1,455 +1,459 @@
</span><del>-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license-C1q0ot2/***@public.gmane.org so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage DocumentService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-require_once 'Zend/Cloud/DocumentService/Exception.php';
-require_once 'Zend/Cloud/DocumentService/Adapter.php';
-require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
-
-/**
- * SimpleDB adapter for document service.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage DocumentService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_Cloud_DocumentService_Adapter_WindowsAzure implements Zend_Cloud_DocumentService_Adapter
-{
- /*
- * Options array keys for the Azure adapter.
- */
- const ACCOUNT_NAME = 'storage_accountname';
- const ACCOUNT_KEY = 'storage_accountkey';
- const HOST = "storage_host";
- const PROXY_HOST = "storage_proxy_host";
- const PROXY_PORT = "storage_proxy_port";
- const PROXY_CREDENTIALS = "storage_proxy_credentials";
-
- const PARTITION_KEY = 'PartitionKey';
- const ROW_KEY = 'RowKey';
- const VERIFY_ETAG = "verify_etag";
-
- const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE;
-
- /**
- * Azure service instance.
- *
- * @var Zend_Service_WindowsAzure_Storage_Table
- */
- protected $_storageClient;
-
- /**
- * Constructor
- *
- * @param array $options
- * @return void
- */
- public function __construct($options = array())
- {
- if ($options instanceof Zend_Config) {
- $options = $options->toArray();
- }
-
- if (empty($options)) {
- $options = array();
- }
-
- if (!is_array($options)) {
- throw new Zend_Cloud_DocumentService_Exception('Invalid options provided');
- }
-
- // Build Zend_Service_WindowsAzure_Storage_Blob instance
- if (!isset($options[self::HOST])) {
- $host = self::DEFAULT_HOST;
- } else {
- $host = $options[self::HOST];
- }
-
- if (! isset($options[self::ACCOUNT_NAME])) {
- throw new Zend_Cloud_DocumentService_Exception('No Windows Azure account name provided.');
- }
-
- if (! isset($options[self::ACCOUNT_KEY])) {
- throw new Zend_Cloud_DocumentService_Exception('No Windows Azure account key provided.');
- }
-
- // TODO: support $usePathStyleUri and $retryPolicy
- try {
- $this->_storageClient = new Zend_Service_WindowsAzure_Storage_Table(
- $host, $options[self::ACCOUNT_NAME], $options[self::ACCOUNT_KEY]);
- // Parse other options
- if (! empty($options[self::PROXY_HOST])) {
- $proxyHost = $options[self::PROXY_HOST];
- $proxyPort = isset($options[self::PROXY_PORT]) ? $options[self::PROXY_PORT] : 8080;
- $proxyCredentials = isset($options[self::PROXY_CREDENTIALS]) ? $options[self::PROXY_CREDENTIALS] : '';
- $this->_storageClient->setProxy(true, $proxyHost, $proxyPort, $proxyCredentials);
- }
- if (isset($options[self::HTTP_ADAPTER])) {
- $this->_storageClient->setHttpClientChannel($options[self::HTTP_ADAPTER]);
- }
- } catch(Zend_Service_WindowsAzure_Exception $e) {
</del><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22932] laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php: WindowsAzure query object integration</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22932</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-10 07:31:33 -0700 (Fri, 10 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>WindowsAzure query object integration
- Removed _assembleQuery method, and implemented usage of WindowsAzure query
object</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterWindowsAzurephp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterWindowsAzurephp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php (22931 => 22932)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php 2010-09-10 14:31:25 UTC (rev 22931)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php 2010-09-10 14:31:33 UTC (rev 22932)
</span><span class="lines">@@ -1,455 +1,459 @@
</span><del>-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license-C1q0ot2/***@public.gmane.org so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage DocumentService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-require_once 'Zend/Cloud/DocumentService/Exception.php';
-require_once 'Zend/Cloud/DocumentService/Adapter.php';
-require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
-
-/**
- * SimpleDB adapter for document service.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage DocumentService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_Cloud_DocumentService_Adapter_WindowsAzure implements Zend_Cloud_DocumentService_Adapter
-{
- /*
- * Options array keys for the Azure adapter.
- */
- const ACCOUNT_NAME = 'storage_accountname';
- const ACCOUNT_KEY = 'storage_accountkey';
- const HOST = "storage_host";
- const PROXY_HOST = "storage_proxy_host";
- const PROXY_PORT = "storage_proxy_port";
- const PROXY_CREDENTIALS = "storage_proxy_credentials";
-
- const PARTITION_KEY = 'PartitionKey';
- const ROW_KEY = 'RowKey';
- const VERIFY_ETAG = "verify_etag";
-
- const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE;
-
- /**
- * Azure service instance.
- *
- * @var Zend_Service_WindowsAzure_Storage_Table
- */
- protected $_storageClient;
-
- /**
- * Constructor
- *
- * @param array $options
- * @return void
- */
- public function __construct($options = array())
- {
- if ($options instanceof Zend_Config) {
- $options = $options->toArray();
- }
-
- if (empty($options)) {
- $options = array();
- }
-
- if (!is_array($options)) {
- throw new Zend_Cloud_DocumentService_Exception('Invalid options provided');
- }
-
- // Build Zend_Service_WindowsAzure_Storage_Blob instance
- if (!isset($options[self::HOST])) {
- $host = self::DEFAULT_HOST;
- } else {
- $host = $options[self::HOST];
- }
-
- if (! isset($options[self::ACCOUNT_NAME])) {
- throw new Zend_Cloud_DocumentService_Exception('No Windows Azure account name provided.');
- }
-
- if (! isset($options[self::ACCOUNT_KEY])) {
- throw new Zend_Cloud_DocumentService_Exception('No Windows Azure account key provided.');
- }
-
- // TODO: support $usePathStyleUri and $retryPolicy
- try {
- $this->_storageClient = new Zend_Service_WindowsAzure_Storage_Table(
- $host, $options[self::ACCOUNT_NAME], $options[self::ACCOUNT_KEY]);
- // Parse other options
- if (! empty($options[self::PROXY_HOST])) {
- $proxyHost = $options[self::PROXY_HOST];
- $proxyPort = isset($options[self::PROXY_PORT]) ? $options[self::PROXY_PORT] : 8080;
- $proxyCredentials = isset($options[self::PROXY_CREDENTIALS]) ? $options[self::PROXY_CREDENTIALS] : '';
- $this->_storageClient->setProxy(true, $proxyHost, $proxyPort, $proxyCredentials);
- }
- if (isset($options[self::HTTP_ADAPTER])) {
- $this->_storageClient->setHttpClientChannel($options[self::HTTP_ADAPTER]);
- }
- } catch(Zend_Service_WindowsAzure_Exception $e) {
</del><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>