Author: shanti
Date: Wed Jan 7 10:41:35 2009
New Revision: 732424
URL: http://svn.apache.org/viewvc?rev=732424&view=rev
Log:
Fixed Issue OLIO-25: URL for geocoder and instructions for building it.
Modified:
incubator/olio/docs/php_setup.html
incubator/olio/webapp/php/trunk/etc/config.php
Modified: incubator/olio/docs/php_setup.html
URL:
http://svn.apache.org/viewvc/incubator/olio/docs/php_setup.html?rev=732424&r1=732423&r2=732424&view=diff
==============================================================================
--- incubator/olio/docs/php_setup.html (original)
+++ incubator/olio/docs/php_setup.html Wed Jan 7 10:41:35 2009
@@ -53,11 +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"><BR>
+<P STYLE="margin-bottom: 0in">
</P>
<P STYLE="margin-bottom: 0in">Downloading the source</P>
-<P STYLE="margin-bottom: 0in"><BR>
-</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>
@@ -287,9 +285,9 @@
on the driver machine. The install directory doesn't matter â we
will refer to it as $TOMCAT_HOME.
</P>
- <LI><P>Build the Web20Emulator.war file (NOTE: source code is
- currently missing in repository)</P>
- <LI><P>Copy the Web20Emulator.war file from the Web20Kit in
+ <LI><P>Build the <i>geocoder.war</i> file by going to the 'geocoder'
directory
+ and following the instructions in the README file.</P>
+ <LI><P>Copy the geocoder.war file from the geocoder/dist directory to
$TOMCAT_HOME/webapps.</P>
<LI><P>Start Tomcat using $TOMCAT_HOME/bin/startup.sh.</P>
</OL>
Modified: incubator/olio/webapp/php/trunk/etc/config.php
URL:
http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/config.php?rev=732424&r1=732423&r2=732424&view=diff
==============================================================================
--- incubator/olio/webapp/php/trunk/etc/config.php (original)
+++ incubator/olio/webapp/php/trunk/etc/config.php Wed Jan 7 10:41:35 2009
@@ -38,7 +38,7 @@
$web20config['memcachedHosts'] = array('MEMCACHED_HOST:port',
'MEMCACHED_HOST:port'); // memcached host ip
-$web20config['geocoderURL'] =
'http://GEOCODER_HOST:8080/Web20Emulator/geocode'; //Geocoder URL
+$web20config['geocoderURL'] = 'http://GEOCODER_HOST:8080/geocoder/geocode';
//Geocoder URL
class Web20 {
public static $config;
