You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by bu...@apache.org on 2015/01/23 16:47:06 UTC
svn commit: r937429 - in /websites/staging/taverna/trunk: cgi-bin/ content/
content/ns/2010/scufl2/.htaccess
Author: buildbot
Date: Fri Jan 23 15:47:05 2015
New Revision: 937429
Log:
Staging update by buildbot for taverna
Modified:
websites/staging/taverna/trunk/cgi-bin/ (props changed)
websites/staging/taverna/trunk/content/ (props changed)
websites/staging/taverna/trunk/content/ns/2010/scufl2/.htaccess
Propchange: websites/staging/taverna/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 23 15:47:05 2015
@@ -1 +1 @@
-1654243
+1654244
Propchange: websites/staging/taverna/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 23 15:47:05 2015
@@ -1 +1 @@
-1654243
+1654244
Modified: websites/staging/taverna/trunk/content/ns/2010/scufl2/.htaccess
==============================================================================
--- websites/staging/taverna/trunk/content/ns/2010/scufl2/.htaccess (original)
+++ websites/staging/taverna/trunk/content/ns/2010/scufl2/.htaccess Fri Jan 23 15:47:05 2015
@@ -8,15 +8,21 @@ RewriteBase /ns/2010/scufl2/
#
RewriteCond %{HTTP_ACCEPT} application/rdf\+xml
-RewriteRule ^$ scufl2.rdf [R=303]
+RewriteRule ^$ scufl2.rdf [R=303,L]
#
RewriteCond %{HTTP_ACCEPT} text\.+turtle
-RewriteRule ^$ scufl2.ttl [R=303]
+RewriteRule ^$ scufl2.ttl [R=303,L]
+#
+RewriteCond %{HTTP_ACCEPT} application/xml
+RewriteRule ^$ scufl2.xsd [R=303,L]
#
RewriteCond %{HTTP_ACCEPT} text/html
-RewriteRule ^$ http://dev.mygrid.org.uk/wiki/display/developer/Scufl2+Ontology [R=303]
-# Default
-RewriteRule ^$ scufl2.ttl [R=303]
+RewriteRule ^$ http://dev.mygrid.org.uk/wiki/display/developer/Scufl2+Ontology [R=303,L]
+# Default is the ontology
+RewriteRule ^$ scufl2.ttl [R=303,L]
-# For all terms
-#RewriteRule ^scufl2/.+ scufl2 [R=303]
+# For all other terms - ensure it's not a file
+# and then send to above rules
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.+) /ns/2010/scufl2/ [R=303]