You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by sh...@apache.org on 2009/04/08 18:22:40 UTC
svn commit: r763338 - in /incubator/olio: docs/rails_setup.html
docs/rails_setup_kit.html webapp/php/trunk/includes/footer.html
workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java
Author: shanti
Date: Wed Apr 8 18:22:40 2009
New Revision: 763338
URL: http://svn.apache.org/viewvc?rev=763338&view=rev
Log:
Removed references to tiny_mce in the driver. Minor updates to rails docs. Removed reference to sun.com in footer.
Modified:
incubator/olio/docs/rails_setup.html
incubator/olio/docs/rails_setup_kit.html
incubator/olio/webapp/php/trunk/includes/footer.html
incubator/olio/workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java
Modified: incubator/olio/docs/rails_setup.html
URL: http://svn.apache.org/viewvc/incubator/olio/docs/rails_setup.html?rev=763338&r1=763337&r2=763338&view=diff
==============================================================================
--- incubator/olio/docs/rails_setup.html (original)
+++ incubator/olio/docs/rails_setup.html Wed Apr 8 18:22:40 2009
@@ -1,16 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
- <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>Olio/Rails Install and Setup Guide</TITLE>
- <META NAME="GENERATOR" CONTENT="NeoOffice 2.2 (Unix)">
+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+ <TITLE>Olio/Rails Install and Setup Guide from Source</TITLE>
+ <META NAME="GENERATOR" CONTENT="StarOffice 8 (Solaris Sparc)">
<META NAME="AUTHOR" CONTENT="Akara Sucharitakul">
<META NAME="CREATED" CONTENT="20070926;10111500">
-<<<<<<< .mine
- <META NAME="CHANGED" CONTENT="20090331;16130000">
-=======
<META NAME="CHANGED" CONTENT="20090331;14203900">
->>>>>>> .r760723
<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -34,6 +30,7 @@
P { color: #000000 }
PRE { color: #000000 }
H2 { color: #000000 }
+ H3 { color: #000000 }
-->
</STYLE>
</HEAD>
@@ -143,11 +140,11 @@
<LI><P STYLE="margin-bottom: 0in">See
<A HREF="http://faban.sunsource.net/docs/guide/harness/install.html">http://faban.sunsource.net/docs/guide/harness/install.html</A>
for Faban installation instructions. Note that faban needs to be
- installed on all the machines used for the test. Please also read
- the <I>Getting Started Guide</I> to get a high-level understanding
- of Faban terminology and how it works. From now on, we will refer to
- the faban install directory as <CODE>$FABAN_HOME</CODE>.
- </P>
+ installed in the same location on all the machines used for the
+ test. Please also read the <I>Getting Started Guide</I> to get a
+ high-level understanding of Faban terminology and how it works. From
+ now on, we will refer to the faban install directory as <CODE>$FABAN_HOME</CODE>.
+ </P>
<LI><P STYLE="margin-bottom: 0in">To build the driver, do the
following:
</P>
@@ -199,7 +196,7 @@
</P>
<UL>
<LI><P STYLE="margin-bottom: 0in">rails</P>
- <LI><P STYLE="margin-bottom: 0in">rake
+ <LI><P STYLE="margin-bottom: 0in">rake
</P>
<LI><P STYLE="margin-bottom: 0in">thin (mongrel can be used if
desired)
@@ -209,14 +206,15 @@
which needs to be downloaded and built)</P>
<LI><P STYLE="margin-bottom: 0in">rcov</P>
<LI><P STYLE="margin-bottom: 0in">will_paginate</P>
- <LI><P STYLE="margin-bottom: 0in">FreeImage</P>
</UL>
</OL>
<P STYLE="margin-left: 0.79in; margin-bottom: 0in"><BR>
</P>
<OL START=3>
+ <LI><P>FreeImage (which needs to be downloaded and built)</P>
<LI><P>MySQL 5 (5.1 recommended)</P>
</OL>
+<H3>Additional Installation Steps</H3>
<P>For Linux (debian or ubuntu), the following command can be used :</P>
<PRE STYLE="margin-bottom: 0.2in"> aptitude install build-essential subversion ruby1.8 ruby1.8-dev nginx libmysqlclient-dev rubygems libgems-ruby1.8</PRE><P STYLE="margin-bottom: 0in">
For OpenSolaris 2008.11:</P>
@@ -251,14 +249,6 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<UL>
- <LI><P STYLE="margin-bottom: 0in">Now install these gems:
- </P>
-</UL>
-<P STYLE="margin-bottom: 0in"> <FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">gem
-install rake rails thin rcov will_paginate image_science</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><BR>
-</P>
-<UL>
<LI><P STYLE="margin-bottom: 0in">To install the mysql gem, run:</P>
</UL>
<P STYLE="margin-bottom: 0in"> <FONT FACE="Courier New, monospace"><FONT SIZE=2>gem
@@ -281,8 +271,15 @@
</UL>
<P STYLE="margin-bottom: 0in"><BR>
</P>
+<UL>
+ <LI><P STYLE="margin-bottom: 0in">Now install these gems:
+ </P>
+</UL>
+<P STYLE="margin-bottom: 0in"> <FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">gem
+install rake rails thin rcov will_paginate image_science</FONT></FONT></P>
<P STYLE="margin-bottom: 0in"><BR>
</P>
+<H3>Nginx Configuration</H3>
<P>Once you have the application stack installed, follow the steps
below to set up the application.</P>
<OL>
@@ -296,11 +293,24 @@
</P>
<LI><P>Now edit nginx.conf. There is an example in the $APP_DIR/etc
directory. If you're using a single machine and you're using root as
- the user, you can copy the file to the nginx 'conf' directory.</P>
+ the user, you can copy the file to the nginx 'conf' directory. For
+ OpenSolaris, comment out the <FONT FACE="Courier New, monospace">error_log</FONT>
+ and <FONT FACE="Courier New, monospace">pid</FONT> entries. The
+ default location for these files is in /var/nginx/logs.</P>
+</OL>
+<OL>
<P>To change user to another user, modify the first line and change
- <CODE>user root;</CODE> to your preferred user. If you have more
- than one machine hosting your thins, modify the upstream thin and
- add the addresses of your application servers.</P>
+ <CODE>user root;</CODE> to your preferred user. On OpenSolaris, the
+ default user is usually webservd.
+ </P>
+</OL>
+<P> The nginx.conf has a section named <FONT FACE="Cumberland, monospace">upstream
+thin</FONT> that contains a list of the server and port numbers of
+the rails application servers that will host the application. If you
+have more than one machine hosting your thins or if the applications
+are located on a different machine to Nginx, modify this section and
+add the addresses and port numbers of your application servers.</P>
+<OL START=3>
<P STYLE="margin-bottom: 0.04in">To change the location of the
application static content :</P>
</OL>
@@ -308,10 +318,12 @@
path to your rails app's public directory: </CODE>
</P>
<PRE STYLE="margin-bottom: 0.2in"><CODE> root /var/www/virtual/example.com/rails/railsapp/public;</CODE></PRE><P STYLE="margin-bottom: 0.04in">
-to <CODE>root $APP_DIR;</CODE>
+to <CODE>root $APP_DIR;</CODE> <I># replace $APP_DIR with whatever
+value you used for $APP_DIR throughput the installation</I></P>
+<P STYLE="margin-bottom: 0.04in"><BR><BR>
</P>
<OL START=3>
- <P STYLE="margin-bottom: 0.14in">Do not start nginx yet.</P>
+ <P STYLE="margin-bottom: 0.14in">Do NOT start nginx yet.</P>
</OL>
<H2><A NAME="setupDB"></A>Setting up the database</H2>
<OL>
@@ -330,16 +342,27 @@
<PRE># su - mysql
$ cd bin
$ ./mysql_install_db</PRE>
- <LI><P>Start the mysql server. Substitute your own password for <I>pwd</I>
- (we typically use <I>adminadmin</I>)
+ <LI><P>A sample <FONT FACE="Cumberland, monospace">my.cnf </FONT>file
+ is included in $APP_DIR/etc/my.cnf. This will work with both MySQL
+ 5.0 and 5.1. Copy it to /etc/my.cnf and edit it to add the location
+ of <FONT FACE="Cumberland, monospace">innodb_data_home_dir</FONT>
+ and <FONT FACE="Cumberland, monospace">innodb_log_group_home_dir</FONT>.
+ The default values for these parameters is the MySQL data
+ directory. Start the mysql server.
+ </P>
+ <PRE>$ ./mysqld_safe &</PRE>
+</OL>
+<PRE></PRE>
+<OL START=5>
+ <LI><P>Substitute your own password for <I>pwd</I> (we typically use
+ <I>adminadmin</I>)
</P>
- <PRE>$ ./mysqld_safe &
-$ ./mysqladmin -u root password <I>pwd</I></PRE>
- <LI><P>Create the web20 user and grant privileges:
+ <PRE STYLE="margin-bottom: 0.2in">$ ./mysqladmin -u root password <I>pwd</I></PRE>
+ <LI><P>Create the olio user and grant privileges:
</P>
<PRE> $ ./mysql -u root -p <I>pwd</I>
mysql> create user 'olio'@'%' identified by 'olio';
- mysql> grant all privileges on *.* to 'olio'@'%' identified by 'olio' with grant option;</PRE><P STYLE="margin-bottom: 0in">
+ mysql> grant all privileges on *.* to 'olio'@'%' identified by 'olio';</PRE><P STYLE="margin-bottom: 0in">
In some cases the wildcard '%' does not work reliably as a
substitution for all hosts. You need to grant the privileges to
'olio'@'<hostname>' individually, where hostname is localhost,
@@ -359,8 +382,8 @@
<OL START=6>
<LI><PRE STYLE="margin-bottom: 0.2in"><FONT FACE="Times New Roman, serif"><FONT SIZE=3>Create database schema from the rails application :</FONT></FONT></PRE>
</OL>
-<P><FONT FACE="Cumberland, monospace"><FONT SIZE=2>cd $APP_DIR; rake
-db:migrate</FONT></FONT></P>
+<P> <FONT FACE="Cumberland, monospace"><FONT SIZE=2>cd $APP_DIR;
+rake db:migrate</FONT></FONT></P>
<H2><A NAME="loadDB"></A>Loading the database</H2>
<P>It is best to load the database manually the first time so that we
can test the web application. However, while doing performance tests,
@@ -410,12 +433,15 @@
<OL START=2>
<PRE># $FABAN_HOME/benchmarks/olio/bin/fileloader.sh <load_scale> $FILESTORE
<FONT FACE="Times New Roman, serif"><FONT SIZE=3>This loads files for use for up to </FONT></FONT><CODE><FONT FACE="Times New Roman, serif"><FONT SIZE=3><I>load_scale</I></FONT></FONT></CODE> <FONT FACE="Times New Roman, serif"><FONT SIZE=3>number of concurrent users. </FONT></FONT></PRE>
- <LI><P>Edit $APP_DIR/config/environment.rb and modify the values of
- <CODE>IMAGE_STORE_PATH</CODE> and <CODE>DOCUMENT_STORE_PATH </CODE><CODE><FONT FACE="Times New Roman, serif">to
- point to $FILESTORE</FONT></CODE><CODE>.</CODE><CODE><FONT FACE="Times New Roman, serif">Note
- that $FILESTORE is relative to $APP_DIR. Alternatively, create a
- symbolic link from the default IMAGE_STORE_PATH to $FILESTORE.</FONT></CODE></P>
</OL>
+<OL START=2>
+ <LI><P><CODE><FONT FACE="Times New Roman, serif">In
+ $APP_DIR/public/, create a symbolic link from </FONT></CODE><CODE><FONT FACE="Cumberland, monospace">uploaded_files</FONT></CODE><CODE><FONT FACE="Times New Roman, serif">
+ to $FILESTORE. </FONT></CODE>
+ </P>
+</OL>
+<P><CODE> </CODE><CODE><FONT FACE="Cumberland, monospace"><FONT SIZE=2>#
+ln -s $FILESTORE uploaded_files</FONT></FONT></CODE></P>
<H2><A NAME="setupEmulator"></A>Setting up the Geocoder Emulator</H2>
<P>The Geocoder Emulator is a simple servlet deployed on Tomcat. It
is typically run on a driver machine. The following steps describe
@@ -458,7 +484,7 @@
</P>
</UL>
<PRE STYLE="margin-top: 0.02in; margin-bottom: 0.2in"> $ cd $APP_DIR
- $ thin -d -p 3000 -e production -l /var/log/thin.log â-pid /var/run/thin.pid -s 4 start</PRE>
+ $ thin -d -p 3000 -e production -l /var/log/thin.log –-pid /var/run/thin.pid -s 4 start</PRE>
<UL>
<LI><P>This will start four thin servers on ports 3000, 3001, 3002,
and 3004. You can change the port and number of servers if you want,
@@ -482,23 +508,36 @@
</P>
<LI><P STYLE="margin-bottom: 0in">Go back to the home page and click
on a tag in the tag cloud. Choose a big tag and check that we have
- good results and images get loaded OK.
- </P>
+ good results and images get loaded OK.</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Click on the sign up tab. Fill in
the form and create a user. Make sure you find some jpeg images to
upload. If not, take them from
$FABAN_HOME/benchmarks/web20/resources. Submit the form. Make sure
the form goes through. This completes the AddPerson transaction.
</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Login using your new login name
- you just created. The top right of the screen should show that
- you're logged on.
- </P>
+ you just created. The top left of the screen should show that you're
+ logged on.</P>
+</UL>
+<P STYLE="margin-bottom: 0in">
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Select an event, go back to the
EventDetail page but this time as a logged on user. Add yourself as
an attendee. This is the EventDetail transaction with attendee added
- (about 8-9% of all EventDetail views).
- </P>
+ (about 8-9% of all EventDetail views).</P>
+</UL>
+<P STYLE="margin-bottom: 0in">
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Click on the add event tab and add
an event. Make sure to include an image and some literature. You can
also use the files from <CODE>$FABAN_HOME/benchmarks/web20/resources</CODE>.
@@ -564,7 +603,7 @@
driver machines; we start with 1. The Host:Port Pairs field takes
the host port pairs where the web applications are running. The host
and port is separated by a colon. Each pair is separated by space.
- For the Webserver type field, enter either âapacheâ or
+ For the Webserver type field, enter either “apache” or
"lighttpd" or leave the field blank if you're using nginx
or other servers. Only these two servers are supported by faban at
this time. Then provide the webserver's bin, log, and config
@@ -588,4 +627,4 @@
</P>
</OL>
</BODY>
-</HTML>
+</HTML>
\ No newline at end of file
Modified: incubator/olio/docs/rails_setup_kit.html
URL: http://svn.apache.org/viewvc/incubator/olio/docs/rails_setup_kit.html?rev=763338&r1=763337&r2=763338&view=diff
==============================================================================
--- incubator/olio/docs/rails_setup_kit.html (original)
+++ incubator/olio/docs/rails_setup_kit.html Wed Apr 8 18:22:40 2009
@@ -1,16 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
- <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>Olio/Rails Install and Setup Guide</TITLE>
- <META NAME="GENERATOR" CONTENT="NeoOffice 2.2 (Unix)">
+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+ <TITLE>Olio/Rails Install and Setup Guide from Tarball</TITLE>
+ <META NAME="GENERATOR" CONTENT="StarOffice 8 (Solaris Sparc)">
<META NAME="AUTHOR" CONTENT="Akara Sucharitakul">
<META NAME="CREATED" CONTENT="20070926;10111500">
-<<<<<<< .mine
- <META NAME="CHANGED" CONTENT="20090331;16134100">
-=======
<META NAME="CHANGED" CONTENT="20090331;14212900">
->>>>>>> .r760723
<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -35,6 +31,7 @@
P { color: #000000 }
PRE { color: #000000 }
H2 { color: #000000 }
+ H3 { color: #000000 }
-->
</STYLE>
</HEAD>
@@ -109,14 +106,14 @@
Contents</H2>
<P>The Olio/Rails kit is packaged as a gzipped tar file. The first
task is to unzip the file and untar it to extract it's contents.
-Because of the long pathnames, please use gtar to extract. This can
-be done as follows:</P>
+Because of the long pathnames, please use GNU tar to extract. This
+can be done as follows:</P>
<P><FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">#
-gzcat <I>olio-rails-<version></I>.tar.gz | gtar xvf -</FONT></FONT></P>
+gzcat apache-<I>olio-rails-<version></I>.tar.gz | gtar xvf -</FONT></FONT></P>
<P>This will cause a directory named olio-rails-<I><version> </I><SPAN STYLE="font-style: normal">to
be created whose contents should look like:</SPAN></P>
<P STYLE="margin-bottom: 0.04in; font-style: normal"><FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">#
-ls olio-rails-0.1*</FONT></FONT></P>
+ls apache-olio-rails-0.1*</FONT></FONT></P>
<P STYLE="margin-bottom: 0.04in; font-style: normal"><FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">LICENSE
OlioDriver.jar geocoder.war rails_setup_kit.html</FONT></FONT></P>
<P STYLE="margin-bottom: 0.04in; font-style: normal"><FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">NOTICE
@@ -133,7 +130,7 @@
<LI><P><I>OlioDriver.jar</I> contains 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.</P>
+ – an open source benchmarking toolkit.</P>
<LI><P><I>geocoder.war</I> contains the simple servlet used to
emulate the geocoder.</P>
<LI><P><I>rails_setup_kit.html</I> is this document.</P>
@@ -152,11 +149,11 @@
<LI><P STYLE="margin-bottom: 0in">See
<A HREF="http://faban.sunsource.net/docs/guide/harness/install.html">http://faban.sunsource.net/docs/guide/harness/install.html</A>
for Faban installation instructions. Note that faban needs to be
- installed on all the machines used for the test. Please also read
- the <I>Getting Started Guide</I> to get a high-level understanding
- of Faban terminology and how it works. From now on, we will refer to
- the faban install directory as <CODE>$FABAN_HOME</CODE>.
- </P>
+ installed in the same location on all the machines used for the
+ test. Please also read the <I>Getting Started Guide</I> to get a
+ high-level understanding of Faban terminology and how it works. From
+ now on, we will refer to the faban install directory as <CODE>$FABAN_HOME</CODE>.
+ </P>
<LI><P STYLE="margin-bottom: 0in">Copy <CODE>$OLIO_HOME/OlioDriver.jar</CODE>
to the <CODE>$FABAN_HOME/benchmarks</CODE> directory. Also copy the
OlioDriver.jar file to the $FABAN_HOME/benchmarks directory on the
@@ -177,6 +174,7 @@
</P>
</OL>
<H2><A NAME="installWebApp"></A>Installing the Web Application</H2>
+<H3>Required Software</H3>
<P>The web application is a Rails application. It requires the
following components:</P>
<OL>
@@ -186,7 +184,7 @@
following gems and their dependencies :</P>
<UL>
<LI><P STYLE="margin-bottom: 0in">rails</P>
- <LI><P STYLE="margin-bottom: 0in">rake
+ <LI><P STYLE="margin-bottom: 0in">rake
</P>
<LI><P STYLE="margin-bottom: 0in">thin (mongrel can be used if
desired)
@@ -201,8 +199,10 @@
<P STYLE="margin-left: 0.79in; margin-bottom: 0in"><BR>
</P>
<OL START=3>
+ <LI><P>FreeImage (which needs to be downloaded and built)</P>
<LI><P>MySQL 5 (5.1 recommended)</P>
</OL>
+<H3>Additional Installation Steps</H3>
<P>For Linux (debian or ubuntu), the following command can be used:</P>
<PRE STYLE="margin-bottom: 0.2in"> aptitude install build-essential subversion ruby1.8 ruby1.8-dev nginx libmysqlclient-dev rubygems libgems-ruby1.8</PRE><P STYLE="margin-bottom: 0in">
For OpenSolaris 2008.11:</P>
@@ -238,18 +238,10 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<UL>
- <LI><P STYLE="margin-bottom: 0in">Now install these gems:
- </P>
-</UL>
-<P STYLE="margin-bottom: 0in"> <FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">gem
-install rake rails thin rcov will_paginate image_science</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><BR>
-</P>
-<UL>
<LI><P STYLE="margin-bottom: 0in">To install the mysql gem, run:
</P>
</UL>
-<P STYLE="margin-bottom: 0in"> <FONT FACE="Courier New, monospace"><FONT SIZE=2>gem
+<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New, monospace"><FONT SIZE=2>gem
install mysql --with-mysql-lib=/usr/mysql/5.0/lib/mysql
--with-mysql-include=/usr/mysql/5.0/include</FONT></FONT>.</P>
<P STYLE="margin-bottom: 0in"><BR>
@@ -269,8 +261,13 @@
</UL>
<P STYLE="margin-bottom: 0in"><BR>
</P>
-<P STYLE="margin-bottom: 0in"><BR>
-</P>
+<UL>
+ <LI><P STYLE="margin-bottom: 0in">Now install these gems:
+ </P>
+</UL>
+<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New, monospace"><FONT SIZE=2 STYLE="font-size: 11pt">gem
+install rake rails thin rcov will_paginate image_science</FONT></FONT></P>
+<H3>Nginx Configuration</H3>
<P>Once you have the application stack installed, follow the steps
below to set up the application.</P>
<OL>
@@ -283,17 +280,25 @@
We will use <CODE>$APP_DIR</CODE> to refer to the location:
<CODE>/var/app/olio</CODE>
</P>
- <LI><P>Now edit nginx.conf. There is an example in the $APP_DIR/etc
- directory. If you're using a single machine and you're using root as
- the user, you can copy the file to the nginx 'conf' directory. For
- OpenSolaris, comment out the <FONT FACE="Courier New, monospace">error_log</FONT>
- and <FONT FACE="Courier New, monospace">pid</FONT> entries. The
- default location for these files is in /var/nginx/logs.</P>
+ <LI><P>Now edit <FONT FACE="Cumberland, monospace">nginx.conf</FONT>.
+ There is an example in the $APP_DIR/etc directory. If you're using a
+ single machine and you're using root as the user, you can copy the
+ file to the nginx 'conf' directory. For OpenSolaris, comment out the
+ <FONT FACE="Courier New, monospace">error_log</FONT> and <FONT FACE="Courier New, monospace">pid</FONT>
+ entries. The default location for these files is in /var/nginx/logs.</P>
<P>To change user to another user, modify the first line and change
<CODE>user root;</CODE> to your preferred user. On OpenSolaris, the
- default user is usually webservd. If you have more than one machine
- hosting your thins, modify the upstream thin and add the addresses
- of your application servers.</P>
+ default user is usually webservd.
+ </P>
+</OL>
+<P STYLE="text-indent: 0.51in">The nginx.conf has a section named
+<FONT FACE="Cumberland, monospace">upstream thin</FONT> that contains
+a list of the server and port numbers of the rails application
+servers that will host the application. If you have more than one
+machine hosting your thins or if the applications are located on a
+different machine to Nginx, modify this section and add the addresses
+and port numbers of your application servers.</P>
+<OL START=3>
<P STYLE="margin-bottom: 0.04in">To change the location of the
application static content :</P>
</OL>
@@ -301,10 +306,12 @@
path to your rails app's public directory: </CODE>
</P>
<PRE STYLE="margin-bottom: 0.2in"><CODE> root /var/www/virtual/example.com/rails/railsapp/public;</CODE></PRE><P STYLE="margin-bottom: 0.04in">
-to <CODE>root $APP_DIR/public;</CODE>
+to <CODE>root $APP_DIR/public;</CODE> <I># replace $APP_DIR with
+whatever value you used for $APP_DIR throughput the installation</I></P>
+<P STYLE="margin-bottom: 0.04in"><BR><BR>
</P>
<OL START=3>
- <P STYLE="margin-bottom: 0.14in">Do not start nginx yet.</P>
+ <P STYLE="margin-bottom: 0.14in">Do NOT start nginx yet.</P>
</OL>
<H2><A NAME="setupDB"></A>Setting up the database</H2>
<OL>
@@ -323,16 +330,27 @@
<PRE># su - mysql
$ cd bin
$ ./mysql_install_db</PRE>
- <LI><P>Start the mysql server. Substitute your own password for <I>pwd</I>
+ <LI><P>A sample <FONT FACE="Cumberland, monospace">my.cnf </FONT>file
+ is included in $APP_DIR/etc/my.cnf. This will work with both MySQL
+ 5.0 and 5.1. Copy it to /etc/my.cnf and edit it to add the location
+ of <FONT FACE="Cumberland, monospace">innodb_data_home_dir</FONT>
+ and <FONT FACE="Cumberland, monospace">innodb_log_group_home_dir</FONT>.
+ The default values for these parameters is the MySQL data
+ directory. Start the mysql server.
+ </P>
+ <PRE>$ ./mysqld_safe –defaults-file=/etc/my.cnf &</PRE>
+</OL>
+<PRE></PRE>
+<OL START=5>
+ <LI><P>Set the root password. Substitute your own password for <I>pwd</I>
(we typically use <I>adminadmin</I>)
</P>
- <PRE>$ ./mysqld_safe &
-$ ./mysqladmin -u root password <I>pwd</I></PRE>
+ <PRE STYLE="margin-bottom: 0.2in">$ ./mysqladmin -u root password <I>pwd</I></PRE>
<LI><P>Create the olio user and grant privileges:
</P>
<PRE> $ ./mysql -u root -p <I>pwd</I>
mysql> create user 'olio'@'%' identified by 'olio';
- mysql> grant all privileges on *.* to 'olio'@'%' identified by 'olio' with grant option;</PRE><P STYLE="margin-bottom: 0in">
+ mysql> grant all privileges on *.* to 'olio'@'%' identified by 'olio';</PRE><P STYLE="margin-bottom: 0in">
In some cases the wildcard '%' does not work reliably as a
substitution for all hosts. You need to grant the privileges to
'olio'@'<hostname>' individually, where hostname is localhost,
@@ -400,13 +418,13 @@
<OL START=2>
<PRE># $FABAN_HOME/benchmarks/olio/bin/fileloader.sh <load_scale> $FILESTORE
<FONT FACE="Times New Roman, serif"><FONT SIZE=3>This loads files for use for up to </FONT></FONT><CODE><FONT FACE="Times New Roman, serif"><FONT SIZE=3><I>load_scale</I></FONT></FONT></CODE> <FONT FACE="Times New Roman, serif"><FONT SIZE=3>number of concurrent users. </FONT></FONT></PRE>
- <LI><P>Edit $APP_DIR/config/environment.rb and modify the values of
- <CODE>IMAGE_STORE_PATH</CODE> and <CODE>DOCUMENT_STORE_PATH </CODE><CODE><FONT FACE="Times New Roman, serif">to
- point to $FILESTORE. Note that $FILESTORE is relative to $APP_DIR.
- Alternatively, create a symbolic link from the default
- IMAGE_STORE_PATH to $FILESTORE. </FONT></CODE>
+ <LI><P><CODE><FONT FACE="Times New Roman, serif">In
+ $APP_DIR/public/, create a symbolic link from </FONT></CODE><CODE><FONT FACE="Cumberland, monospace">uploaded_files</FONT></CODE><CODE><FONT FACE="Times New Roman, serif">
+ to $FILESTORE. </FONT></CODE>
</P>
</OL>
+<P><CODE> </CODE><CODE><FONT FACE="Cumberland, monospace"><FONT SIZE=2>#
+ln -s $FILESTORE uploaded_files</FONT></FONT></CODE></P>
<H2><A NAME="setupEmulator"></A>Setting up the Geocoder Emulator</H2>
<P>The Geocoder Emulator is a simple servlet deployed on Tomcat. It
is typically run on a driver machine. The following steps describe
@@ -446,7 +464,7 @@
</P>
</UL>
<PRE STYLE="margin-top: 0.02in; margin-bottom: 0.2in"> $ cd $APP_DIR
- $ thin -d -p 3000 -e production -l /var/log/thin.log â-pid /var/run/thin.pid -s 4 start</PRE>
+ $ thin -d -p 3000 -e production -l /var/log/thin.log –-pid /var/run/thin.pid -s 4 start</PRE>
<UL>
<LI><P>This will start four thin servers on ports 3000, 3001, 3002,
and 3004. You can change the port and number of servers if you want,
@@ -472,21 +490,36 @@
on a tag in the tag cloud. Choose a big tag and check that we have
good results and images get loaded OK.
</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Click on the sign up tab. Fill in
the form and create a user. Make sure you find some jpeg images to
upload. If not, take them from
$FABAN_HOME/benchmarks/web20/resources. Submit the form. Make sure
the form goes through. This completes the AddPerson transaction.
</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Login using your new login name
- you just created. The top right of the screen should show that
- you're logged on.
+ you just created. The top left of the screen should show that you're
+ logged on.
</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P STYLE="margin-bottom: 0in">Select an event, go back to the
EventDetail page but this time as a logged on user. Add yourself as
an attendee. This is the EventDetail transaction with attendee added
- (about 8-9% of all EventDetail views).
- </P>
+ (about 8-9% of all EventDetail views).</P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+<UL>
<LI><P>Click on the add event tab and add an event. Make sure to
include an image and some literature. You can also use the files
from <CODE>$FABAN_HOME/benchmarks/web20/resources</CODE>. Fill in
@@ -552,7 +585,7 @@
driver machines; we start with 1. The Host:Port Pairs field takes
the host port pairs where the web applications are running. The host
and port is separated by a colon. Each pair is separated by space.
- For the Webserver type field, enter either âapacheâ or
+ For the Webserver type field, enter either “apache” or
"lighttpd" or leave the field blank if you're using nginx
or other servers. Only these two servers are supported by faban at
this time. Then provide the webserver's bin, log, and config
@@ -576,4 +609,4 @@
</P>
</OL>
</BODY>
-</HTML>
+</HTML>
\ No newline at end of file
Modified: incubator/olio/webapp/php/trunk/includes/footer.html
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/includes/footer.html?rev=763338&r1=763337&r2=763338&view=diff
==============================================================================
--- incubator/olio/webapp/php/trunk/includes/footer.html (original)
+++ incubator/olio/webapp/php/trunk/includes/footer.html Wed Apr 8 18:22:40 2009
@@ -18,4 +18,4 @@
<hr/>
If you have any questions or suggestions, please send them to the olio-dev mailing list.
<br/>
- <a href="http://sun.com/">Apache Software Foundation</a> © 2009 Apache Software Foundation. All rights reserved. Use is subject to license terms.
+ © 2009 <a href="http://apache.org">Apache Software Foundation</a>. All rights reserved. Use is subject to license terms.
Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java?rev=763338&r1=763337&r2=763338&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java (original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/driver/UIDriver.java Wed Apr 8 18:22:40 2009
@@ -72,12 +72,10 @@
public class UIDriver {
public static final String[] HOME_STATICS = {
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",
@@ -96,12 +94,10 @@
public static final String[] EVENTDETAIL_STATICS = {
"/images/php_main_nav_hover_bg.gif",
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",
@@ -121,12 +117,10 @@
};
public static final String[] ADDPERSON_STATICS = {
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",
@@ -136,33 +130,18 @@
"/js/validateform.js",
"/images/php_corner_top_right.gif",
"/images/php_corner_top_left.gif",
- "/js/tiny_mce/themes/simple/editor_template.js",
- "/js/tiny_mce/langs/en.js",
- "/js/tiny_mce/themes/simple/css/editor_ui.css",
"/images/php_corner_bottom_right.gif",
"/images/php_corner_bottom_left.gif",
"/images/php_reflec_tile.gif",
"/images/php_reflec_right.gif",
- "/images/php_reflec_left.gif",
- "/js/tiny_mce/themes/simple/images/bold.gif",
- "/js/tiny_mce/themes/simple/images/italic.gif",
- "/js/tiny_mce/themes/simple/images/underline.gif",
- "/js/tiny_mce/themes/simple/images/strikethrough.gif",
- "/js/tiny_mce/themes/simple/images/separator.gif",
- "/js/tiny_mce/themes/simple/images/undo.gif",
- "/js/tiny_mce/themes/simple/images/redo.gif",
- "/js/tiny_mce/themes/simple/images/cleanup.gif",
- "/js/tiny_mce/themes/simple/images/bullist.gif",
- "/js/tiny_mce/themes/simple/images/numlist.gif"
+ "/images/php_reflec_left.gif"
};
public static final String[] ADDEVENT_STATICS = {
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",
@@ -171,35 +150,20 @@
"/images/php_main_nav_link_bg.gif",
"/images/php_corner_top_right.gif",
"/images/php_corner_top_left.gif",
- "/js/tiny_mce/themes/simple/editor_template.js",
- "/js/tiny_mce/langs/en.js",
- "/js/tiny_mce/themes/simple/css/editor_ui.css",
"/js/validateform.js",
"/images/php_corner_bottom_right.gif",
"/images/php_corner_bottom_left.gif",
"/images/php_reflec_tile.gif",
"/images/php_reflec_right.gif",
- "/images/php_reflec_left.gif",
- "/js/tiny_mce/themes/simple/images/bold.gif",
- "/js/tiny_mce/themes/simple/images/italic.gif",
- "/js/tiny_mce/themes/simple/images/underline.gif",
- "/js/tiny_mce/themes/simple/images/strikethrough.gif",
- "/js/tiny_mce/themes/simple/images/separator.gif",
- "/js/tiny_mce/themes/simple/images/undo.gif",
- "/js/tiny_mce/themes/simple/images/redo.gif",
- "/js/tiny_mce/themes/simple/images/cleanup.gif",
- "/js/tiny_mce/themes/simple/images/bullist.gif",
- "/js/tiny_mce/themes/simple/images/numlist.gif"
+ "/images/php_reflec_left.gif"
};
public static final String[] PERSON_STATICS = {
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",
@@ -218,12 +182,10 @@
public static final String[] TAGSEARCH_STATICS = {
- "/js/tiny_mce/tiny_mce.js",
"/js/prototype.js",
"/js/effects.js",
"/js/dragdrop.js",
"/js/controls.js",
- "/js/application.js",
"/css/scaffold.css",
"/css/site.css",
"/images/bg_main.png",