You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2012/01/31 16:54:20 UTC

svn commit: r1238675 - in /lucene/cms/trunk: content/core/ content/solr/ lib/ templates/

Author: gsingers
Date: Tue Jan 31 15:54:20 2012
New Revision: 1238675

URL: http://svn.apache.org/viewvc?rev=1238675&view=rev
Log:
LUCENE-2748: put in redirects for downloads so that we can see how many people are downloading

Added:
    lucene/cms/trunk/content/core/mirrors-core-redir.mdtext
    lucene/cms/trunk/content/solr/mirrors-solr-redir.mdtext
    lucene/cms/trunk/templates/mirrors-core-redir.html
    lucene/cms/trunk/templates/mirrors-solr-redir.html
      - copied, changed from r1238606, lucene/cms/trunk/templates/solr-simple.html
Modified:
    lucene/cms/trunk/content/core/downloads.mdtext
    lucene/cms/trunk/content/solr/downloads.mdtext
    lucene/cms/trunk/lib/path.pm
    lucene/cms/trunk/templates/solr-nav.html
    lucene/cms/trunk/templates/solr.html

Modified: lucene/cms/trunk/content/core/downloads.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/core/downloads.mdtext?rev=1238675&r1=1238674&r2=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/content/core/downloads.mdtext (original)
+++ lucene/cms/trunk/content/core/downloads.mdtext Tue Jan 31 15:54:20 2012
@@ -6,7 +6,7 @@ Official releases are usually created wh
             [here](systemrequirements.html).
 
 Both binary and source releases for the latest version of Lucene are available from
