From: Wolfram Schneider Date: Fri, 13 Dec 2013 14:17:05 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 0.9.1~60^2 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=23bdbdc80c79fcdb906e014f3f16ba0b9c8d5a4e;hp=358cb2df732a06fe4452ad26ae6285cfa671c9bd;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/Makefile b/Makefile index 26c0ca4..62ced87 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ # Copyright (c) 2013 IndexData ApS. http://indexdata.com -**default**: - (cd tools/htdocs; $(MAKE)) +all clean: + ${MAKE} -C./tools/htdocs $@ + ${MAKE} -C./examples/htdocs $@ -clean distclean all pz2api-git-checkout: +pz2api-git-checkout distclean: ${MAKE} -C./tools/htdocs $@ check-js: diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike index d5f2043..bf09873 100644 --- a/examples/apache2/mkws-examples-mike +++ b/examples/apache2/mkws-examples-mike @@ -4,16 +4,8 @@ ErrorLog /var/log/apache2/mkws-examples-error.log CustomLog /var/log/apache2/mkws-examples-access.log combined - ProxyPass /service-proxy-auth-mike http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo - ProxyPassReverse /service-proxy-auth-mike http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo - - - - ServerName x.mkws.indexdata.com - DocumentRoot /usr/local/src/git/mkws/tools/htdocs/ - ErrorLog /var/log/apache2/mkws-tools-error.log - CustomLog /var/log/apache2/mkws-tools-access.log combined - - Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/ - Alias /pazpar2/ /usr/local/src/git/pazpar2/ + RewriteEngine on + RewriteRule /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo [P] + #RewriteLog /var/log/apache2/mkws-examples-rewrite.log + #RewriteLogLevel 9 diff --git a/examples/htdocs/.gitignore b/examples/htdocs/.gitignore new file mode 100644 index 0000000..2ae2238 --- /dev/null +++ b/examples/htdocs/.gitignore @@ -0,0 +1,3 @@ +apache-config.txt +jasmine +test diff --git a/examples/htdocs/Makefile b/examples/htdocs/Makefile index d366a41..0441bb8 100644 --- a/examples/htdocs/Makefile +++ b/examples/htdocs/Makefile @@ -1,10 +1,12 @@ # Copyright (c) 2013 IndexData ApS. http://indexdata.com -all: jasmine-links +all: apache-config.txt jasmine-links + +apache-config.txt: ../apache2/mkws-examples-mike + rm -f $@ + cp -p $< $@ + chmod ugo-w $@ -clean distclean: - rm -rf test jasmine - jasmine-links: ln -fs ../../../jasmine . ln -fs ../../test . @@ -12,3 +14,7 @@ jasmine-links: help: @echo "make [ all | clean | jasmine-links ]" +clean distclean: + rm -f apache-config.txt + rm -rf test jasmine + diff --git a/examples/htdocs/dict.html b/examples/htdocs/dict.html index b440c4d..4088637 100644 --- a/examples/htdocs/dict.html +++ b/examples/htdocs/dict.html @@ -1,8 +1,7 @@ - - A-group silly demo + Dictionary lookup demo + + + +
+
+
+
+
+
+ + diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html index 093d11b..91793ea 100644 --- a/examples/htdocs/mike.html +++ b/examples/htdocs/mike.html @@ -1,37 +1,23 @@ - - - + - - MKWS demo: Mike's playground - - - - - - + MKWS demo client + + + -

A site about stuff

- - - - - -
-

Welcome

- Main site content goes here. - 		-

News

-
results will appear here
-
-
+
+
+
+
+
+
diff --git a/examples/htdocs/robots.txt b/examples/htdocs/robots.txt deleted file mode 100644 index 1f53798..0000000 --- a/examples/htdocs/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: / diff --git a/tools/apache2/DELETED/mkws-mike b/tools/apache2/DELETED/mkws-mike new file mode 100644 index 0000000..7808b1f --- /dev/null +++ b/tools/apache2/DELETED/mkws-mike @@ -0,0 +1,30 @@ +# Configuration for the apache web server +# Running on Mike's local development box + + + ServerName x.mkws.indexdata.com + ErrorLog /var/log/apache2/mkws-error.log + CustomLog /var/log/apache2/mkws-access.log combined + + DocumentRoot /usr/local/src/git/mkws/tools/htdocs + Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/ + Alias /pazpar2/ /usr/local/src/git/pazpar2/ + + RewriteEngine on + RewriteLogLevel 1 + RewriteLog /var/log/apache2/spclient-rewrite.log + RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P] + + # For MKC Service Proxy + ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/ + ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/ + + # For local Service Proxy running as mvn jetty:run + #ProxyPass /service-proxy/ http://localhost:8585/service-proxy/ + #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/ + + # Needed on Mac, which locks Apache down hard by default. + + Allow from all + + diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike deleted file mode 100644 index 7808b1f..0000000 --- a/tools/apache2/mkws-mike +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for the apache web server -# Running on Mike's local development box - - - ServerName x.mkws.indexdata.com - ErrorLog /var/log/apache2/mkws-error.log - CustomLog /var/log/apache2/mkws-access.log combined - - DocumentRoot /usr/local/src/git/mkws/tools/htdocs - Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/ - Alias /pazpar2/ /usr/local/src/git/pazpar2/ - - RewriteEngine on - RewriteLogLevel 1 - RewriteLog /var/log/apache2/spclient-rewrite.log - RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P] - - # For MKC Service Proxy - ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/ - ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/ - - # For local Service Proxy running as mvn jetty:run - #ProxyPass /service-proxy/ http://localhost:8585/service-proxy/ - #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/ - - # Needed on Mac, which locks Apache down hard by default. - - Allow from all - - diff --git a/tools/apache2/mkws-tools-mike b/tools/apache2/mkws-tools-mike new file mode 100644 index 0000000..02417a4 --- /dev/null +++ b/tools/apache2/mkws-tools-mike @@ -0,0 +1,10 @@ + + ServerName x.mkws.indexdata.com + ErrorLog /var/log/apache2/mkws-tools-error.log + CustomLog /var/log/apache2/mkws-tools-access.log combined + + DocumentRoot /usr/local/src/git/mkws/tools/htdocs/ + + Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/ + Alias /pazpar2/ /usr/local/src/git/pazpar2/ + diff --git a/tools/htdocs/index.html b/tools/htdocs/index.html index c0cafe0..d39035b 100644 --- a/tools/htdocs/index.html +++ b/tools/htdocs/index.html @@ -104,7 +104,14 @@
  • An application that run an automatic search on load. + >An application that runs an automatic search on load. +
    • +
  • + An application that uses a local authentication regime, + and the corresponding + Apache2 configuration stanza.
  • An existing web-site,