QPID-1157: Added cc example automation scripts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@672766 13f79535-47bb-0310-9956-ffa450edef68

25 files changed, 394 insertions, 34 deletions

diff --git a/qpid/cc/config.xml b/qpid/cc/config.xml
index 3b94d568b7..a9f81c1f4a 100644
--- a/qpid/cc/config.xml
+++ b/qpid/cc/config.xml
@@ -22,4 +22,5 @@ under the License.
   <include.projects file="./config/java-trunk.xml"/>

   <include.projects file="./config/bdbstore-cpp-trunk.xml"/>

   <include.projects file="./config/cpp-trunk-perftests.xml"/>

+  <include.projects file="./config/example-automation.xml"/>

 </cruisecontrol>

diff --git a/qpid/cc/config/example-automation.xml b/qpid/cc/config/example-automation.xml
new file mode 100644
index 0000000000..7dc69bd052
--- /dev/null
+++ b/qpid/cc/config/example-automation.xml
@@ -0,0 +1,64 @@
+<!--

+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.

+-->

+<cruisecontrol>

+    <project name="qpid-example-automation"

+             buildafterfailed="false">

+

+    <!-- Load environment variables -->

+    <property environment="env" toupper="true"/>

+

+        <listeners>

+            <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>

+        </listeners>

+

+        <modificationset quietperiod="30">

+            <buildstatus logdir="logs/qpid-cpp-trunk/"/>

+            <buildstatus logdir="logs/qpid-java-trunk/"/>

+            <buildstatus logdir="logs/bdbstore-cpp-trunk/"/>

+        </modificationset>

+

+        <schedule interval="3600">

+      	    <exec timeout="1800" 

+		  command="/bin/bash" 

+		  args="${env.CC_HOME}/cc/scripts/check_examples.sh"

+		  errorstr="FAILED"

+		  workingdir="./" />

+        </schedule>

+

+     <publishers>

+            <artifactspublisher dest="artifacts/${project.name}" 

+                                file="${env.CC_HOME}/broker.log"/>

+            <artifactspublisher dest="artifacts/${project.name}" 

+                                file="${env.CC_HOME}/script.log"/>

+

+           <!--

+            <email subjectprefix="CC report fro ${project.name}" mailhost="localhost"

+                   returnaddress="my_email"

+		   buildresultsurl="http://my_host:8080/buildresults/${project.name}"

+                   skipusers="false" 

+		   reportsuccess="fixes"

+                   spamwhilebroken="true">

+                   <always address="email"/>

+		   <map alias="name" address="email"/>

+            </email>

+	    -->

+

+        </publishers>

+    </project>

+</cruisecontrol>

diff --git a/qpid/cc/scripts/check_examples.sh b/qpid/cc/scripts/check_examples.sh
new file mode 100755
index 0000000000..c10936b36c
--- /dev/null
+++ b/qpid/cc/scripts/check_examples.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+###########################################################
+#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.
+###########################################################
+
+runVerifyScript()
+{
+ echo "-----------<Run verify scripts>-------------"
+ $CC_HOME/cc/scripts/verify_all
+ echo "-----------</Run verify scripts>------------"
+ echo ""
+}
+
+cleanup()
+{
+rm -f $CC_HOME/script.log
+rm -f $CC_HOME/status.log
+rm -f $CC_HOME/broker.log
+}
+
+checkErrors()
+{
+if test `cat $CC_HOME/script.log | grep -c 'FAIL'`  -gt 0
+then
+ echo "FAILED"
+ printErrors > $CC_HOME/status.log
+fi
+}
+
+printErrors(){
+ echo "<desc>The following scripts had failures"
+ cat CC_HOME/script.log | awk '{
+ script = ""
+ while ((getline) == 1)
+ { 
+   if ($1 == "script:")
+   {
+     script = $0
+   }
+   if ($1 == "FAIL")
+   {
+     print substr(script,9)
+   }
+ }}'
+ echo "</desc>"
+}
+
+echo "*************************************"
+echo "Example Automation "
+echo ""
+cleanup
+runVerifyScript
+checkErrors
+echo "*************************************"
diff --git a/qpid/cc/scripts/verify b/qpid/cc/scripts/verify
new file mode 100755
index 0000000000..c183fee323
--- /dev/null
+++ b/qpid/cc/scripts/verify
@@ -0,0 +1,98 @@
+#!/bin/sh
+###########################################################
+#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.
+###########################################################
+
+export CLASSPATH=`find "$CC_HOME/java/build/lib" -name '*.jar' | tr '\n' ":"`
+export CPP=$CC_HOME/cpp/examples
+export JAVA=$CC_HOME/java/client/example/src/main/java
+export PYTHONPATH=$CC_HOME/python/
+export PYTHON_EXAMPLES=$CC_HOME/python/examples
+
+cleanup() {
+    test -n "$QPIDD" &&  $QPIDD -q # Private broker
+    kill %% > /dev/null 2>&1	# Leftover background jobs
+}
+
+trap cleanup EXIT
+
+ARGS="${QPID_HOST:-localhost} $QPID_PORT"
+
+outfile() {
+    file=$1
+    while [ -f $file.out ]; do file="${file}X"; done
+    echo $file.out
+ }
+
+fail() { test -n "$*" && echo $* 1>&2 ; FAIL=1; return 1; }
+
+client() 
+{
+ "$@" $ARGS > `outfile $*` || fail; 
+}
+
+clients() { for cmd in "$@"; do client $cmd; done; }
+
+waitfor() { until grep -a -l "$2" $1 >/dev/null 2>&1 ; do sleep 1 ; done ; } 
+
+background() {
+    pattern=$1; shift
+    out=`outfile $*`
+    eval "$* $ARGS > $out &" || { fail; return 1; }
+    waitfor $out "$pattern"
+}
+
+name() {
+    for x in $*; do name="$name `basename $x`"; done
+    echo $name;
+}
+
+outputs() {
+    wait 2> /dev/null		# Wait for all backgroud processes to complete
+    rm -f $script.out
+    for f in "$@"; do
+	{ echo "==== `name $f`"; eval "cat $f"; } >> $script.out || fail
+        rm -rf `echo $f| awk '{ print $1 }'` 
+    done
+}
+
+verify() {
+    FAIL=
+    if [ -d $1 ]; then dir=$1; script=verify;
+    else dir=`dirname $1`; script=`basename $1`; fi
+    cd $dir || return 1
+    rm -f *.out
+    { source ./$script && diff -ac $script.out $script.in ; } || fail
+    test -z "$FAIL" && rm -f *.out
+    return $FAIL
+}
+
+HEX="[a-fA-F0-9]"
+remove_uuid() {
+    sed "s/$HEX\{8\}-$HEX\{4\}-$HEX\{4\}-$HEX\{4\}-$HEX\{12\}//g" $*
+}
+remove_uuid64() {
+    sed 's/[-A-Za-z0-9_]\{22\}==//g' $*
+}
+
+
+for example in "$@"; do
+    echo "Running:  $example "
+     if ( verify $example; ) then echo "PASS";  else echo "FAIL"; RET=1; fi
+     done
+exit $RET
diff --git a/qpid/cc/scripts/verify_all b/qpid/cc/scripts/verify_all
new file mode 100755
index 0000000000..fcb38f3709
--- /dev/null
+++ b/qpid/cc/scripts/verify_all
@@ -0,0 +1,126 @@
+#!/bin/sh
+###########################################################
+#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.
+###########################################################
+
+cleanup()
+{
+  echo "******************************************************"
+  echo "Cleanup"
+  echo "******************************************************"
+  for PID in `ps aux | grep 'qpidd'|grep 'broker.log'|grep -v 'grep'|awk '{ print $2 }'`
+  do
+     kill -9 $PID
+  done
+}
+
+run_broker()
+{
+  echo "******************************************************"
+  echo "Starting C++ broker"
+  echo "******************************************************"
+  echo ""
+  $CC_HOME/cpp/src/qpidd -t -d --auth no --no-data-dir --log-output $CC_HOME/broker.log
+}
+
+stop_broker()
+{
+  echo "******************************************************"
+  echo "Stopping the C++ broker"
+  echo "******************************************************"
+  echo ""
+  $CC_HOME/cpp/src/qpidd -q
+}
+
+verify()
+{
+ #echo "arg " $2 " path: " $1
+ for dir in $(find $1  -mindepth 1 -maxdepth 1 -type d -not -name '*.svn' -not -name $3 )  
+ do
+  echo $dir
+  for script in $(find $dir -mindepth 1 -maxdepth 1 -type f -name $2 -not -name '*.*')
+  do
+   # echo "script:"  $script
+    cleanup
+    run_broker
+    $CC_HOME/cc/scripts/verify $script >>  $CC_HOME/script.log 2>&1
+    killall 'verify'
+    stop_broker
+  done
+done
+}
+
+run_python_python()
+{
+echo "-----------<Running Python/Python combination>---------"
+verify $CC_HOME/python/examples "verify" "xml-exchange"
+echo "-----------</Running Python/Python combination>---------"
+echo ""
+}
+
+
+run_cpp_cpp()
+{
+echo "-----------<Running C++/C++ combination>---------"
+verify  $CC_HOME/cpp/examples "verify" "*.svn"
+echo "-----------</Running C++/C++ combination>--------"
+echo ""
+}
+
+run_python_cpp_comb()
+{
+echo "-----------<Running Python/C++ combination>---------"
+verify $CC_HOME/cpp/examples "verify_cpp_python" "*.svn"
+verify $CC_HOME/cpp/examples "verify_python_cpp" "*.svn"
+echo "-----------</Running Python/C++ combination>--------"
+echo ""
+}
+
+
+run_java_java()
+{
+echo "-----------<Running Java/Java combination>---------"
+verify $CC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample "verify" "*.svn"
+echo "-----------</Running Java/Java combination>--------"
+echo ""
+}
+
+run_java_cpp_comb()
+{
+echo "-----------<Running Java/C++ combination>---------"
+verify  $CC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample "verify_java_cpp" "*.svn"
+verify  $CC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample "verify_cpp_java" "*.svn"
+echo "-----------</Running Java/C++ combination>--------"
+echo ""
+}
+
+run_java_python_comb()
+{
+echo "-----------<Running Java/Python combination>---------"
+verify $CC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample "verify_java_python" "*.svn" 
+verify $CC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample "verify_python_java" "*.svn"
+echo "-----------</Running Java/Python combination>--------"
+echo ""
+}
+
+run_python_python
+run_python_cpp_comb
+run_cpp_cpp
+run_java_java
+run_java_cpp_comb
+run_java_python_comb
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
index afcd30af88..0541e490b6 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
@@ -2,12 +2,13 @@
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
 cpp=$CPP/direct
 
-direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+direct_consumer_java()
+{
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $cpp/declare_queues direct_producer_java direct_consumer_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
index 85c8a12903..d581c4c1aa 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
@@ -2,7 +2,7 @@
 cpp=$CPP/direct
 
 direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 clients $cpp/declare_queues $cpp/direct_producer direct_consumer_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
index 8cea77025e..573cac6986 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
@@ -2,7 +2,7 @@
 cpp=$CPP/direct
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $cpp/declare_queues direct_producer_java $cpp/listener
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
index 5fedcb10e5..61c033e969 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/direct
+py=$PYTHON_EXAMPLES/direct
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $py/declare_queues.py direct_producer_java $py/direct_consumer.py
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
index 7914665baf..4182331f3f 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/direct
+py=$PYTHON_EXAMPLES/direct
 
 direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 clients $py/declare_queues.py  $py/direct_producer.py direct_consumer_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify
index 69528a0cf9..2edc1ced02 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify
@@ -3,11 +3,11 @@
 cpp=$CPP/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java
index 3e0d7534bc..de057ea3b1 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java
@@ -3,7 +3,7 @@
 cpp=$CPP/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp
index c1e1585ac3..dab6114572 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp
@@ -3,7 +3,7 @@
 cpp=$CPP/fanout
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "Listening" $cpp/listener
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python
index b57cb4af38..1641d88354 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python
@@ -1,9 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
-py=$PYTHON/fanout
+py=$PYTHON_EXAMPLES/fanout
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "Subscribed" $py/fanout_consumer.py
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java
index e10d077dfb..0f05663985 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java
@@ -1,9 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
-py=$PYTHON/fanout
+py=$PYTHON_EXAMPLES/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify
index 3e2a1b9b04..cceb565dfc 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify
@@ -2,11 +2,11 @@
 cpp=$CPP/pub-sub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "can receive messages" topic_listener_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java
index f189290fda..9276b3e21b 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java
@@ -2,7 +2,7 @@
 cpp=$CPP/pub-sub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 background "can receive messages" topic_listener_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp
index 87743681f4..af22b3b82c 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp
@@ -2,7 +2,7 @@
 cpp=$CPP/pub-sub
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "Listening" $cpp/topic_listener
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python
index a8daf6ba30..3758e0f014 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/pubsub
+py=$PYTHON_EXAMPLES/pubsub
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "Queues created" $py/topic_subscriber.py
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java
index fc8f526145..c2b516f376 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/pubsub
+py=$PYTHON_EXAMPLES/pubsub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 background "can receive messages" topic_listener_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify
index b3b0735d53..daf84c8ff9 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify
@@ -2,11 +2,11 @@
 cpp=$CPP/pub-sub
 
 client_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
 }
 
 server_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
 }
 
 background "can receive messages" server_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java
index 4551b9ab0c..6ef1b3b7e3 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java
@@ -1,8 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 cpp=$CPP/request-response
 
-client_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
+client_java()
+{
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
 }
 
 background "Waiting" $cpp/server
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
index 27510dc3f7..2513eb691b 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
@@ -2,7 +2,7 @@
 cpp=$CPP/request-response
 
 server_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
 }
 
 background "can receive messages" server_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python
index 01bec87cab..0760952527 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/request-response
+py=$PYTHON_EXAMPLES/request-response
 
 server_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
 }
 
 background "can receive messages" server_java
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java
index 92a33f4a1e..6ea526e914 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/request-response
+py=$PYTHON_EXAMPLES/request-response
 
 client_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
 }
 
 background "Request server running" $py/server.py