-        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/java/).
+        [the Apache Mirrors](mirrors-core-redir.html).
 
 Archives for all past versions of Lucene are available at [the Apache archives](http://archive.apache.org/dist/lucene/java/).
 

Added: lucene/cms/trunk/content/core/mirrors-core-redir.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/core/mirrors-core-redir.mdtext?rev=1238675&view=auto
==============================================================================
--- lucene/cms/trunk/content/core/mirrors-core-redir.mdtext (added)
+++ lucene/cms/trunk/content/core/mirrors-core-redir.mdtext Tue Jan 31 15:54:20 2012
@@ -0,0 +1,7 @@
+You should be automatically redirected to the Apache Mirrors Site, if not please choose from the
+following:
+
+- Both binary and source releases for the latest version of Lucene are available from
+        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/java/)).
+
+- Archives for all past versions of Lucene are available at [the Apache archives](http://archive.apache.org/dist/lucene/java/).

Modified: lucene/cms/trunk/content/solr/downloads.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/solr/downloads.mdtext?rev=1238675&r1=1238674&r2=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/content/solr/downloads.mdtext (original)
+++ lucene/cms/trunk/content/solr/downloads.mdtext Tue Jan 31 15:54:20 2012
@@ -5,9 +5,7 @@ Official releases are usually created wh
             Due to the voluntary nature of Solr, no releases are scheduled in advance.
 
 Both binary and source releases for the latest version of Solr are available from
-        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/solr/).
-
-Archives for all past versions of Lucene are available at [the Apache archives](http://archive.apache.org/dist/lucene/solr/).
+        [the Apache Mirrors](mirrors-solr-redir.html).
 
 The <tt>apache-solr-VERSION.zip</tt> or <tt>.tgz</tt> (where VERSION is the version number of the release, e.g. 3.0.1) file contains
             Apache Solr, html documentation and tutorial.  The

Added: lucene/cms/trunk/content/solr/mirrors-solr-redir.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/solr/mirrors-solr-redir.mdtext?rev=1238675&view=auto
==============================================================================
--- lucene/cms/trunk/content/solr/mirrors-solr-redir.mdtext (added)
+++ lucene/cms/trunk/content/solr/mirrors-solr-redir.mdtext Tue Jan 31 15:54:20 2012
@@ -0,0 +1,7 @@
+You should be automatically redirected to the Apache Mirrors Site, if not please choose from the
+following:
+
+- Both binary and source releases for the latest version of Solr are available from
+        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/solr/)).
+
+- Archives for all past versions of Solr are available at [the Apache archives](http://archive.apache.org/dist/lucene/solr/).

Modified: lucene/cms/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/path.pm?rev=1238675&r1=1238674&r2=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/lib/path.pm (original)
+++ lucene/cms/trunk/lib/path.pm Tue Jan 31 15:54:20 2012
@@ -5,6 +5,8 @@ use ASF::Value;
 
 # Patterns should go from more restrictive matches to less restrictive.
 our @patterns = (
+[qr!core\/mirrors-core-redir\.mdtext$!, main => { template => "mirrors-core-redir.html"	}],# have downloads go to a redirect so that we can see how many people are actually clicking the link
+[qr!solr\/mirrors-solr-redir\.mdtext$!, main => { template => "mirrors-solr-redir.html"	}],
 [qr!core\/index\.mdtext$!, main => { template => "core.html"	}],
 	[qr!solr\/index\.mdtext$!, main => { template => "solr.html"
 	 }],

Added: lucene/cms/trunk/templates/mirrors-core-redir.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/mirrors-core-redir.html?rev=1238675&view=auto
==============================================================================
--- lucene/cms/trunk/templates/mirrors-core-redir.html (added)
+++ lucene/cms/trunk/templates/mirrors-core-redir.html Tue Jan 31 15:54:20 2012
@@ -0,0 +1,31 @@
+{#
+ This is a work around to the fact that the CMS doesn't allow inheritance of depth
+        2, so instead do a lot of includes.  See https://issues.apache.org/jira/browse/INFRA-3850
+#}
+{% extends "head.html" %}
+{% block css %}
+    <meta http-equiv="refresh" content="1;url=http://www.apache.org/dyn/closer.cgi/lucene/java">
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+{% endblock %}
+{% block metakeys %}
+{% endblock %}
+{% endextends %}
+{% extends "body.html" %}
+{% block logo %}
+  {% include "core-logo.html" %}
+{% endblock %}
+{% block slides %}
+  {% include "core-slides.html" %}
+{% endblock %}
+{% block nav %}
+  {% include "core-nav.html" %}
+{% endblock %}
+
+{% block news %}
+{% endblock %}
+{% block asfboiler %}{% endblock %}
+{% block sidebar %}
+    {% include "core-sidebar.html" %}
+{% endblock %}
+{% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
+{% endextends %}
\ No newline at end of file

Copied: lucene/cms/trunk/templates/mirrors-solr-redir.html (from r1238606, lucene/cms/trunk/templates/solr-simple.html)
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/mirrors-solr-redir.html?p2=lucene/cms/trunk/templates/mirrors-solr-redir.html&p1=lucene/cms/trunk/templates/solr-simple.html&r1=1238606&r2=1238675&rev=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr-simple.html (original)
+++ lucene/cms/trunk/templates/mirrors-solr-redir.html Tue Jan 31 15:54:20 2012
@@ -5,6 +5,7 @@
 #}
 {% extends "head.html" %}
 {% block css %}
+    <meta http-equiv="refresh" content="1;url=http://www.apache.org/dyn/closer.cgi/lucene/solr">
     <link href="../css/global.css" rel="stylesheet" type="text/css">
     <link href="../css/solr.css" rel="stylesheet" type="text/css">
 {% endblock %}

Modified: lucene/cms/trunk/templates/solr-nav.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-nav.html?rev=1238675&r1=1238674&r2=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr-nav.html (original)
+++ lucene/cms/trunk/templates/solr-nav.html Tue Jan 31 15:54:20 2012
@@ -1,5 +1,6 @@
 <ul>
   <li><a href="index.html">Solr</a></li>
+  <li><a href="features.html">Features</a></li>
   <li><a href="wiki.html">Wiki</a></li>
   <li><a href="downloads.html">Download</a></li>
   <li><a href="tutorial.html">Tutorial</a></li>

Modified: lucene/cms/trunk/templates/solr.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr.html?rev=1238675&r1=1238674&r2=1238675&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr.html Tue Jan 31 15:54:20 2012
@@ -27,7 +27,7 @@
 <div>{% filter markdown %}{% include "../content/solr/solrnews.mdtext" %}{% endfilter %}</div>
 {% endblock %}
 {% block sidebar %}
-    {include "solr-sidebar.html" %}
+    {% include "solr-sidebar.html" %}
 {% endblock %}
 {% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
 {% endextends %}
\ No newline at end of file