From: Mike Taylor <mike@indexdata.com>
Date: Tue, 22 Jul 2014 16:37:33 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~371^2~10^2
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=c36dbaa2cdf9eb4f0ed64a56fc0940646c1bf741;hp=4c4047a68b77c251eac5275ea1637080c17c58e7;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

diff --git a/examples/htdocs/jasmine-cors-popup.html b/examples/htdocs/jasmine-cors-popup.html
index 59ada3e..a910bee 100644
--- a/examples/htdocs/jasmine-cors-popup.html
+++ b/examples/htdocs/jasmine-cors-popup.html
@@ -30,7 +30,6 @@
     <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript"> mkws_jasmine_init(500); </script>
 
     <style type="text/css">
       body > div > form > input.ui-state-default { background: none; }
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index ed44aff..d5758b3 100644
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -37,7 +37,6 @@
     <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript"> mkws_jasmine_init(500); </script>
 
     <style type="text/css">
       body > div > form > input.ui-state-default { background: none; }
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index e95766d..b2c7450 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -37,8 +37,6 @@
     <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript"> mkws_jasmine_init(500); </script>
-
     <!-- jquery null test
     <script type="text/javascript">$ = undefined;</script>
 	-->
diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index 0e106bb..3fea281 100644
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -45,9 +45,6 @@
 
     <!-- init and run jasmine -->
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript">
-      mkws_jasmine_init(500);
-    </script>
   <!-- EOF jasmine -->
 
   </head>
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index e47e374..afbe943 100644
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -39,9 +39,6 @@
 
     <!-- init and run jasmine -->
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript">
-      mkws_jasmine_init(500);
-    </script>
   <!-- EOF jasmine -->
 
   </head>
diff --git a/test/js/mkws-jasmine-run.js b/test/js/mkws-jasmine-run.js
index 1aec289..1037775 100644
--- a/test/js/mkws-jasmine-run.js
+++ b/test/js/mkws-jasmine-run.js
@@ -35,4 +35,8 @@ function mkws_jasmine_init(delay) {
     }
 };
 
+mkws.$(document).ready(function() { 
+    mkws_jasmine_init(100);
+});
+
 /* EOF */
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 1bf7ab2..088b741 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -16,7 +16,7 @@ Listen ${APACHE_PORT}
 Include ${APACHE_MODULES}
 
 <IfModule log_config_module>
-   #LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
 </IfModule>
 
 # pazpar2 / service proxy config
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 9d74c0a..e0cfd60 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -16,11 +16,11 @@
     RewriteLog /var/log/apache2/mkws-rewrite.log 
 
     # Credential-hiding rewrite rules for standard MKWS account, testing account and various application accounts
-    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? 	/service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws [P]
-    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? 	/service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest [P]
-    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=credo&password=emu [P]
-    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo [P]
-    RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc [P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? 	/service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws&identity=mkws [P]
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? 	/service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest&identity=mkws_test [P]
+    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=credo&password=emu&identity=testing_credo_emulator [P]
+    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo&identity=demo_koha_mkws [P]
+    RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?  	/service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc&identity=orex_digital2 [P]
 
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal