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/02/17 23:33:40 UTC
svn commit: r745297 - in /incubator/olio: ./ webapp/php/trunk/etc/
workload/php/trunk/src/org/apache/olio/workload/harness/
workload/rails/trunk/ workload/rails/trunk/bin/ workload/rails/trunk/deploy/
workload/rails/trunk/mysql-connector-java-5.0.6/ wo...
Author: shanti
Date: Tue Feb 17 23:33:39 2009
New Revision: 745297
URL: http://svn.apache.org/viewvc?rev=745297&view=rev
Log:
Fix for OLIO-13 : re-factored rails code with minor updates to fsloader, harness hook
Added NOTICE file
Added:
incubator/olio/NOTICE
incubator/olio/workload/rails/trunk/src/org/ (props changed)
- copied from r745193, incubator/olio/workload/rails/trunk/src/com/
incubator/olio/workload/rails/trunk/src/org/apache/ (props changed)
- copied from r745193, incubator/olio/workload/rails/trunk/src/com/sun/
incubator/olio/workload/rails/trunk/src/org/apache/olio/
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/ (props changed)
- copied from r745193, incubator/olio/workload/rails/trunk/src/com/sun/web20/
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
Removed:
incubator/olio/workload/rails/trunk/.gitignore
incubator/olio/workload/rails/trunk/Web2.0Driver.iml
incubator/olio/workload/rails/trunk/deploy/run2.xml
incubator/olio/workload/rails/trunk/mysql-connector-java-5.0.6/
incubator/olio/workload/rails/trunk/src/com/
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/Web20Driver.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/Web20Benchmark.java
incubator/olio/workload/rails/trunk/src/org/apache/web20/
incubator/olio/workload/rails/trunk/src/org/sun/
incubator/olio/workload/rails/trunk/tmp/
Modified:
incubator/olio/webapp/php/trunk/etc/config.php
incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
incubator/olio/workload/rails/trunk/README
incubator/olio/workload/rails/trunk/bin/dbloader.sh
incubator/olio/workload/rails/trunk/bin/fileloader.sh
incubator/olio/workload/rails/trunk/build.properties.template
incubator/olio/workload/rails/trunk/deploy/benchmark.xml
incubator/olio/workload/rails/trunk/deploy/config.xhtml
incubator/olio/workload/rails/trunk/deploy/run.xml
incubator/olio/workload/rails/trunk/nbproject/project.xml
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Address.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Attendees.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Documents.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/EventTag.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Friends.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Images.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/LoadController.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Person.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Tag.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loadable.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loader.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadConnection.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadResource.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/GrowthTest.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/RandomUtil.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/ScaleFactors.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/Scramble.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/UserName.java
Added: incubator/olio/NOTICE
URL: http://svn.apache.org/viewvc/incubator/olio/NOTICE?rev=745297&view=auto
==============================================================================
--- incubator/olio/NOTICE (added)
+++ incubator/olio/NOTICE Tue Feb 17 23:33:39 2009
@@ -0,0 +1,13 @@
+Copyright 2008 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+California 95054, U.S.A. All rights reserved.
+
+U.S. Government Rights - Commercial software. Government users are subject
+to the Sun Microsystems, Inc. standard license agreement and applicable
+provisions of the FAR and its supplements.
+
+Use is subject to license terms.
+
+This distribution may include materials developed by third parties.
+
+Sun, Sun Microsystems, the Sun logo, Java and MySQL are trademarks or
+registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
Modified: incubator/olio/webapp/php/trunk/etc/config.php
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/etc/config.php?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/webapp/php/trunk/etc/config.php (original)
+++ incubator/olio/webapp/php/trunk/etc/config.php Tue Feb 17 23:33:39 2009
@@ -20,8 +20,8 @@
$web20config['includes'] = $_SERVER['DOCUMENT_ROOT'] . '/../includes/';
$web20config['dbDriver'] = 'PDO'; // Which DB driver to use.
-
// $web20config['dbTarget'] = 'myodbc3'; // ODBC target in odbc.ini.
+
$web20config['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',
@@ -33,6 +33,8 @@
$web20config['dbPass'] = 'web20'; // DB password.
$web20config['cacheSystem'] = 'MemCached';
+// Use below line for no cache - WARNING: db load will increase
+//$web20config['cacheSystem'] = 'NoCache';
$web20config['cacheExpire'] = 7200; // Expiry time for memcache on set function in seconds
@@ -40,7 +42,9 @@
$web20config['localfsRoot'] = '/filestore';
-$web20config['memcachedHosts'] = array('MEMCACHED_HOST:port', 'MEMCACHED_HOST:port'); // memcached host ip
+$web20config['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
$web20config['geocoderURL'] = 'http://GEOCODER_HOST:8080/geocoder/geocode'; //Geocoder URL
Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java (original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java Tue Feb 17 23:33:39 2009
@@ -162,11 +162,19 @@
mediaHandle = java(mediaHost, c);
}
- if (dbHandle != null)
+ if (dbHandle != null) {
dbHandle.waitFor();
+ int exitValue = dbHandle.exitValue();
+ if (exitValue != 0)
+ logger.severe("DB load error, exited with value " + exitValue);
+ }
- if (mediaHandle != null)
+ if (mediaHandle != null) {
mediaHandle.waitFor();
+ int exitValue = mediaHandle.exitValue();
+ if (exitValue != 0)
+ logger.severe("File load error, exited with value " + exitValue);
+ }
//start the memcache servers
memcacheServers =
Modified: incubator/olio/workload/rails/trunk/README
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/README?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/README (original)
+++ incubator/olio/workload/rails/trunk/README Tue Feb 17 23:33:39 2009
@@ -1,13 +1,35 @@
- Web2.0 Sample README
+This directory contains the source code for the Olio PHP workload
+and data generators. The directory structure is standard to Faban.
+The directories of interest (where source code resides) are bin,
+deploy and src.
-The Web2.0 sample provides a very simple example for organizing a Faban
-benchmark project as well as how to write a new benchmark. Many components
-are generic to most Faban projects. It is a good starting point to copy the
-directory from this sample to create your new benchmark. Many components
-will work with no or little modifications.
+To build, create 'build.properties' from the corresponding template and
+execute 'ant deploy.jar'. Once the faban master is started, you can
+also automatically deploy the benchmark, by using 'ant deploy'.
+
+An explanation of the directory structure follows:
+- build.properties.template: This file is a template for build.properties
+ that needs to exist in this directory before you can build and deploy
+ the driver code.
+ The faban.home property needs to be set to home directory where faban
+ is installed.
+ The faban.url property needs to be set to the url of the faban master
+ where the benchmark needs to be deployed.
+
+- The bin directory contains workload specific scripts and executables.
+
+- The deploy directory contains the run parameters (run.xml) and Xforms
+ configuration (config.xhtml).
+
+- The src directory contains the source code for the driver, dbloader
+ and fileloader. Corresponding shell-script wrappers reside in 'bin'.
+
+- The resources directory contains static files used by the file loader.
+
+- The config and lib directories hold standard faban content.
-Notes:
- The sbin directory contains utilities to run a benchmark outside
the Faban harness. This will not be packaged into the deployment
jar files. Benchmark-specific scripts and binaries should be places
- into the bin directory.
\ No newline at end of file
+ into the bin directory.
+
Modified: incubator/olio/workload/rails/trunk/bin/dbloader.sh
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/bin/dbloader.sh?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/bin/dbloader.sh (original)
+++ incubator/olio/workload/rails/trunk/bin/dbloader.sh Tue Feb 17 23:33:39 2009
@@ -17,7 +17,7 @@
BINDIR=`dirname $0`
-# This script is in $FABAN_HOME/benchmarks/Web20Driver/bin
+# This script is in $FABAN_HOME/benchmarks/OlioDriver/bin
# we need to go up 4 levels to get to $FABAN_HOME.
if [ -n "$BINDIR" ]
then
@@ -28,14 +28,14 @@
B=$BENCH_HOME/lib
L=$FABAN_HOME/lib
-CLASSPATH=$B/mysql-connector-java-5.0.6-bin.jar:$B/Web20Driver.jar:\
+CLASSPATH=$B/mysql-connector-java-5.0.6-bin.jar:$B/json.jar:$B/OlioDriver.jar:\
$L/commons-httpclient-2.0.1.jar:$L/fabancommon.jar:$L/commons-logging.jar:\
$L/fabandriver.jar:$L/fabanagents.jar
export CLASSPATH
-$JAVA_HOME/bin/java -server com.sun.web20.loader.LoadController com.mysql.jdbc.Driver \
- "jdbc:mysql://$DB_HOST/web20ror?user=web20&password=web20&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0" $SCALE
-EXIT_CODE=$?
+$JAVA_HOME/bin/java -server org.apache.olio.workload.loader.LoadController com.mysql.jdbc.Driver \
+"jdbc:mysql://$DB_HOST/web20ror?user=web20&password=web20&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0" $SCALE
+EXIT_CODE=$?
if [ "$EXIT_CODE" = 0 ] ; then
echo "Database Load Successful"
else
Modified: incubator/olio/workload/rails/trunk/bin/fileloader.sh
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/bin/fileloader.sh?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/bin/fileloader.sh (original)
+++ incubator/olio/workload/rails/trunk/bin/fileloader.sh Tue Feb 17 23:33:39 2009
@@ -2,7 +2,7 @@
#Script to run loader by hand
if [ -z "$1" ] ; then
- echo "Usage: $0 [concurrent users]" >&2
+ echo "Usage: $0 [concurrent users] <target directory>" >&2
exit 1
fi
@@ -13,25 +13,31 @@
SCALE=$1
+TARGET=$PWD
+
+if [ -n "$2" ] ; then
+ TARGET=$2
+fi
+
BINDIR=`dirname $0`
-# This script is in $FABAN_HOME/benchmarks/Web20Driver/bin
+# This script is in $FABAN_HOME/benchmarks/OlioDriver/bin
# we need to go up 4 levels to get to $FABAN_HOME.
if [ -n "$BINDIR" ]
then
- #FABAN_HOME=`cd $BINDIR/../../.. > /dev/null 2>&1 && pwd`
+ FABAN_HOME=`cd $BINDIR/../../.. > /dev/null 2>&1 && pwd`
BENCH_HOME=`cd $BINDIR/.. > /dev/null 2>&1 &&pwd`
export FABAN_HOME BENCH_HOME
fi
B=$BENCH_HOME/lib
L=$FABAN_HOME/lib
-CLASSPATH=$B/Web20Driver.jar:$L/commons-httpclient-2.0.1.jar:\
+CLASSPATH=$B/OlioDriver.jar:$L/commons-httpclient-2.0.1.jar:\
$L/fabancommon.jar:$L/commons-logging.jar:$L/fabandriver.jar:$L/fabanagents.jar
export CLASSPATH
-$JAVA_HOME/bin/java -server com.sun.web20.fsloader.FileLoader \
- $BENCH_HOME/resources $SCALE
+$JAVA_HOME/bin/java -server org.apache.olio.workload.fsloader.FileLoader \
+ $BENCH_HOME/resources $TARGET $SCALE
EXIT_CODE=$?
if [ "$EXIT_CODE" = 0 ] ; then
Modified: incubator/olio/workload/rails/trunk/build.properties.template
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/build.properties.template?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/build.properties.template (original)
+++ incubator/olio/workload/rails/trunk/build.properties.template Tue Feb 17 23:33:39 2009
@@ -1,6 +1,6 @@
-bench.shortname=Web20Driver
-faban.home=/Users/will/projects/RadLab/new/
-faban.url=http://dewberry.sfbay.sun.com:9980/
+bench.shortname=OlioDriver
+faban.home=/export/home/faban
+faban.url=http://host.sfbay:9980/
deploy.user=deployer
deploy.password=adminadmin
deploy.clearconfig=false
Modified: incubator/olio/workload/rails/trunk/deploy/benchmark.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/deploy/benchmark.xml?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/deploy/benchmark.xml (original)
+++ incubator/olio/workload/rails/trunk/deploy/benchmark.xml Tue Feb 17 23:33:39 2009
@@ -2,9 +2,9 @@
<benchmark>
<!-- Note: Most of these fields are not needed for a benchmark
implemented using the Faban driver framework.
- <name>Sample Web Workload1</name>
+ <name>Olio Workload</name>
<version>0.1</version -->
<config-form>config.xhtml</config-form>
<config-file-name>run.xml</config-file-name>
- <benchmark-class>com.sun.web20.harness.Web20Benchmark</benchmark-class>
+ <benchmark-class>org.apache.olio.workload.harness.OlioBenchmark</benchmark-class>
</benchmark>
Modified: incubator/olio/workload/rails/trunk/deploy/config.xhtml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/deploy/config.xhtml?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/deploy/config.xhtml (original)
+++ incubator/olio/workload/rails/trunk/deploy/config.xhtml Tue Feb 17 23:33:39 2009
@@ -11,7 +11,7 @@
<xforms:model id="benchmark-model">
<xforms:instance id="benchmark-instance" src="{benchmark.template}"/>
<xforms:submission xforms:action="schedule-run.jsp" xforms:replace="all" id="submission-debug" xforms:method="post"/>
- <xforms:bind id="bind-web20" xforms:nodeset="/web20">
+ <xforms:bind id="bind-olio" xforms:nodeset="/olio">
<xforms:bind id="bind-jvmConfig" xforms:nodeset="fh:jvmConfig">
<xforms:bind id="bind-javaHome" xforms:nodeset="fh:javaHome"/>
<xforms:bind id="bind-jvmOptions" xforms:nodeset="fh:jvmOptions"/>
Modified: incubator/olio/workload/rails/trunk/deploy/run.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/deploy/run.xml?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/deploy/run.xml (original)
+++ incubator/olio/workload/rails/trunk/deploy/run.xml Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web20>
+<olio>
<jvmConfig xmlns="http://faban.sunsource.net/ns/fabanharness">
<javaHome>/usr/jdk/instances/jdk1.6.0</javaHome>
<jvmOptions>-Xmx1g -Xms256m -XX:+DisableExplicitGC</jvmOptions>
</jvmConfig>
- <fa:runConfig definition="com.sun.web20.driver.UIDriver" xmlns="http://faban.sunsource.net/ns/fabandriver" xmlns:fa="http://faban.sunsource.net/ns/faban" xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
+ <fa:runConfig definition="org.apache.olio.workload.driver.UIDriver" xmlns="http://faban.sunsource.net/ns/fabandriver" xmlns:fa="http://faban.sunsource.net/ns/faban" xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
<fh:description>Enter description for this run here</fh:description>
<fa:hostConfig>
@@ -50,7 +50,7 @@
<runtimeStats target="9988"/>
<properties>
<property name="serverType">php</property>
- <property name="resourcePath">/apps/faban/benchmarks/web20/resources/</property>
+ <property name="resourcePath">/apps/faban/benchmarks/olio/resources/</property>
</properties>
</driverConfig>
</fa:runConfig>
@@ -78,7 +78,7 @@
<userCommands/>
</fa:hostConfig>
<dbDriver>com.mysql.jdbc.Driver</dbDriver>
- <connectURL>jdbc:mysql://dbHost/web20load?user=web20&password=web20&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL>
+ <connectURL>jdbc:mysql://dbHost/web20ror?user=web20&password=web20&relaxAutoCommit=true&sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL>
<reloadDB>true</reloadDB>
<scale>50</scale>
<dbHomePath>/opt/coolstack/mysql_32bit</dbHomePath>
@@ -118,4 +118,4 @@
<serverList></serverList>
</otherServers>
-->
-</web20>
\ No newline at end of file
+</olio>
Modified: incubator/olio/workload/rails/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/nbproject/project.xml?rev=745297&r1=745296&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/nbproject/project.xml (original)
+++ incubator/olio/workload/rails/trunk/nbproject/project.xml Tue Feb 17 23:33:39 2009
@@ -4,7 +4,7 @@
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>web2.0driver Benchmark</name>
+ <name>Olio Rails Driver</name>
<properties/>
<folders>
<source-folder>
Propchange: incubator/olio/workload/rails/trunk/src/org/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/olio/workload/rails/trunk/src/org/apache/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java Tue Feb 17 23:33:39 2009
@@ -1,34 +1,31 @@
-/* The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * You can obtain a copy of the License at
- * http://www.sun.com/cddl/cddl.html or
- * install_dir/legal/LICENSE
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at install_dir/legal/LICENSE.
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
* $Id: UIDriver.java,v 1.26 2008/02/12 03:24:20 akara Exp $
*
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
*/
-package com.sun.web20.driver;
+package org.apache.olio.workload.driver;
import com.sun.faban.driver.*;
import com.sun.faban.common.Utilities;
import com.sun.faban.common.NameValuePair;
-import com.sun.web20.util.RandomUtil;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
+import org.apache.olio.workload.util.RandomUtil;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.MultipartPostMethod;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java Tue Feb 17 23:33:39 2009
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package com.sun.web20.fsloader;
import com.sun.web20.util.ScaleFactors;
@@ -25,7 +43,7 @@
for (int i = 1; i <= ScaleFactors.users; i++) {
System.out.println("Loading files for user " + i);
copyTo(img, imgSize, "p" + i + ".jpg");
- copyTo(thumb, thumbSize, "p" + i + "t.jpg");
+ copyTo(thumb, thumbSize, "p" + i + "_thumb.jpg");
}
img.close();
@@ -44,7 +62,7 @@
for (int i = 1; i <= ScaleFactors.events; i++) {
System.out.println("Loading files for event " + i);
copyTo(img, imgSize, "e" + i + ".jpg");
- copyTo(thumb, thumbSize, "e" + i + "t.jpg");
+ copyTo(thumb, thumbSize, "e" + i + "_thumb.jpg");
copyTo(lit, litSize, "e" + i + ".pdf");
}
Added: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=745297&view=auto
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java (added)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java Tue Feb 17 23:33:39 2009
@@ -0,0 +1,302 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id: OlioBenchmark.java,v 1.27 2008/03/20 22:31:40 akara Exp $
+ *
+ */
+package org.apache.olio.workload.harness;
+
+import com.sun.faban.common.Command;
+import com.sun.faban.common.CommandHandle;
+import com.sun.faban.common.NameValuePair;
+import com.sun.faban.harness.DefaultFabanBenchmark;
+import com.sun.faban.harness.RunContext;
+import com.sun.faban.harness.engine.ApacheHttpdService;
+import com.sun.faban.harness.engine.LighttpdService;
+import com.sun.faban.harness.engine.MemcachedService;
+
+import com.sun.faban.harness.engine.WebServerService;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.sun.faban.harness.RunContext.*;
+
+/**
+ * Harness hook for the sample web benchmark. This class is not needed
+ * for benchmarks implemented using the Faban Driver Framework if the
+ * default behavior is sufficient. We just show the hooks you can
+ * customize in this class. If the default behavior is desired, you can
+ * leave out the benchmark-class element in benchmark.xml.
+ *
+ * @author Akara Sucharitakul
+ */
+public class OlioBenchmark extends DefaultFabanBenchmark {
+
+ static Logger logger = Logger.getLogger(
+ OlioBenchmark.class.getName());
+ int totalRunningTimeInSecs = 0;
+ private LinkedHashSet<String> hostsSet;
+ private ArrayList<NameValuePair<Integer>> hostsPorts;
+ private String webServerBinPath, webServerLogPath, webServerConfPath;
+ private String webServerPidPath, phpIniPath, cacheBinPath, dbConfPath;
+ WebServerService webServerService;
+ MemcachedService memcachedService = MemcachedService.getHandle();
+
+ /**
+ * Allows benchmark to validate the configuration file. Note that no
+ * execution facility is available during validation.
+ *
+ * @throws Exception if any error occurred.
+ * @see com.sun.faban.harness.RunContext#exec(com.sun.faban.common.Command)
+ */
+ public void validate() throws Exception {
+ params = getParamRepository();
+ params.setParameter("fa:runConfig/fd:driverConfig" +
+ "[@name='UIDriver']/fd:properties/fd:property" +
+ "[@name='resourcePath']",
+ getBenchmarkDir() + "resources" + File.separator);
+
+ //cache servers get list of servers for the host
+ String cacheServers = params.getParameter("cacheServers/serverList");
+
+ // replacing all the newline characters and other white space
+ // characters with a blank space
+ cacheServers = cacheServers.replaceAll("\\s", " ");
+
+ // Find the patterns that have either hostname or hostname:port values
+ Pattern p1 = Pattern.compile("([a-zA-Z_0-9-\\.]+):?(\\w*)\\s*");
+ Matcher m1 = p1.matcher(cacheServers + ' '); // add a whitespace at end
+
+ hostsSet = new LinkedHashSet<String>();
+ hostsPorts = new ArrayList<NameValuePair<Integer>>();
+
+ //need to get these data structures for restarting memcache servers for RunContext
+
+ // Fill up the hosts set with names of all the hosts
+ for (boolean found = m1.find(); found; found = m1.find()) {
+ NameValuePair<Integer> hostPort = new NameValuePair<Integer>();
+ hostPort.name = m1.group(1);
+ String port = m1.group(2);
+ if (port != null && port.length() > 1)
+ hostPort.value = new Integer(port);
+ else
+ hostPort.value = 11211;
+ //logger.info("with port number " + hostPort.value);
+ hostsSet.add(hostPort.name);
+ hostsPorts.add(hostPort);
+ }
+
+ // Now extract the unique hosts
+ StringBuffer hosts = new StringBuffer();
+ for (String host : hostsSet) {
+ hosts.append(host);
+ hosts.append(' ');
+ }
+
+ // Update the unique hosts to the host filed and save
+ String cacheHosts = hosts.toString().trim();
+ params.setParameter("cacheServers/fa:hostConfig/fa:host", cacheHosts);
+ logger.info("Memcached Hosts: " + cacheHosts);
+
+ params.save();
+ super.validate();
+
+ }
+
+ /**
+ * This method is called to configure the specific benchmark run
+ * Tasks done in this method include reading user parameters,
+ * logging them and initializing various local variables.
+ *
+ * @throws Exception If configuration was not successful
+ */
+ public void configure() throws Exception {
+
+ //Obtaining configuration parameters
+ String webserverType = params.getParameter("webServer/type");
+
+ webServerBinPath = params.getParameter("webServer/hostBinPath");
+ webServerLogPath = params.getParameter("webServer/hostLogPath");
+ webServerConfPath = params.getParameter("webServer/hostConfPath");
+ webServerPidPath = params.getParameter("webServer/hostPidPath");
+ phpIniPath = params.getParameter("webServer/phpIniPath");
+ cacheBinPath = params.getParameter("cacheServers/cacheBinPath");
+ dbConfPath = params.getParameter("dbServer/dbConfPath");
+ String dbhost = params.getParameter("dbServer/fa:hostConfig/fa:host");
+ String webhost = params.getParameter("webServer/fa:hostConfig/fa:host");
+ /*
+ if (webserverType.equals("apache")) {
+ webServerService = ApacheHttpdService.getHandle();
+ RunContext.getFile(webhost, webServerConfPath +
+ File.separator + "httpd.conf",
+ RunContext.getOutDir() + "httpd.conf." + webhost);
+ } else {
+ webServerService = LighttpdService.getHandle();
+ RunContext.getFile(webhost, webServerConfPath +
+ File.separator + "lighttpd.conf",
+ RunContext.getOutDir() + "lighttpd.conf." + webhost);
+ }
+ */
+ /* RunContext.getFile(webhost, phpIniPath + "/php.ini",
+ RunContext.getOutDir() + "php.ini." + webhost);
+
+ RunContext.getFile(dbhost, dbConfPath + "/my.cnf",
+ RunContext.getOutDir() + "my.cnf." + dbhost);
+ */
+
+ // Reloading database and media as necessary.
+ boolean reloadDB = Boolean.parseBoolean(
+ params.getParameter("dbServer/reloadDB"));
+ boolean reloadMedia = Boolean.parseBoolean(
+ params.getParameter("dataStorage/reloadMedia"));
+
+ int scale = -1;
+ if (reloadDB || reloadMedia)
+ scale =Integer.parseInt(params.getParameter("dbServer/scale"));
+
+ CommandHandle dbHandle = null;
+ CommandHandle mediaHandle = null;
+ if (reloadDB) {
+ String dbHost =
+ params.getParameter("dbServer/fa:hostConfig/fa:host");
+ String driver = params.getParameter("dbServer/dbDriver");
+ String connectURL = params.getParameter("dbServer/connectURL");
+ // Un-escape the URL.
+ connectURL = connectURL.replace("&", "&");
+ Command c = new Command("-Dcommit.tx=false " +
+ "com.sun.web20.loader.LoadController " +
+ driver + ' ' + connectURL + ' ' + scale);
+ c.setSynchronous(false);
+ dbHandle = java(dbHost, c);
+ }
+
+ if (reloadMedia) {
+ String mediaHost = params.getParameter(
+ "dataStorage/fa:hostConfig/fa:host");
+ Command c = new Command("loader.pl -d sfbay.sun.com -s " + scale);
+ c.setSynchronous(false);
+ c.setStreamHandling(Command.STDOUT, Command.TRICKLE_LOG);
+ c.setStreamHandling(Command.STDERR, Command.TRICKLE_LOG);
+ mediaHandle = exec(mediaHost, c);
+ }
+
+ if (dbHandle != null) {
+ dbHandle.waitFor();
+ int exitValue = dbHandle.exitValue();
+ if (exitValue != 0)
+ logger.severe("DB load error, exited with value " + exitValue);
+ }
+
+ if (mediaHandle != null) {
+ mediaHandle.waitFor();
+ int exitValue = mediaHandle.exitValue();
+ if (exitValue != 0)
+ logger.severe("File load error, exited with value " + exitValue);
+ }
+
+ //start the memcache servers
+ /*int index = 0;
+ String memServers[] = new String[hostsPorts.size()];
+ int ports[] = new int[hostsPorts.size()];
+ for (NameValuePair<Integer> thisCacheServer : hostsPorts) {
+ memServers[index] = thisCacheServer.name;
+ ports[index++] = thisCacheServer.value;
+ }
+ memcachedService.setup(memServers, ports, "-u mysql -m 256",
+ cacheBinPath);
+ if ( !memcachedService.restartServers())
+ throw (new Exception("Memcached server(s) restart failed"));
+
+
+ // Now start the web servers
+ String ahosts[] = new String[1];
+ ahosts[0] = webhost;
+ webServerService.setup(ahosts, webServerBinPath, webServerLogPath,
+ webServerConfPath, webServerPidPath);
+ if ( !webServerService.restartServers())
+ throw (new Exception("Webserver(s) restart failed"));
+ */
+ super.configure();
+ }
+
+ /**
+ * override DefaultBenchmark's start method so memcache stats can be
+ * collected via the Web20benchmark harness class
+ */
+ public void start() throws Exception {
+
+ //get the server list
+ String cacheServers = params.getParameter("cacheServers/serverList");
+ String[] cacheHosts = params.getTokenizedValue(
+ "cacheServers/fa:hostConfig/fa:host");
+ String rampUp = params.getParameter(
+ "fa:runConfig/fa:runControl/fa:rampUp");
+ String steadyState = params.getParameter(
+ "fa:runConfig/fa:runControl/fa:steadyState");
+ String rampDown = params.getParameter(
+ "fa:runConfig/fa:runControl/fa:rampDown");
+ String interval = params.getParameter("fa:runConfig/" +
+ "fd:driverConfig[@name='UIDriver']/fd:stats/fd:interval");
+
+
+ //calculate total running time, including rampUp, steadyState,
+ // and rampDown
+ this.totalRunningTimeInSecs = Integer.parseInt(rampUp) +
+ Integer.parseInt(steadyState) + Integer.parseInt(rampDown);
+
+// Command statsCommand = new Command(
+// "com.sun.web20.util.MemCacheUtility " + cacheServers + " -s "
+// + rampUp + " -e " + steadyState + " -i " + interval);
+// statsCommand.setSynchronous(false);
+// statsCommand.setStreamHandling(Command.STDOUT, Command.CAPTURE);
+// statsCommand.setOutputFile(Command.STDOUT, RunContext.getOutDir() +
+// "memcachestats.log." + getHostName(cacheHosts[0]));
+ // Use the real name of the first host.
+
+ super.start();
+
+// logger.info("Launching memcache stats collection with " +
+// "interval time of " + interval);
+// RunContext.java(statsCommand);
+ }
+
+ /* override DefaultBenchmark's end method to collect apache log file
+ * via the OlioBenchmark harness class
+ */
+
+ public void end () throws Exception {
+
+ super.end();
+
+ //stop the memcached servers
+ //logger.info("Stopping Memcached servers");
+ //memcachedService.stopServers();
+
+ // xfer apache logs
+ //logger.info("Transferring Apache error logs");
+ //webServerService.xferLogs(totalRunningTimeInSecs);
+
+ // stop apache servers
+ //logger.info("Stopping Apache servers");
+ //webServerService.stopServers();
+ }
+
+}
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Address.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Address.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Address.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Address.java Tue Feb 17 23:33:39 2009
@@ -1,10 +1,27 @@
-package com.sun.web20.loader;
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.RandomUtil;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.RandomUtil;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.util.logging.Logger;
import java.util.logging.Level;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Attendees.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Attendees.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Attendees.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Attendees.java Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.sql.PreparedStatement;
import java.sql.SQLException;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.sql.Date;
import java.util.logging.Logger;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Documents.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Documents.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Documents.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Documents.java Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.util.logging.Logger;
import java.util.logging.Level;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/EventTag.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/EventTag.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/EventTag.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/EventTag.java Tue Feb 17 23:33:39 2009
@@ -1,10 +1,10 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.RandomUtil;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.RandomUtil;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.util.LinkedHashSet;
import java.sql.PreparedStatement;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Friends.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Friends.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Friends.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Friends.java Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.util.LinkedHashSet;
import java.util.logging.Logger;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Images.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Images.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Images.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Images.java Tue Feb 17 23:33:39 2009
@@ -1,11 +1,11 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.util.logging.Logger;
import java.util.logging.Level;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/LoadController.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/LoadController.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/LoadController.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/LoadController.java Tue Feb 17 23:33:39 2009
@@ -1,10 +1,10 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
-import com.sun.web20.util.ScaleFactors;
+import org.apache.olio.workload.util.ScaleFactors;
import java.util.logging.Logger;
-import static com.sun.web20.loader.framework.Loader.*;
+import static org.apache.olio.workload.loader.framework.Loader.*;
public class LoadController {
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Person.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Person.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Person.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Person.java Tue Feb 17 23:33:39 2009
@@ -1,12 +1,12 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.UserName;
-import com.sun.web20.util.RandomUtil;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.util.RandomUtil;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.sql.PreparedStatement;
import java.sql.SQLException;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java Tue Feb 17 23:33:39 2009
@@ -1,12 +1,12 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
import com.sun.faban.driver.util.Random;
-import com.sun.web20.util.UserName;
-import com.sun.web20.util.RandomUtil;
-import com.sun.web20.util.ScaleFactors;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.ThreadConnection;
-import com.sun.web20.loader.framework.ThreadResource;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.util.RandomUtil;
+import org.apache.olio.workload.util.ScaleFactors;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
+import org.apache.olio.workload.loader.framework.ThreadResource;
import java.sql.Date;
import java.sql.PreparedStatement;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Tag.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Tag.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Tag.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Tag.java Tue Feb 17 23:33:39 2009
@@ -1,9 +1,9 @@
-package com.sun.web20.loader;
+package org.apache.olio.workload.loader;
-import com.sun.web20.util.UserName;
-import com.sun.web20.loader.framework.Loadable;
-import com.sun.web20.loader.framework.Loader;
-import com.sun.web20.loader.framework.ThreadConnection;
+import org.apache.olio.workload.util.UserName;
+import org.apache.olio.workload.loader.framework.Loadable;
+import org.apache.olio.workload.loader.framework.Loader;
+import org.apache.olio.workload.loader.framework.ThreadConnection;
import java.util.logging.Logger;
import java.util.logging.Level;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loadable.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loadable.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loadable.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loadable.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.loader.framework;
+package org.apache.olio.workload.loader.framework;
public abstract class Loadable {
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loader.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loader.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loader.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/Loader.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.loader.framework;
+package org.apache.olio.workload.loader.framework;
import java.sql.SQLException;
import java.util.concurrent.*;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadConnection.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadConnection.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadConnection.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadConnection.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.loader.framework;
+package org.apache.olio.workload.loader.framework;
import java.sql.*;
import java.util.ArrayList;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadResource.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadResource.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadResource.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/framework/ThreadResource.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.loader.framework;
+package org.apache.olio.workload.loader.framework;
import com.sun.faban.driver.util.Random;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/GrowthTest.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/GrowthTest.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/GrowthTest.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/GrowthTest.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
/**
* Code to test the growth function and match it to existing research.
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java Tue Feb 17 23:33:39 2009
@@ -7,7 +7,7 @@
* and open the template in the editor.
*/
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
import com.danga.MemCached.MemCachedClient;
import com.danga.MemCached.SockIOPool;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/RandomUtil.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/RandomUtil.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/RandomUtil.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/RandomUtil.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
import com.sun.faban.driver.util.Random;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/ScaleFactors.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/ScaleFactors.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/ScaleFactors.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/ScaleFactors.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
import java.util.logging.Logger;
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/Scramble.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/Scramble.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/Scramble.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/Scramble.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
/*
* Copyright (c) 2000-2004 by Sun Microsystems, Inc. All Rights Reserved.
Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/UserName.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/UserName.java?rev=745297&r1=745193&r2=745297&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/UserName.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/UserName.java Tue Feb 17 23:33:39 2009
@@ -1,4 +1,4 @@
-package com.sun.web20.util;
+package org.apache.olio.workload.util;
/*
* Copyright (c) 2000-2004 by Sun Microsystems, Inc. All Rights Reserved.
* This software is the proprietary information of Sun Microsystems, Inc.