projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: d8d367c)
Resolve: it seems Wolfram and I both independently added an examples/htdocs/Makefile...
authorMike Taylor <mike@indexdata.com>
Thu, 12 Dec 2013 17:32:36 +0000 (17:32 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 12 Dec 2013 17:32:36 +0000 (17:32 +0000)
Makefile patch | blob | history
examples/apache2/mkws-examples-mike patch | blob | history
examples/htdocs/.gitignore [new file with mode: 0644] patch | blob
examples/htdocs/Makefile patch | blob | history
examples/htdocs/localauth.html [new file with mode: 0644] patch | blob
tools/apache2/DELETED/mkws-mike [new file with mode: 0644] patch | blob
tools/apache2/mkws-mike [deleted file] patch | blob | history
tools/apache2/mkws-tools-mike [new file with mode: 0644] patch | blob

diff --git a/Makefile b/Makefile
index 26c0ca4..62ced87 100644 (file)
--- 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..93d4468 100644 (file)
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -4,16 +4,6 @@
     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
-</VirtualHost>
-
-<VirtualHost *:80>
-    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]
 </VirtualHost>
diff --git a/examples/htdocs/.gitignore b/examples/htdocs/.gitignore
new file mode 100644 (file)
index 0000000..e89a724
--- /dev/null
+++ b/examples/htdocs/.gitignore
@@ -0,0 +1 @@
+apache-config.txt
diff --git a/examples/htdocs/Makefile b/examples/htdocs/Makefile
index d366a41..0441bb8 100644 (file)
--- 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/localauth.html b/examples/htdocs/localauth.html
new file mode 100644 (file)
index 0000000..91793ea
--- /dev/null
+++ b/examples/htdocs/localauth.html
@@ -0,0 +1,23 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo client</title>
+    <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
+    <script type="text/javascript">
+      var mkws_config = {
+        pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
+        service_proxy_auth: "http://x.example.indexdata.com/service-proxy-auth/",
+        service_proxy_auth_domain : "mkws.indexdata.com"
+      };
+    </script>
+    <script type="text/javascript" src="http://x.mkws.indexdata.com/mkws-complete.js"></script>
+  </head>
+  <body>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsStat"></div>
+  </body>
+</html>
diff --git a/tools/apache2/DELETED/mkws-mike b/tools/apache2/DELETED/mkws-mike
new file mode 100644 (file)
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
+
+<VirtualHost *:80>
+    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.
+    <Directory />
+        Allow from all
+    </Directory>
+</VirtualHost>
diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike
deleted file mode 100644 (file)
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
-
-<VirtualHost *:80>
-    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.
-    <Directory />
-        Allow from all
-    </Directory>
-</VirtualHost>
diff --git a/tools/apache2/mkws-tools-mike b/tools/apache2/mkws-tools-mike
new file mode 100644 (file)
index 0000000..02417a4
--- /dev/null
+++ b/tools/apache2/mkws-tools-mike
@@ -0,0 +1,10 @@
+<VirtualHost *:80>
+    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/
+</VirtualHost>
MasterKey Widget Set