Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 0 deletions

diff --git a/branches/sca-android/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf b/branches/sca-android/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
new file mode 100644
index 0000000000..37cf284d35
--- /dev/null
+++ b/branches/sca-android/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
@@ -0,0 +1,28 @@
+# Load mod_jk module

+# Update this path to match your modules location

+LoadModule    jk_module  modules/mod_jk.so

+

+# Declare the module for <IfModule directive> (remove this line on Apache 2.x)

+# AddModule     mod_jk.c

+# Where to find workers.properties

+# Update this path to match your conf directory location (put workers.properties next to httpd.conf)

+JkWorkersFile conf/workers.properties

+

+# Where to put jk shared memory

+# Update this path to match your local state directory or logs directory

+JkShmFile     logs/mod_jk.shm

+

+# Where to put jk logs

+# Update this path to match your logs directory location (put mod_jk.log next to access_log)

+JkLogFile     logs/mod_jk.log

+

+# Set the jk log level [debug/error/info]

+JkLogLevel    info

+

+# Select the timestamp log format

+JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "

+

+# Send everything for context /examples to worker named worker1 (ajp13)

+# JkMount  /examples/* worker1

+# Send everything for context /* to the router

+JkMount  /* router