From olio-commits-returnmoorealexander@example.net Mon Mar 02 21:04:57 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 81397 invoked from network); 2 Mar 2009 21:04:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Mar 2009 21:04:57 -0000 Received: (qmail 72658 invoked by uid 500); 2 Mar 2009 21:04:57 -0000 Delivered-To: moorealexander@example.net Received: (qmail 72648 invoked by uid 500); 2 Mar 2009 21:04:57 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 72635 invoked by uid 99); 2 Mar 2009 21:04:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 13:04:56 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 21:04:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C6B823888CA; Mon, 2 Mar 2009 21:04:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749434 - in /incubator/olio/webapp/php/trunk: ./ classes/ etc/ public_html/ views/ Date: Mon, 02 Mar 2009 21:04:31 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: shanti Date: Mon Mar 2 21:04:31 2009 New Revision: 749434 URL: http://svn.apache.org/viewvc?rev=749434&view=rev Log: Fix for OLIO-33 in the PHP web application. With these changes, the only pending name changes from 'web20' to 'olio' is the name of the database and the user/password to the database. These are being left unchanged for now so as not to force users to recreate their database. Modified: incubator/olio/webapp/php/trunk/build.xml incubator/olio/webapp/php/trunk/classes/CacheSystem.php incubator/olio/webapp/php/trunk/classes/DBConnection.php incubator/olio/webapp/php/trunk/classes/FileSystem.php incubator/olio/webapp/php/trunk/classes/Geocoder.php incubator/olio/webapp/php/trunk/classes/LocalFS.php incubator/olio/webapp/php/trunk/classes/MemCached.php incubator/olio/webapp/php/trunk/classes/MogileFS.php incubator/olio/webapp/php/trunk/classes/ODBCConnection.php incubator/olio/webapp/php/trunk/classes/PDOConnection.php incubator/olio/webapp/php/trunk/etc/config.php incubator/olio/webapp/php/trunk/public_html/addPersonResult.php incubator/olio/webapp/php/trunk/public_html/fileService.php incubator/olio/webapp/php/trunk/public_html/getAppConfig.php incubator/olio/webapp/php/trunk/views/addEvent.php incubator/olio/webapp/php/trunk/views/addPerson.php incubator/olio/webapp/php/trunk/views/site.php Modified: incubator/olio/webapp/php/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/build.xml?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/build.xml (original) +++ incubator/olio/webapp/php/trunk/build.xml Mon Mar 2 21:04:31 2009 @@ -4,10 +4,10 @@ * * Use is subject to license terms. --> -<project name="Web20PHP" default="package"> +<project name="OlioPHP" default="package"> <target name="package"> - <zip destfile="web20php2.zip"> - <zipfileset dir="." prefix="web20php2"> + <zip destfile="oliophp.zip"> + <zipfileset dir="." prefix="oliophp"> <include name="classes/**"/> <include name="controllers/**"/> <include name="etc/**"/> Modified: incubator/olio/webapp/php/trunk/classes/CacheSystem.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/CacheSystem.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/CacheSystem.php (original) +++ incubator/olio/webapp/php/trunk/classes/CacheSystem.php Mon Mar 2 21:04:31 2009 @@ -20,13 +20,13 @@ abstract class CacheSystem { static function getInstance() { - $classname = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheSystem']; + $classname = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheSystem']; return new $classname; } static function isCachingActive() { - return W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheSystem'] != 'NoCache'; + return Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheSystem'] != 'NoCache'; } abstract function flush(); Modified: incubator/olio/webapp/php/trunk/classes/DBConnection.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/DBConnection.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/DBConnection.php (original) +++ incubator/olio/webapp/php/trunk/classes/DBConnection.php Mon Mar 2 21:04:31 2009 @@ -24,21 +24,21 @@ static function getInstance() { - $classname = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbDriver'] . 'Connection'; + $classname = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbDriver'] . 'Connection'; $instance = new $classname; $instance->writeInstance = false; return $instance; } static function getWriteInstance() { - $classname = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbDriver'] . 'Connection'; + $classname = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbDriver'] . 'Connection'; $instance = new $classname; $instance->writeInstance = true; return $instance; } function selectInstance() { - $this->dbTarget = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbTarget']; + $this->dbTarget = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbTarget']; if (is_array($this->dbTarget)) { if ($this->writeInstance || count($this->dbTarget) == 1) { $this->dbTarget = $this->dbTarget[0]; @@ -60,4 +60,4 @@ abstract function rollback(); } -?> \ No newline at end of file +?> Modified: incubator/olio/webapp/php/trunk/classes/FileSystem.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/FileSystem.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/FileSystem.php (original) +++ incubator/olio/webapp/php/trunk/classes/FileSystem.php Mon Mar 2 21:04:31 2009 @@ -20,7 +20,7 @@ abstract class FileSystem { static function getInstance() { - $classname = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['fileSystem']; + $classname = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['fileSystem']; return new $classname; } Modified: incubator/olio/webapp/php/trunk/classes/Geocoder.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/Geocoder.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/Geocoder.php (original) +++ incubator/olio/webapp/php/trunk/classes/Geocoder.php Mon Mar 2 21:04:31 2009 @@ -27,7 +27,7 @@ $this->city = $city; $this->state = $state; $this->zip = $zip; - $url = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['geocoderURL'].'?appid=gsd5f&street='. + $url = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['geocoderURL'].'?appid=gsd5f&street='. $this->street.'&city='.$this->city. '&state='.$this->state.'&zip='.$this0->zip; $stream = $this->curl_string($url); @@ -43,7 +43,7 @@ private function curl_string($url) { $ch = curl_init(); - $geoProxy = trim(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['proxy']); + $geoProxy = trim(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['proxy']); if (strlen($geoProxy) > 0) { curl_setopt($ch, CURLOPT_PROXY, $geoProxy); } else { Modified: incubator/olio/webapp/php/trunk/classes/LocalFS.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/LocalFS.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/LocalFS.php (original) +++ incubator/olio/webapp/php/trunk/classes/LocalFS.php Mon Mar 2 21:04:31 2009 @@ -26,7 +26,7 @@ class LocalFS extends FileSystem { function __construct() { - $this->localFSRoot = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['localfsRoot']; + $this->localFSRoot = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['localfsRoot']; } function getRootDir() { Modified: incubator/olio/webapp/php/trunk/classes/MemCached.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/MemCached.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/MemCached.php (original) +++ incubator/olio/webapp/php/trunk/classes/MemCached.php Mon Mar 2 21:04:31 2009 @@ -22,7 +22,7 @@ function __construct() { // TODO: Support host:port arrays. $this->memcache = new Memcache(); - foreach (W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['memcachedHosts'] as $host) { + foreach (Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['memcachedHosts'] as $host) { list($ip,$port)=split(':',$host,2); if ($port == null) $port = 11211; Modified: incubator/olio/webapp/php/trunk/classes/MogileFS.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/MogileFS.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/MogileFS.php (original) +++ incubator/olio/webapp/php/trunk/classes/MogileFS.php Mon Mar 2 21:04:31 2009 @@ -32,9 +32,9 @@ * TODO */ function __construct() { - $this->domain = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsDomain']; - $this->hosts = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsHosts']; - $this->root = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsRoot']; + $this->domain = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsDomain']; + $this->hosts = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsHosts']; + $this->root = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['mogilefsRoot']; $this->error = ''; } Modified: incubator/olio/webapp/php/trunk/classes/ODBCConnection.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/ODBCConnection.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/ODBCConnection.php (original) +++ incubator/olio/webapp/php/trunk/classes/ODBCConnection.php Mon Mar 2 21:04:31 2009 @@ -27,7 +27,7 @@ } if (!isset($this->connection)) { $this->connection = odbc_connect($this->dbTarget, - W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbUser'], W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbPass']); + Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbUser'], Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbPass']); if (is_resource($this->connection)) throw new Exception("Unable to connect ".$this->dbTarget."!"); } Modified: incubator/olio/webapp/php/trunk/classes/PDOConnection.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/classes/PDOConnection.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/classes/PDOConnection.php (original) +++ incubator/olio/webapp/php/trunk/classes/PDOConnection.php Mon Mar 2 21:04:31 2009 @@ -27,7 +27,7 @@ } if (!isset($this->connection)) { $this->connection = new PDO($this->dbTarget, - W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbUser'], W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbPass'], + Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbUser'], Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['dbPass'], array(PDO888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTR_PERSISTENT => true)); $this->connection->setAttribute(PDO888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MYSQL_ATTR_USE_BUFFERED_QUERY, true); $this->connection->setAttribute( // throw exception on error. Modified: incubator/olio/webapp/php/trunk/etc/config.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/config.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/etc/config.php (original) +++ incubator/olio/webapp/php/trunk/etc/config.php Mon Mar 2 21:04:31 2009 @@ -17,43 +17,43 @@ * limitations under the License. */ -$web20config['includes'] = $_SERVER['DOCUMENT_ROOT'] . '/../includes/'; +$olioconfig['includes'] = $_SERVER['DOCUMENT_ROOT'] . '/../includes/'; -$web20config['dbDriver'] = 'PDO'; // Which DB driver to use. -// $web20config['dbTarget'] = 'myodbc3'; // ODBC target in odbc.ini. +$olioconfig['dbDriver'] = 'PDO'; // Which DB driver to use. +// $olioconfig['dbTarget'] = 'myodbc3'; // ODBC target in odbc.ini. -$web20config['dbTarget'] = 'mysql:host=localhost;dbname=web20load'; // PDO target. +$olioconfig['dbTarget'] = 'mysql:host=localhost;dbname=web20load'; // PDO target. // For master/slave clusters, specify dbTarget as an array, listing the master first. -// $web20config['dbTarget'] = array('mysql:host=master;dbname=web20load', +// $olioconfig['dbTarget'] = array('mysql:host=master;dbname=web20load', // 'mysql:host=slave1;dbname=web20load', // 'mysql:host=slave2;dbname=web20load'); -$web20config['dbUser'] = 'web20'; // DB user name. +$olioconfig['dbUser'] = 'web20'; // DB user name. -$web20config['dbPass'] = 'web20'; // DB password. +$olioconfig['dbPass'] = 'web20'; // DB password. -$web20config['cacheSystem'] = 'MemCached'; +$olioconfig['cacheSystem'] = 'MemCached'; // Use below line for no cache - WARNING: db load will increase -//$web20config['cacheSystem'] = 'NoCache'; +//$olioconfig['cacheSystem'] = 'NoCache'; -$web20config['cacheExpire'] = 7200; // Expiry time for memcache on set function in seconds +$olioconfig['cacheExpire'] = 7200; // Expiry time for memcache on set function in seconds -$web20config['fileSystem'] = 'LocalFS'; +$olioconfig['fileSystem'] = 'LocalFS'; -$web20config['localfsRoot'] = '/filestore'; +$olioconfig['localfsRoot'] = '/filestore'; -$web20config['memcachedHosts'] = array('MEMCACHED_HOST:11211'); // memcached host ip +$olioconfig['memcachedHosts'] = array('MEMCACHED_HOST:11211'); // memcached host ip // For multiple instances, use the below line -// $web20config['memcachedHosts'] = array('MEMCACHED_HOST1:port', 'MEMCACHED_HOST2:port'); // memcached host ip +// $olioconfig['memcachedHosts'] = array('MEMCACHED_HOST1:port', 'MEMCACHED_HOST2:port'); // memcached host ip -$web20config['geocoderURL'] = 'http://GEOCODER_HOST:8080/geocoder/geocode'; //Geocoder URL +$olioconfig['geocoderURL'] = 'http://GEOCODER_HOST:8080/geocoder/geocode'; //Geocoder URL -class Web20 { +class Olio { public static $config; } // Make the config available through the static in the class. -W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config = $web20config; +Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config = $olioconfig; function __autoload($class_name) { Modified: incubator/olio/webapp/php/trunk/public_html/addPersonResult.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/public_html/addPersonResult.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/public_html/addPersonResult.php (original) +++ incubator/olio/webapp/php/trunk/public_html/addPersonResult.php Mon Mar 2 21:04:31 2009 @@ -65,8 +65,8 @@ unlink($user_image_location); unlink($thumb_location); } else { - $modified_image_name = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "userphotomissing.gif"; - $imagethumb = W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "userphotomissing.gif"; + $modified_image_name = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "userphotomissing.gif"; + $imagethumb = Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "userphotomissing.gif"; } $geocode = new Geocoder($street1, $city, $state, $zip); Modified: incubator/olio/webapp/php/trunk/public_html/fileService.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/public_html/fileService.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/public_html/fileService.php (original) +++ incubator/olio/webapp/php/trunk/public_html/fileService.php Mon Mar 2 21:04:31 2009 @@ -58,7 +58,7 @@ $fs = FileSystem888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getInstance(); $paths = $fs->getPaths($fileName); - //$cache->set($fileName, $paths, 0, W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheExpire']); + //$cache->set($fileName, $paths, 0, Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['cacheExpire']); $path_keys = array_keys($paths); $pathkeycount = count($path_keys); $i=0; @@ -73,7 +73,7 @@ } else { $contentType = $mimeTypes['gif']; header('Content-Type: ' . $contentType); - readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . 'notavailable.gif'); + readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . 'notavailable.gif'); } // }else{ // $path_keys = array_keys($memcachegetPaths); @@ -90,7 +90,7 @@ // } // if ($cacheFlag == "true"){ - // $cache->set($filename, file_get_contents($filename), $web20config['cacheExpire']); + // $cache->set($filename, file_get_contents($filename), $olioconfig['cacheExpire']); // } // } else { // echo $content; Modified: incubator/olio/webapp/php/trunk/public_html/getAppConfig.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/public_html/getAppConfig.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/public_html/getAppConfig.php (original) +++ incubator/olio/webapp/php/trunk/public_html/getAppConfig.php Mon Mar 2 21:04:31 2009 @@ -21,19 +21,19 @@ echo "This is the configuration setup for the application........<br/>"; echo "<br/>"; -echo "<b>Installation base for apache package : </b> ".$web20config['apacheinstallBase']."<br/>"; -echo "<b>Installation base for php : </b> ".$web20config['phpinstallBase']."<br/>"; -echo "<b>Installation base for mysql : </b> ".$web20config['mysqlinstallBase']."<br/>"; -echo "<b>Installation base for memcached : </b> ".$web20config['memcachedinstallBase']."<br/>"; -echo "<b>Installation base for mogilefs : </b> ".$web20config['mogilefsinstallBase']."<br/>"; -echo "<b>The directory that directly corresponds to urlBase : </b> ".$web20config['siteBase']."<br/>"; -echo "<b>Base url for the site : </b> ".$web20config['urlBase']."<br/>"; -echo "<b>Expiry time for memcache on set function in seconds : </b> ".$web20config['cacheExpire']."<br/>"; -echo "<b>Mogilefs host ip & port number : </b> ".$web20config['mogilefsHost']."<br/>"; -echo "<b>Memcached host ip : </b> ".$web20config['memcachedHost']."<br/>"; -echo "<b>Gecoder Emulator host ip : </b> ".$web20config['geocoderHost']."<br/>"; -echo "<b>Flag set for 'onuseradd' tag : </b> ".$web20config['onuseradd']."<br/>"; -echo "<b>Flag set for 'personrequested' tag : </b> ".$web20config['personrequested']."<br/>"; -echo "<b>Flag set for 'top10events' tag : </b> ".$web20config['top10events']."<br/>"; -echo "<b>Flag set for 'tagcloud' tag : </b> ".$web20config['tagcloud']."<br/>"; +echo "<b>Installation base for apache package : </b> ".$olioconfig['apacheinstallBase']."<br/>"; +echo "<b>Installation base for php : </b> ".$olioconfig['phpinstallBase']."<br/>"; +echo "<b>Installation base for mysql : </b> ".$olioconfig['mysqlinstallBase']."<br/>"; +echo "<b>Installation base for memcached : </b> ".$olioconfig['memcachedinstallBase']."<br/>"; +echo "<b>Installation base for mogilefs : </b> ".$olioconfig['mogilefsinstallBase']."<br/>"; +echo "<b>The directory that directly corresponds to urlBase : </b> ".$olioconfig['siteBase']."<br/>"; +echo "<b>Base url for the site : </b> ".$olioconfig['urlBase']."<br/>"; +echo "<b>Expiry time for memcache on set function in seconds : </b> ".$olioconfig['cacheExpire']."<br/>"; +echo "<b>Mogilefs host ip & port number : </b> ".$olioconfig['mogilefsHost']."<br/>"; +echo "<b>Memcached host ip : </b> ".$olioconfig['memcachedHost']."<br/>"; +echo "<b>Gecoder Emulator host ip : </b> ".$olioconfig['geocoderHost']."<br/>"; +echo "<b>Flag set for 'onuseradd' tag : </b> ".$olioconfig['onuseradd']."<br/>"; +echo "<b>Flag set for 'personrequested' tag : </b> ".$olioconfig['personrequested']."<br/>"; +echo "<b>Flag set for 'top10events' tag : </b> ".$olioconfig['top10events']."<br/>"; +echo "<b>Flag set for 'tagcloud' tag : </b> ".$olioconfig['tagcloud']."<br/>"; ?> Modified: incubator/olio/webapp/php/trunk/views/addEvent.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/views/addEvent.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/views/addEvent.php (original) +++ incubator/olio/webapp/php/trunk/views/addEvent.php Mon Mar 2 21:04:31 2009 @@ -57,28 +57,28 @@ <label for="event_timestamp">Event date and time</label><br/> <select id="year" name="year"> <? - require(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "year.php"); + require(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "year.php"); ?> </select> <select id="month" name="month"> <? - require(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "month.php"); + require(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "month.php"); ?> </select> <select id="day" name="day"> <? - require(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "day.php"); + require(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "day.php"); ?> </select> &mdash;<br/> <select id="hour" name="hour"> <? - require(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "hour.php"); + require(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "hour.php"); ?> </select> : <select id="minute" name="minute"> <? - require(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "minute.php"); + require(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "minute.php"); ?> </select> </p> @@ -130,7 +130,7 @@ <label for="country">Country</label> <select id="country" name="country"> <? - readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "countries.html"); + readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "countries.html"); if(!is_null($se)){ echo '<option selected="selected" value="'.$country.'">'.$country.'</option>'; } Modified: incubator/olio/webapp/php/trunk/views/addPerson.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/views/addPerson.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/views/addPerson.php (original) +++ incubator/olio/webapp/php/trunk/views/addPerson.php Mon Mar 2 21:04:31 2009 @@ -88,7 +88,7 @@ <label for="timezone">Timezone</label> <select id="timezone" name="timezone"> <? - readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "timezones.html"); + readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "timezones.html"); if(!is_null($uname)){ echo '<option selected="selected" value="'.$tz.'">'.$tz.'</option>'; } @@ -126,7 +126,7 @@ <label for="country">Country</label> <select id="country" name="country"> <? - readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "countries.html"); + readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "countries.html"); if(!is_null($uname)){ echo '<option selected="selected" value="'.$country.'">'.$country.'</option>'; } Modified: incubator/olio/webapp/php/trunk/views/site.php URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/views/site.php?rev=749434&r1=749433&r2=749434&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/views/site.php (original) +++ incubator/olio/webapp/php/trunk/views/site.php Mon Mar 2 21:04:31 2009 @@ -43,7 +43,7 @@ <? if(is_null($_SESSION["uname"])){ ?> <div id="inline_login"> <a name="login"></a> - <? readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "login.html"); ?> + <? readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "login.html"); ?> </div> <? } ?> <ul id="main_nav"> @@ -123,7 +123,7 @@ </div> <div id="footer"> - <? readfile(W888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "footer.html"); ?> + <? readfile(Olio888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4$config['includes'] . "footer.html"); ?> </div> </div> From olio-commits-returnmoorealexander@example.net Mon Mar 02 21:12:20 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 83044 invoked from network); 2 Mar 2009 21:12:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Mar 2009 21:12:20 -0000 Received: (qmail 77814 invoked by uid 500); 2 Mar 2009 21:12:20 -0000 Delivered-To: moorealexander@example.net Received: (qmail 77795 invoked by uid 500); 2 Mar 2009 21:12:20 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 77784 invoked by uid 99); 2 Mar 2009 21:12:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 13:12:20 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 21:12:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CBEA423888F1; Mon, 2 Mar 2009 21:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749436 - /incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb Date: Mon, 02 Mar 2009 21:11:59 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: wsobel Date: Mon Mar 2 21:11:59 2009 New Revision: 749436 URL: http://svn.apache.org/viewvc?rev=749436&view=rev Log: Fix for OLIO-57: Increased size of description and summary to increase database size Added: incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb Added: incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb?rev=749436&view=auto ============================================================================== --- incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb (added) +++ incubator/olio/webapp/rails/trunk/db/migrate/20090302210151_increase_db_field_sizes.rb Mon Mar 2 21:11:59 2009 @@ -0,0 +1,11 @@ +class IncreaseDbFieldSizes < ActiveRecor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Migration + def self.up + change_column :events, :description, :text + change_column :events, :summary, :string, :limit => 1024 + end + + def self.down + change_column :events, :description, :string, :limit => 500 + change_column :events, :summary, :string, :limit => 100 + end +end From olio-commits-returnmoorealexander@example.net Thu Mar 05 18:17:45 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 59990 invoked from network); 5 Mar 2009 18:17:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Mar 2009 18:17:45 -0000 Received: (qmail 37719 invoked by uid 500); 5 Mar 2009 18:17:45 -0000 Delivered-To: moorealexander@example.net Received: (qmail 37707 invoked by uid 500); 5 Mar 2009 18:17:45 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 37696 invoked by uid 99); 5 Mar 2009 18:17:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 10:17:45 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 18:17:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6747823888F4; Thu, 5 Mar 2009 18:17:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750534 - /incubator/olio/webapp/rails/trunk/app/models/geolocation.rb Date: Thu, 05 Mar 2009 18:17:22 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: shanti Date: Thu Mar 5 18:17:19 2009 New Revision: 750534 URL: http://svn.apache.org/viewvc?rev=750534&view=rev Log: Fix for OLIO-64. Modified: incubator/olio/webapp/rails/trunk/app/models/geolocation.rb Modified: incubator/olio/webapp/rails/trunk/app/models/geolocation.rb URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/app/models/geolocation.rb?rev=750534&r1=750533&r2=750534&view=diff ============================================================================== --- incubator/olio/webapp/rails/trunk/app/models/geolocation.rb (original) +++ incubator/olio/webapp/rails/trunk/app/models/geolocation.rb Thu Mar 5 18:17:19 2009 @@ -4,7 +4,7 @@ class Geolocation attr_reader :address, :city, :state, :zip, :country, :latitude, :longitude - @@url = 'http://localhost:8080/Web20Emulator/geocode?appid=gsd5f' + @@url = 'http://localhost:8080/geocoder/geocode?appid=gsd5f' def self.url=(url) @@url = url From olio-commits-returnmoorealexander@example.net Thu Mar 05 19:17:27 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 96713 invoked from network); 5 Mar 2009 19:17:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Mar 2009 19:17:27 -0000 Received: (qmail 85274 invoked by uid 500); 5 Mar 2009 19:17:27 -0000 Delivered-To: moorealexander@example.net Received: (qmail 85265 invoked by uid 500); 5 Mar 2009 19:17:27 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 85253 invoked by uid 99); 5 Mar 2009 19:17:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 11:17:27 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 19:17:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 602D42388962; Thu, 5 Mar 2009 19:16:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750556 - in /incubator/olio/webapp/php/trunk/etc: httpd.conf my.cnf php.ini Date: Thu, 05 Mar 2009 19:16:56 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: shanti Date: Thu Mar 5 19:16:55 2009 New Revision: 750556 URL: http://svn.apache.org/viewvc?rev=750556&view=rev Log: Fix for OLIO-65. Changed php.ini and httpd.conf to only include entries we need changed to run Olio. Replaced my.cnf file with a minimum set necessary to run MySQL optimally. Modified: incubator/olio/webapp/php/trunk/etc/httpd.conf incubator/olio/webapp/php/trunk/etc/my.cnf incubator/olio/webapp/php/trunk/etc/php.ini Modified: incubator/olio/webapp/php/trunk/etc/httpd.conf URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/httpd.conf?rev=750556&r1=750555&r2=750556&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/etc/httpd.conf (original) +++ incubator/olio/webapp/php/trunk/etc/httpd.conf Thu Mar 5 19:16:55 2009 @@ -1,484 +1,37 @@ +# This file documents the changes required to your apache configuration file. # -# This is the main Apache HTTP server configuration file. It contains the -# configuration directives that give the server its instructions. -# See <URL:http://httpd.apache.org/docs/2.2> for detailed information. -# In particular, see -# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html> -# for a discussion of each configuration directive. +# Change DocumentRoot to point to the olioapp's public_html directory +# For e.g: On OpenSolaris, this will be: +DocumentRoot "/var/apache2/2.2/htdocs/olioapp/public_html" # -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "/opt/coolstack/apache2" will be interpreted by the -# server as "/opt/coolstack/apache2/logs/foo.log". - -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# Do not add a slash at the end of the directory path. If you point -# ServerRoot at a non-local disk, be sure to point the LockFile directive -# at a local disk. If you wish to share the same ServerRoot for multiple -# httpd daemons, you will need to change at least LockFile and PidFile. -# - -ServerRoot "/opt/coolstack/apache2" - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, instead of the default. See also the <VirtualHost> -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses. -# -#Listen 83.161.120.155:80 -Listen 8080 - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -# -# Many of the modules below are being disabled, to improve performance. -# Uncomment the ones your installation needs. -# -LoadModule authn_file_module modules/mod_authn_file.so -LoadModule authn_dbm_module modules/mod_authn_dbm.so -LoadModule authn_anon_module modules/mod_authn_anon.so - -# No dbd driver - do not enable this -#LoadModule authn_dbd_module modules/mod_authn_dbd.so - -LoadModule authn_default_module modules/mod_authn_default.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule authz_groupfile_module modules/mod_authz_groupfile.so -LoadModule authz_user_module modules/mod_authz_user.so -LoadModule authz_dbm_module modules/mod_authz_dbm.so -LoadModule authz_owner_module modules/mod_authz_owner.so -LoadModule authz_default_module modules/mod_authz_default.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule auth_digest_module modules/mod_auth_digest.so -LoadModule cache_module modules/mod_cache.so -LoadModule mem_cache_module modules/mod_mem_cache.so -# -# Do not enable dbd -#LoadModule dbd_module modules/mod_dbd.so - -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule ext_filter_module modules/mod_ext_filter.so -LoadModule include_module modules/mod_include.so -#LoadModule filter_module modules/mod_filter.so -LoadModule deflate_module modules/mod_deflate.so -LoadModule ldap_module modules/mod_ldap.so -LoadModule log_config_module modules/mod_log_config.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule logio_module modules/mod_logio.so -LoadModule env_module modules/mod_env.so -LoadModule mime_magic_module modules/mod_mime_magic.so -#LoadModule cern_meta_module modules/mod_cern_meta.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -#LoadModule ident_module modules/mod_ident.so -#LoadModule usertrack_module modules/mod_usertrack.so -#LoadModule unique_id_module modules/mod_unique_id.so -LoadModule setenvif_module modules/mod_setenvif.so -#LoadModule version_module modules/mod_version.so -LoadModule ssl_module modules/mod_ssl.so -LoadModule mime_module modules/mod_mime.so -#LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -#LoadModule asis_module modules/mod_asis.so -LoadModule info_module modules/mod_info.so -LoadModule suexec_module modules/mod_suexec.so -LoadModule cgi_module modules/mod_cgi.so -#LoadModule dav_fs_module modules/mod_dav_fs.so -#LoadModule vhost_alias_module modules/mod_vhost_alias.so -LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -#LoadModule imagemap_module modules/mod_imagemap.so -#LoadModule actions_module modules/mod_actions.so -#LoadModule speling_module modules/mod_speling.so -LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -LoadModule rewrite_module modules/mod_rewrite.so -#LoadModule perl_module modules/mod_perl.so -LoadModule php5_module modules/libphp5.so - -<IfModule !mpm_netware_module> -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# It is usually good practice to create a dedicated user and group for -# running httpd, as with most system services. -# -# Changing from the default of daemon to webserved - Solaris standard -User webservd -Group webservd -</IfModule> - -# 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# <VirtualHost> definition. These values also provide defaults for -# any <VirtualHost> containers you may define later in the file. -# -# All of these directives may appear inside <VirtualHost> containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. moorealexander@example.net -# -ServerAdmin moorealexander@example.net - -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# -#ServerName www.brazilian.sfbay.sun.com:8080 - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "/opt/coolstack/apache2/htdocs/web20php2/public_html" -#DocumentRoot "/opt/coolstack/apache2/htdocs/" -# -# Each directory to which Apache has access can be configured with respect -# to which services and features are allowed and/or disabled in that -# directory (and its subdirectories). -# -# First, we configure the "default" to be a very restrictive set of -# features. -# -<Directory /> - Options FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all -</Directory> - -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - +# Create permission settings for this DocumentRoot +# The following is an example : # # This should be changed to whatever you set DocumentRoot to. # -<Directory "/opt/coolstack/apache2/htdocs/web20php2/public_html"> - # - # Possible values for the Options directive are "None", "All", - # or any combination of: - # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews - # - # Note that "MultiViews" must be named *explicitly* --- "Options All" - # doesn't give it to you. - # - # The Options directive is both complicated and important. Please see - # http://httpd.apache.org/docs/2.2/mod/core.html#options - # for more information. - # +<Directory "/var/apache2/2.2/htdocs/olioapp/public_html"> Options Indexes FollowSymLinks - - # - # AllowOverride controls what directives may be placed in .htaccess files. - # It can be "All", "None", or any combination of the keywords: - # Options FileInfo AuthConfig Limit - # AllowOverride None - - # - # Controls who can get stuff from this server. - # Order allow,deny Allow from all - </Directory> # -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# -<IfModule dir_module> - DirectoryIndex index.php index.html -</IfModule> - -# -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. -# -<FilesMatch "^\.ht"> - Order allow,deny - Deny from all - Satisfy All -</FilesMatch> - -# # ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a <VirtualHost> -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a <VirtualHost> -# container, that host's errors will be logged there and not here. -# +# Faban expects the error_log file to be named 'error_log'. It can be located anywhere. ErrorLog logs/error_log -# -# LogLevel: Control the number of messages logged to the error_log. -# Possible values include: debug, info, notice, warn, error, crit, -# alert, emerg. -# -LogLevel warn - -<IfModule log_config_module> - # - # The following directives define some format nicknames for use with - # a CustomLog directive (see below). - # - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined - LogFormat "%h %l %u %t \"%r\" %>s %b" common - - <IfModule logio_module> - # You need to enable mod_logio.c to use %I and %O - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - </IfModule> - - # - # The location and format of the access logfile (Common Logfile Format). - # If you do not define any access logfiles within a <VirtualHost> - # container, they will be logged here. Contrariwise, if you *do* - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # - CustomLog logs/access_log common - - # - # If you prefer a logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # - #CustomLog logs/access_log combined -</IfModule> - -<IfModule alias_module> - # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client - # will make a new request for the document at its new location. - # Example: - # Redirect permanent /foo http://www.example.com/bar - - # - # Alias: Maps web paths into filesystem paths and is used to - # access content that does not live under the DocumentRoot. - # Example: - # Alias /webpath /full/filesystem/path - # - # If you include a trailing / on /webpath then the server will - # require it to be present in the URL. You will also likely - # need to provide a <Directory> section to allow access to - # the filesystem path. - - # - # ScriptAlias: This controls which directories contain server scripts. - # ScriptAliases are essentially the same as Aliases, except that - # documents in the target directory are treated as applications and - # run by the server when requested rather than as documents sent to the - # client. The same rules about trailing "/" apply to ScriptAlias - # directives as to Alias. - # - ScriptAlias /cgi-bin/ "/opt/coolstack/apache2/cgi-bin/" - -</IfModule> - -<IfModule cgid_module> - # - # ScriptSock: On threaded servers, designate the path to the UNIX - # socket used to communicate with the CGI daemon of mod_cgid. - # - #Scriptsock logs/cgisock -</IfModule> - -# -# "/opt/coolstack/apache2/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# -<Directory "/opt/coolstack/apache2/cgi-bin"> - AllowOverride None - Options None - Order allow,deny - Allow from all -</Directory> - -# -# DefaultType: the default MIME type the server will use for a document -# if it cannot otherwise determine one, such as from filename extensions. -# If your server contains mostly text or HTML documents, "text/plain" is -# a good value. If most of your content is binary, such as applications -# or images, you may want to use "application/octet-stream" instead to -# keep browsers from trying to display binary files as though they are -# text. -# -DefaultType text/plain - -<IfModule mime_module> - # - # TypesConfig points to the file containing the list of mappings from - # filename extension to MIME-type. - # - TypesConfig conf/mime.types - - # - # AddType allows you to add to or override the MIME configuration - # file specified in TypesConfig for specific file types. - # - #AddType application/x-gzip .tgz - # - # AddEncoding allows you to have certain browsers uncompress - # information on the fly. Note: Not all browsers support this. - # - #AddEncoding x-compress .Z - #AddEncoding x-gzip .gz .tgz - # - # If the AddEncoding directives above are commented-out, then you - # probably should define those extensions to indicate media types: - # - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - #AddType application/x-httpd-php .xml - - # PHP support - - PHPINIDIR /opt/coolstack/php5/lib - AddType application/x-httpd-php .php .phtml - AddType application/x-httpd-php-source .phps - - # - # AddHandler allows you to map certain file extensions to "handlers": - # actions unrelated to filetype. These can be either built into the server - # or added with the Action directive (see below) - # - # To use CGI scripts outside of ScriptAliased directories: - # (You will also need to add "ExecCGI" to the "Options" directive.) - # - #AddHandler cgi-script .cgi - - # For type maps (negotiated resources): - #AddHandler type-map var - - # - # Filters allow you to process content before it is sent to the client. - # - # To parse .shtml files for server-side includes (SSI): - # (You will also need to add "Includes" to the "Options" directive.) - # - #AddType text/html .shtml - #AddOutputFilter INCLUDES .shtml +# We recommend the following to help scale apache. We used these settings +# to run 5000 active users. You can adjust the values depending on how +# many users you plan to run. + +<IfModule prefork.c> + ListenBacklog 16384 + ServerLimit 8192 + MaxClients 8192 + MaxRequestsPerChild 0 + StartServers 128 + MinSpareServers 20 + MaxSpareServers 128 </IfModule> -# -# The mod_mime_magic module allows the server to use various hints from the -# contents of the file itself to determine its type. The MIMEMagicFile -# directive tells the module where the hint definitions are located. -# -#MIMEMagicFile conf/magic - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# EnableMMAP and EnableSendfile: On systems that support it, -# memory-mapping or the sendfile syscall is used to deliver -# files. This usually improves server performance, but must -# be turned off when serving from networked-mounted -# filesystems or if support for these functions is otherwise -# broken on your system. -# -#EnableMMAP off -#EnableSendfile off - -# Supplemental configuration -# -# The configuration files in the conf/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as -# necessary. - -# Server-pool management (MPM specific) -Include conf/extra/httpd-mpm.conf - -# Multi-language error messages -#Include conf/extra/httpd-multilang-errordoc.conf - -# Fancy directory listings -#Include conf/extra/httpd-autoindex.conf - -# Language settings -#Include conf/extra/httpd-languages.conf - -# User home directories -#Include conf/extra/httpd-userdir.conf - -# Real-time info on requests and configuration -#Include conf/extra/httpd-info.conf - -# Virtual hosts -#Include conf/extra/httpd-vhosts.conf - -# Local access to the Apache HTTP Server Manual -#Include conf/extra/httpd-manual.conf - -# Distributed authoring and versioning (WebDAV) -#Include conf/extra/httpd-dav.conf - -# Various default settings -#Include conf/extra/httpd-default.conf - -# Secure (SSL/TLS) connections -# Uncomment the following line if you want SSL enabled and configure entries -# in this file. See ServerName, SSLCertificateFile, SSLCertificateKeyFile -# in conf/extra/httpd-ssl.conf - -#Include conf/extra/httpd-ssl.conf -# -# Note: The following must must be present to support -# starting without SSL on platforms with no /dev/random equivalent -# but a statically compiled-in mod_ssl. -# -<IfModule ssl_module> -SSLRandomSeed startup builtin -SSLRandomSeed connect builtin -</IfModule> Modified: incubator/olio/webapp/php/trunk/etc/my.cnf URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/my.cnf?rev=750556&r1=750555&r2=750556&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/etc/my.cnf (original) +++ incubator/olio/webapp/php/trunk/etc/my.cnf Thu Mar 5 19:16:55 2009 @@ -1,159 +1,38 @@ -# Example MySQL config file for very large systems. -# -# This is for a large system with memory of 1G-2G where the system runs mainly -# MySQL. -# -# You can copy this file to -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is /var/mysql/5.0/data) or -# ~/.my.cnf to set user-specific options. -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients +# Sample my.cnf. This file is complete and can be used as is after +# editing the data and log dirs. [client] -#password = your_password -port = 3306 -socket = /tmp/mysql.sock - -# Here follows entries for some specific programs +port=3306 +socket=/tmp/mysql.sock -# The MySQL server [mysqld] -port = 3306 -socket = /tmp/mysql.sock -skip-locking -key_buffer = 384M -max_connections=4000 -max_allowed_packet = 1M -table_cache = 512 -sort_buffer_size = 2M -read_buffer_size = 2M -read_rnd_buffer_size = 8M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size = 32M -# Try number of CPU's*2 for thread_concurrency -thread_concurrency = 8 - -#default-storage-engine=innodb - -# Don't listen on a TCP/IP moorealexander@example.net. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -#skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; -# -# where you replace <host>, <user>, <password> by quoted strings and -# <port> by the master's port number (3306 by default). -# -# Example: -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = <hostname> -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = <username> -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = <password> -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = <port> -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Point the following paths to different dedicated disks -tmpdir = /tmp/ -log-update = /tmp/data/abhi - -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 384M -#bdb_max_lock = 100000 -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /opt/coolstack/mysql_32bit/data -innodb_data_home_dir = /tmp/data -innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend -innodb_log_group_home_dir = /tmp/mysql_32bit/data -#innodb_log_arch_dir = /opt/coolstack/mysql_32bit/data -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -innodb_buffer_pool_size = 1600M -innodb_additional_mem_pool_size = 20M -# Set .._log_file_size to 25 % of buffer pool size +back_log=1000 +# Tune max_connections based on expected load +max_connections=10000 +set-variable=tmpdir=/var/tmp + +# Other tunables for performance +table_open_cache=2048 +thread_cache=40 +join_buffer_size = 8M + +default-storage-engine=innodb + +# innodb parameters +# change innodb_data_home_dir and innodb_log_group_home_dir depending on +# where you're locating the database +innodb_buffer_pool_size = 2G +innodb_data_file_path = ibdata1:2000M;ibdata2:100M:autoextend +innodb_data_home_dir = /data innodb_log_file_size = 100M -innodb_log_buffer_size = 8M +innodb_log_files_in_group = 3 +innodb_log_group_home_dir = /data +innodb_autoextend_increment = 100M +innodb_doublewrite = 0 innodb_flush_log_at_trx_commit = 2 -innodb_lock_wait_timeout = 50 + +[isamchk] +set-variable=key_buffer=12M [mysqldump] quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[isamchk] -key_buffer = 256M -sort_buffer_size = 256M -read_buffer = 2M -write_buffer = 2M - -[myisamchk] -key_buffer = 256M -sort_buffer_size = 256M -read_buffer = 2M -write_buffer = 2M -[mysqlhotcopy] -interactive-timeout Modified: incubator/olio/webapp/php/trunk/etc/php.ini URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/php.ini?rev=750556&r1=750555&r2=750556&view=diff ============================================================================== --- incubator/olio/webapp/php/trunk/etc/php.ini (original) +++ incubator/olio/webapp/php/trunk/etc/php.ini Thu Mar 5 19:16:55 2009 @@ -1,59 +1,28 @@ -[PHP] -#cgi.fix_pathinfo = 1 -memory_limit = 64M ; Maximum amount of memory a script may consume (8MB) -default_socket_timeout = 1800 - +; This file explains the changes needed in your php.ini to run Olio. +; +; Saving sessions to /tmp is recommended on Solaris/OpenSolaris as /tmp +; is on swap and avoid file i/o [Session] -session.use_cookies = 1 -session.cookie_lifetime = 0 -session.gc_probability = 1 -session.gc_divisor = 5000 -session.gc_maxlifetime = 6000 -session.entropy_file = "/dev/urandom" -session.save_path = "/tmp" +session.save_path="/tmp/http_sessions" +; For running more than 5000 users, use: +; session.save_path="1;/tmp/http-sessions" -include_path=/opt/coolstack/php5/lib/php:. -extension_dir=/opt/coolstack/php5/lib/php/extensions/no-debug-non-zts-20060613 +; These are the required extensions for Olio. extension="apc.so" extension="pdo_mysql.so" extension="odbc.so" extension="curl.so" extension="memcache.so" extension="gd.so" -;extension="dtrace.so" - -apc.rfc1867 =1 -apc.enabled=1 -apc.shm_segments=1 -apc.optimization=0 -apc.shm_size=128 -apc.ttl=120 -apc.user_ttl=120 -apc.gc_ttl=120 -apc.stat=0 -apc.num_files_hint=1024 -apc.user_entries_hint=100 -apc.mmap_file_mask=/dev/zero -;apc.enable_cli=1 - -; Allow or prevent persistent links. -;mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -;mysql.max_persistent = -1 -; Maximum number of links (persistent + non-persistent). -1 means no limit. -;mysql.max_links = -1 - -; File upload parameters +; Ensure file_uploads are allowed +file_uploads = On upload_tmp_dir = /tmp -upload_max_filesize = 10M ; Error reporting parameters -; error_reporting = E_ALL -display_errors = 0 -log_errors = 1 +error_reporting = E_ALL ~ E_NOTICE +display_errors = Off +log_errors = On safe_mode = 0 - - +short_open_tag = On From olio-commits-returnmoorealexander@example.net Thu Mar 05 19:22:25 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 98140 invoked from network); 5 Mar 2009 19:22:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Mar 2009 19:22:25 -0000 Received: (qmail 92319 invoked by uid 500); 5 Mar 2009 19:22:25 -0000 Delivered-To: moorealexander@example.net Received: (qmail 92312 invoked by uid 500); 5 Mar 2009 19:22:25 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 92301 invoked by uid 99); 5 Mar 2009 19:22:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 11:22:25 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 19:22:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B450F2388962; Thu, 5 Mar 2009 19:21:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750557 - in /incubator/olio/workload/php/trunk: bin/dbloader.sh config/run.xml deploy/run.xml Date: Thu, 05 Mar 2009 19:21:58 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: shanti Date: Thu Mar 5 19:21:58 2009 New Revision: 750557 URL: http://svn.apache.org/viewvc?rev=750557&view=rev Log: Last fixes for OLIO-33. Changed dbname, db user and db password to 'olio' Modified: incubator/olio/workload/php/trunk/bin/dbloader.sh incubator/olio/workload/php/trunk/config/run.xml incubator/olio/workload/php/trunk/deploy/run.xml Modified: incubator/olio/workload/php/trunk/bin/dbloader.sh URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/bin/dbloader.sh?rev=750557&r1=750556&r2=750557&view=diff ============================================================================== --- incubator/olio/workload/php/trunk/bin/dbloader.sh (original) +++ incubator/olio/workload/php/trunk/bin/dbloader.sh Thu Mar 5 19:21:58 2009 @@ -42,7 +42,7 @@ export CLASSPATH $JAVA_HOME/bin/java -server org.apache.olio.workload.loader.LoadController com.mysql.jdbc.Driver \ -"jdbc:mysql://$DB_HOST/web20load?user=web20&password=web20&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0" $SCALE +"jdbc:mysql://$DB_HOST/olio?user=olio&password=olio&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0" $SCALE EXIT_CODE=$? if [ "$EXIT_CODE" = 0 ] ; then echo "Database Load Successful" Modified: incubator/olio/workload/php/trunk/config/run.xml URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/config/run.xml?rev=750557&r1=750556&r2=750557&view=diff ============================================================================== --- incubator/olio/workload/php/trunk/config/run.xml (original) +++ incubator/olio/workload/php/trunk/config/run.xml Thu Mar 5 19:21:58 2009 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <webBenchmark> <!-- The definition binds the config file with the benchmark class --> - <runConfig definition="com.sun.web20.driver.UIDriver"> + <runConfig definition="org.apache.olio.workload.driver.UIDriver"> <!-- The hostConfig section is used by the harness to control hosts --> <hostConfig> <host>brazilian.sfbay</host> @@ -58,7 +58,7 @@ </runtimeStats> <!-- The driver-specific config. --> - <driverConfig name="Web20Driver"> + <driverConfig name="OlioDriver"> <!-- The number of agents --> <agents>3</agents> <!-- The stats interval, overrides the ones specified for Modified: incubator/olio/workload/php/trunk/deploy/run.xml URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/deploy/run.xml?rev=750557&r1=750556&r2=750557&view=diff ============================================================================== --- incubator/olio/workload/php/trunk/deploy/run.xml (original) +++ incubator/olio/workload/php/trunk/deploy/run.xml Thu Mar 5 19:21:58 2009 @@ -77,7 +77,7 @@ <userCommands/> </fa:hostConfig> <dbDriver>com.mysql.jdbc.Driver</dbDriver> - <connectURL>jdbc:mysql://localhost/web20load?user=web20&amp;password=web20&amp;relaxAutoCommit=true&amp;sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL> + <connectURL>jdbc:mysql://localhost/olio?user=olio&amp;password=olio&amp;relaxAutoCommit=true&amp;sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL> <autoCommit>true</autoCommit> <reloadDB>true</reloadDB> <scale>2000</scale> From olio-commits-returnmoorealexander@example.net Fri Mar 06 23:17:20 2009 Return-Path: <olio-commits-returnmoorealexander@example.net> Delivered-To: moorealexander@example.net Received: (qmail 87026 invoked from network); 6 Mar 2009 23:17:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Mar 2009 23:17:20 -0000 Received: (qmail 20991 invoked by uid 500); 6 Mar 2009 23:17:20 -0000 Delivered-To: moorealexander@example.net Received: (qmail 20973 invoked by uid 500); 6 Mar 2009 23:17:20 -0000 Mailing-List: contact moorealexander@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:moorealexander@example.net> List-Unsubscribe: <mailto:moorealexander@example.net> List-Post: <mailto:moorealexander@example.net> List-Id: <olio-commits.incubator.apache.org> Reply-To: moorealexander@example.net Delivered-To: mailing list moorealexander@example.net Received: (qmail 20962 invoked by uid 99); 6 Mar 2009 23:17:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 15:17:20 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 23:17:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67DC22388920; Fri, 6 Mar 2009 23:16:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r751128 - in /incubator/olio: docs/php_setup.html webapp/php/trunk/etc/config.php workload/php/trunk/bin/schema.sql Date: Fri, 06 Mar 2009 23:16:50 -0000 To: moorealexander@example.net From: moorealexander@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <moorealexander@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: shanti Date: Fri Mar 6 23:16:49 2009 New Revision: 751128 URL: http://svn.apache.org/viewvc?rev=751128&view=rev Log: Fix for OLIO-33. For some reason, this commit didn't go thru yesterday. Also updated doc to reflect re-factoring, name changes and added other minor fixes. Modified: incubator/olio/docs/php_setup.html incubator/olio/webapp/php/trunk/etc/config.php incubator/olio/workload/php/trunk/bin/schema.sql Modified: incubator/olio/docs/php_setup.html URL: http://svn.apache.org/viewvc/incubator/olio/docs/php_setup.html?rev=751128&r1=751127&r2=751128&view=diff ============================================================================== --- incubator/olio/docs/php_setup.html (original) +++ incubator/olio/docs/php_setup.html Fri Mar 6 23:16:49 2009 @@ -3,10 +3,11 @@ <HEAD> <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> <TITLE>Olio/PHP Install and Setup Guide</TITLE> - <META NAME="GENERATOR" CONTENT="NeoOffice 2.2 (Unix)"> + <META NAME="GENERATOR" CONTENT="StarOffice 8 (Solaris Sparc)"> <META NAME="AUTHOR" CONTENT="Akara Sucharitakul"> <META NAME="CREATED" CONTENT="20070926;10111500"> - <META NAME="CHANGED" CONTENT="20081014;13423500"> + <META NAME="CHANGEDBY" CONTENT="Shanti Subramanyam"> + <META NAME="CHANGED" CONTENT="20090305;12352800"> <STYLE TYPE="text/css"> <!-- H1 { color: #000000 } @@ -18,8 +19,6 @@ <BODY LANG="en-US" TEXT="#000000" DIR="LTR"> <H1 ALIGN=CENTER>Olio/PHP <BR>Install and Setup Guide from Source Tree</H1> -<P>Note: The application currently does not use memcached. Please -ignore the memcached related setup instructions.</P> <H2>Overview</H2> <P>Olio is a macro-level toolkit consisting of the following components:</P> @@ -30,6 +29,7 @@ </P> <LI><P STYLE="margin-bottom: 0in">Distributed storage servers (MogileFS or NFS)</P> + <LI><P STYLE="margin-bottom: 0in">The caching server (memcached)</P> <LI><P STYLE="margin-bottom: 0in">Storage metadata database (for MogileFS)</P> <LI><P STYLE="margin-bottom: 0in">Geocoder emulator @@ -53,9 +53,9 @@ bulk of the CPU is consumed in the web application tier (apache/php).</P> <P STYLE="margin-bottom: 0in">In the following sections, we will go over the steps needed to configure each component :</P> -<P STYLE="margin-bottom: 0in"> +<P STYLE="margin-bottom: 0in"><BR> </P> -<P STYLE="margin-bottom: 0in">Downloading the source</P> +<P><A HREF="#Downloading The Source|outline">Downloading the source</A></P> <P><A HREF="#setupDriver"><U>Setting up the driver</U></A></P> <P><A HREF="#installWebApp">Installing the Web Application</A></P> <P><A HREF="#setupDB">Setting up the database</A></P> @@ -64,7 +64,8 @@ <P><A HREF="#setupEmulator">Setting up the Geocoder Emulator</A></P> <P><A HREF="#testWebApp">Testing the web application</A></P> <P><A HREF="#startRun">Starting a performance test</A></P> -<H2>Downloading The Source</H2> +<H2><A NAME="Downloading The Source|outline"></A>Downloading The +Source</H2> <P>The Olio source is available via SVN at <A HREF="https://svn.apache.org/repos/asf/incubator/olio/">https://svn.apache.org/repos/asf/incubator/olio/</A>. Please see the <A HREF="http://www.apache.org/dev/version-control.html#anon-svn">instructions</A> @@ -73,17 +74,18 @@ follows :</P> <UL> <LI><P>The <I>webapp</I> directory contains the web application. The - php/trunk sub-directory contains the web application for the PHP - implementation. We will refer to webapp/php/trunk as $WEBAPP in this - document.</P> + <I>php/trunk</I> sub-directory contains the web application for the + PHP implementation. We will refer to <I>webapp/php/trunk</I> as + $WEBAPP in this document.</P> <LI><P>The <I>workload</I> directory contains the code for the load generator/driver (which we typically refer to simply as <I>driver</I>). The driver is implemented using <A HREF="http://faban.sunsource.net/"><I>Faban</I></A> - – an open source benchmarking toolkit. The php/trunk sub-directory - has the faban driver code to drive the php application. In future, - we'd like to integrate the driver source for all implementations of - the application. The workload/workload/php/trunk is referred to as - $WORKLOAD in this document.</P> + – an open source benchmarking toolkit. The <I>php/trunk</I> + sub-directory has the faban driver code to drive the php + application. In future, we'd like to integrate the driver source for + all implementations of the application. The + <I>workload/workload/php/trunk</I> is referred to as $WORKLOAD in + this document.</P> </UL> <H2><A NAME="setupDriver"></A>Setting up the driver</H2> <P>Even if you don't plan to drive load against the application, this @@ -102,7 +104,7 @@ </OL> <UL> <UL> - <LI><P ALIGN=LEFT>cd $WORKLOAD; cp build.properties.template + <LI><P ALIGN=LEFT>cd $WORKLOAD; cp build.properties.template build.properties</P> <LI><P ALIGN=LEFT>Edit build.properties and set faban.home to $FABAN_HOME, faban.url to http://<I>driver_host</I>:9980 where @@ -112,15 +114,15 @@ to your JDK1.6 installation.</P> <LI><P ALIGN=LEFT>Build the driver using the command: <I>ant deploy.jar. </I><SPAN STYLE="font-style: normal">If successful, you - should see the file </SPAN><I>Web20Driver.jar</I><SPAN STYLE="font-style: normal"> - in the </SPAN><I>build</I><SPAN STYLE="font-style: normal"> - sub-directory.</SPAN></P> + should see the file </SPAN><I>Olio</I><I>Driver.jar</I> <SPAN STYLE="font-style: normal">in + the </SPAN><I>build</I> <SPAN STYLE="font-style: normal">sub-directory.</SPAN></P> </UL> </UL> <OL START=3> - <LI><P ALIGN=LEFT>Copy $WORKLOAD/build/<SPAN STYLE="font-weight: medium">Web20Driver</SPAN><I><SPAN STYLE="font-weight: medium">.</SPAN></I><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">jar</SPAN></SPAN> - to the $FABAN_HOME/benchmarks directory. - </P> + <LI><P ALIGN=LEFT>Copy $WORKLOAD/build/Olio<SPAN STYLE="font-weight: medium">Driver</SPAN><I><SPAN STYLE="font-weight: medium">.</SPAN></I><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">jar</SPAN></SPAN> + to the $FABAN_HOME/benchmarks directory. IAlso copy the + OlioDriver.jar file to the $FABAN_HOME/benchmarks directory on the + web server system.</P> <LI><P ALIGN=LEFT>For the driver to work, you will need JDK 1.6. Set JAVA_HOME to the path of the JDK in the faban user's environment.</P> <LI><P ALIGN=LEFT>Start the faban master on the master driver @@ -135,54 +137,55 @@ <P>The web application is a PHP application. It requires the following components:</P> <OL> - <LI><P STYLE="margin-bottom: 0in">A web server such as Apache or + <LI><P STYLE="margin-bottom: 0in">A web server such as Apache2 or Lighttpd</P> - <LI><P STYLE="margin-bottom: 0in">PHP 5 with extensions: curl.so, - gd.so, pdo.so, pdo_mysql.so</P> - <LI><P STYLE="margin-bottom: 0in">MySQL 5 + <LI><P STYLE="margin-bottom: 0in">PHP 5 with extensions: apc.so, + curl.so, gd.so, pdo_mysql.so</P> + <LI><P STYLE="margin-bottom: 0in">MySQL 5</P> + <LI><P STYLE="margin-bottom: 0in">Memcached </P> </OL> <P STYLE="margin-bottom: 0in"><BR> </P> -<P>Coolstack is one pre-integrated suite of open source applications -optimized for Solaris. If you're running on any other operating -system, please install the above applications.<BR><BR>Once you have -the application stack installed, follow the steps below to set up the -application. +<P>All of these applications are included in OpenSolaris. If you're +running on any other operating system, please install the above +applications.<BR><BR>Once you have the application stack installed, +follow the steps below to set up the application. </P> <OL> <LI><P>Decide where you want to install the web application. The default for apache is the htdocs sub-directory but a common location - is /var/www. Create a sub-directory web20php2 where the php + is /var/www. Create a sub-directory <I>oliophp</I> where the php application will reside. We will use $APP_DIR to refer to this location.</P> - <LI><P>After installing all the above packages, go to - /opt/coolstack/apache2/conf and edit the httpd.conf. Set the <B>Listen</B> + <LI><P>After installing all the above packages, edit the httpd.conf + used by your system's apache installation. Set the <B>Listen</B> parameter to the hostname or ip address and set the <B>DocumentRoot</B> - to $APP_DIR/public_html. An example httpd.conf is provided in - $APP_DIR/etc.</P> - <LI><P STYLE="margin-bottom: 0in">An example, tuned php.ini is - provided in $APP_DIR/etc/php.ini. Copy the non-installation specific - settings to the location where php.ini exists for your installation. - For Cool Stack users, you can copy this file as is to - /opt/coolstack/php5/lib. - </P> - <P STYLE="margin-bottom: 0in"> - </P> + to $APP_DIR/public_html. See the <I>httpd.conf </I> file in + $APP_DIR/etc for additional settings.</P> + <LI><P STYLE="margin-bottom: 0in">See the php.ini provided in + $APP_DIR/etc and copy the settings appropriately to the php.ini for + your installation.</P> +</OL> +<P STYLE="margin-bottom: 0in"><BR> +</P> +<OL START=4> <LI><P>Go to $APP_DIR/etc. Edit the file config.php and set the appropriate values for geocoderHost, localfsRoot. localfsRoot is the directory where the object filestore resides (either a local filesystem or nfs-mounted from a remote location – see the section - on <I><B>Setting up the filestore</B></I> below). The default - location is /filestore. The geocoderHost is usually the driver - system.</P> - <LI><P>Start apache. Check that you can connect to it from your - browser (http://<I>host</I>:8080), but don't try to access any of - the application pages yet !</P> + <A HREF="#Setting up the filestore|outline"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">Setting + up the filestore</SPAN></SPAN></A>). The default location is + /filestore. The geocoderHost is usually the driver system – see + the section <A HREF="#Setting up the Geocoder Emulator|outline">Setting + up the Geocoder Emulator</A>.</P> + <LI><P></P> </OL> <P STYLE="margin-bottom: 0in"><A NAME="setupDB"></A><BR><FONT SIZE=4><B>Setting up the database</B></FONT> </P> +<P STYLE="margin-bottom: 0in"><BR> +</P> <OL> <LI><P>If you plan to run MySQL on a separate machine, install MySQL on that system. We will refer to the MySQL installation directory as @@ -201,24 +204,31 @@ password </FONT><FONT FACE="monospace"><I>pwd</I></FONT></P> <LI><P>Create the web20 user and grant privileges:<BR><FONT FACE="monospace">$ ./mysql -uroot -p</FONT><FONT FACE="monospace"><I>pwd</I></FONT><BR><FONT FACE="monospace">mysql&gt; - create user 'web20'@'%' identified by 'web20';</FONT><BR><FONT FACE="monospace">mysql&gt; - grant all privileges on *.* to 'web20'@'%' identified by 'web20' - with grant option;<BR></FONT><BR>In some cases the wildcard '%' does - not work reliably as a substitution for all hosts. You need to grant - the privileges to 'web20'@'&lt;hostname&gt;' individually, where - hostname are the names of the driver and apache systems.</P> + create user 'olio'@'%' identified by 'olio';</FONT><BR><FONT FACE="monospace">mysql&gt; + grant all privileges on *.* to 'olio'@'%' identified by 'olio' with + grant option;<BR></FONT><BR>In some cases the wildcard '%' does not + work reliably as a substitution for all hosts. You need to grant the +
{'source': 'Apache Software Foundation Public Mail Archives'}