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 2011/08/15 23:11:32 UTC
svn commit: r1158013 - in /lucene/cms/trunk: content/ content/core/
content/css/ content/images/ content/lucene/ content/openrelevance/
content/pylucene/ content/pylucene/jcc/ content/scripts/ content/solr/ lib/
templates/
Author: gsingers
Date: Mon Aug 15 21:11:31 2011
New Revision: 1158013
URL: http://svn.apache.org/viewvc?rev=1158013&view=rev
Log:
LUCENE-2748: move dirs up one level
Added:
lucene/cms/trunk/content/core/
- copied from r1155009, lucene/cms/trunk/content/lucene/core/
lucene/cms/trunk/content/core/developer.mdtext
- copied unchanged from r1156239, lucene/cms/trunk/content/lucene/core/developer.mdtext
lucene/cms/trunk/content/core/discussion.mdtext
- copied unchanged from r1156205, lucene/cms/trunk/content/lucene/core/discussion.mdtext
lucene/cms/trunk/content/core/features.mdtext
- copied unchanged from r1156239, lucene/cms/trunk/content/lucene/core/features.mdtext
lucene/cms/trunk/content/core/releases.mdtext
- copied unchanged from r1156205, lucene/cms/trunk/content/lucene/core/releases.mdtext
lucene/cms/trunk/content/core/systemreqs.html
- copied unchanged from r1156205, lucene/cms/trunk/content/lucene/core/systemreqs.html
lucene/cms/trunk/content/css/
- copied from r1155009, lucene/cms/trunk/content/lucene/css/
lucene/cms/trunk/content/css/orp.css
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/css/orp.css
lucene/cms/trunk/content/css/pylucene.css
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/css/pylucene.css
lucene/cms/trunk/content/images/
- copied from r1155009, lucene/cms/trunk/content/lucene/images/
lucene/cms/trunk/content/index.mdtext
- copied unchanged from r1155009, lucene/cms/trunk/content/lucene/index.mdtext
lucene/cms/trunk/content/openrelevance/
- copied from r1155009, lucene/cms/trunk/content/lucene/openrelevance/
lucene/cms/trunk/content/openrelevance/index.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/openrelevance/index.mdtext
lucene/cms/trunk/content/openrelevance/mailing-lists.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/openrelevance/mailing-lists.mdtext
lucene/cms/trunk/content/openrelevance/orpnews.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/openrelevance/orpnews.mdtext
lucene/cms/trunk/content/privacy.mdtext
- copied unchanged from r1156116, lucene/cms/trunk/content/lucene/privacy.mdtext
lucene/cms/trunk/content/pylucene/
- copied from r1155009, lucene/cms/trunk/content/lucene/pylucene/
lucene/cms/trunk/content/pylucene/features.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/pylucene/features.mdtext
lucene/cms/trunk/content/pylucene/index.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/pylucene/index.mdtext
lucene/cms/trunk/content/pylucene/install.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/pylucene/install.mdtext
lucene/cms/trunk/content/pylucene/jcc/
- copied from r1156598, lucene/cms/trunk/content/lucene/pylucene/jcc/
lucene/cms/trunk/content/pylucene/mailing-lists.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/pylucene/mailing-lists.mdtext
lucene/cms/trunk/content/pylucene/pynews.mdtext
- copied unchanged from r1156169, lucene/cms/trunk/content/lucene/pylucene/pynews.mdtext
lucene/cms/trunk/content/scripts/
- copied from r1155009, lucene/cms/trunk/content/lucene/scripts/
lucene/cms/trunk/content/solr/
- copied from r1155009, lucene/cms/trunk/content/lucene/solr/
lucene/cms/trunk/content/solr/discussion.mdtext
- copied unchanged from r1156239, lucene/cms/trunk/content/lucene/solr/discussion.mdtext
lucene/cms/trunk/content/solr/versioncontrol.mdtext
- copied unchanged from r1156209, lucene/cms/trunk/content/lucene/solr/versioncontrol.mdtext
lucene/cms/trunk/content/whoweare.mdtext
- copied unchanged from r1155009, lucene/cms/trunk/content/lucene/whoweare.mdtext
Removed:
lucene/cms/trunk/content/core/mailing-lists.mdtext
lucene/cms/trunk/content/lucene/
lucene/cms/trunk/content/solr/mailing-lists.mdtext
Modified:
lucene/cms/trunk/content/images/mantle-lucene-solr.png
lucene/cms/trunk/content/images/mantle-lucene-solr.psd
lucene/cms/trunk/content/images/mantle-lucene.png
lucene/cms/trunk/lib/path.pm
lucene/cms/trunk/lib/view.pm
lucene/cms/trunk/templates/core.html
lucene/cms/trunk/templates/openrelevance.html
lucene/cms/trunk/templates/pylucene-simple.html
lucene/cms/trunk/templates/pylucene.html
lucene/cms/trunk/templates/solr.html
Modified: lucene/cms/trunk/content/images/mantle-lucene-solr.png
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/images/mantle-lucene-solr.png?rev=1158013&r1=1155009&r2=1158013&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/cms/trunk/content/images/mantle-lucene-solr.psd
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/images/mantle-lucene-solr.psd?rev=1158013&r1=1155009&r2=1158013&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/cms/trunk/content/images/mantle-lucene.png
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/images/mantle-lucene.png?rev=1158013&r1=1155009&r2=1158013&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/cms/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/path.pm?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/lib/path.pm (original)
+++ lucene/cms/trunk/lib/path.pm Mon Aug 15 21:11:31 2011
@@ -5,79 +5,27 @@ use ASF::Value;
# Patterns should go from more restrictive matches to less restrictive.
our @patterns = (
-
- # [qr!/sitemap\.html$!, sitemap => { headers => { title => "Lucene Sitemap" }} ],
- # separate ones for the index.html pages, as they will include the news
- #TODO: fix the duplication of SVN, jira, etc.
-
- [qr!core\/index\.mdtext$!, main => { template => "core.html",
- svn => ASF::Value::SVN->new(project => "lucene/dev/trunk/lucene", limit => 5),
- jira => ASF::Value::Jira->new(limit => 5,
- url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
- limit => 3)
- }],
- [qr!solr\/index\.mdtext$!, main => { template => "solr.html",
- svn => ASF::Value::SVN->new(project => "lucene/dev/trunk/solr", limit => 5),
- jira => ASF::Value::Jira->new(limit => 5,
- url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+SOLR+ORDER+BY+updatedDate+DESC&tempMax=20"),
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
- limit => 3),
+[qr!core\/index\.mdtext$!, main => { template => "core.html" }],
+ [qr!solr\/index\.mdtext$!, main => { template => "solr.html"
}],
[qr!pylucene\/index\.mdtext$!, main => { template => "pylucene.html" }],
[qr!openrelevance\/index\.mdtext$!, main => { template => "openrelevance.html" }],
- [qr!privacy\.mdtext$!, main => { template => "simple.html",
- svn => ASF::Value::SVN->new(project => "lucene", limit => 5),
- jira => ASF::Value::Jira->new(limit => 5,
- url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
- limit => 3)
- }],
- [qr!core\/.*?\.mdtext$!, main => { template => "core-simple.html",
- svn => ASF::Value::SVN->new(project => "lucene/dev/trunk/lucene", limit => 5),
- jira => ASF::Value::Jira->new(limit => 5,
- url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
- limit => 3)
+ [qr!privacy\.mdtext$!, main => { template => "simple.html" }],
+
+ [qr!\/lucene\/index\.mdtext$!, main => { template => "main.html" }],
+
+ [qr!core\/.*?\.mdtext$!, main => { template => "core-simple.html"
}],
- [qr!solr\/.*?\.mdtext$!, main => { template => "solr-simple.html",
- svn => ASF::Value::SVN->new(project => "lucene/dev/trunk/solr", limit => 5),
- jira => ASF::Value::Jira->new(limit => 5,
- url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+SOLR+ORDER+BY+updatedDate+DESC&tempMax=20"),
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
- limit => 3),
+
+ [qr!solr\/.*?\.mdtext$!, main => { template => "solr-simple.html"
}],
[qr!pylucene\/.*?\.mdtext$!, main => { template => "pylucene-simple.html" }],
[qr!openrelevance\/.*?\.mdtext$!, main => { template => "openrelevance-simple.html" }],
# keep the general one last
- [qr!lucene\/index\.mdtext$!, main => { template => "main.html",
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
- limit => 3),
- solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
- limit => 3),
- }],
- [qr!\.mdtext$!, main => { template => "simple.html",
- dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
- limit => 3),
- coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
- limit => 3),
- solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
- limit => 3),
- }],
+ [qr!lucene\/index\.mdtext$!, main => { template => "main.html"}],
+ [qr!\.mdtext$!, main => { template => "simple.html" }],
) ;
# for specifying interdependencies between files
Modified: lucene/cms/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/view.pm?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/lib/view.pm (original)
+++ lucene/cms/trunk/lib/view.pm Mon Aug 15 21:11:31 2011
@@ -42,6 +42,7 @@ sub main {
read_text_file $f, $args{$1};
}
}
+ print "Template: $template\n";
return Dotiac::DTL::Template($template)->render(\%args), html => \%args;
}
Modified: lucene/cms/trunk/templates/core.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/core.html?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/templates/core.html (original)
+++ lucene/cms/trunk/templates/core.html Mon Aug 15 21:11:31 2011
@@ -109,7 +109,7 @@
</ul>
{% endblock %}
{% block news %}
- <div>{% filter markdown %}{% include "../content/lucene/core/corenews.mdtext" %}{% endfilter %}</div>
+ <div>{% filter markdown %}{% include "../content/core/corenews.mdtext" %}{% endfilter %}</div>
{% endblock %}
{% block sidebar %}
Modified: lucene/cms/trunk/templates/openrelevance.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/openrelevance.html?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/templates/openrelevance.html (original)
+++ lucene/cms/trunk/templates/openrelevance.html Mon Aug 15 21:11:31 2011
@@ -51,7 +51,7 @@
</ul>
{% endblock %}
{% block news %}
- <div>{% filter markdown %}{% include "../content/lucene/openrelevance/orpnews.mdtext" %}{% endfilter %}</div>
+ <div>{% filter markdown %}{% include "../content/openrelevance/orpnews.mdtext" %}{% endfilter %}</div>
{% endblock %}
{% block sidebar %}
Modified: lucene/cms/trunk/templates/pylucene-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/pylucene-simple.html?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/templates/pylucene-simple.html (original)
+++ lucene/cms/trunk/templates/pylucene-simple.html Mon Aug 15 21:11:31 2011
@@ -1,6 +1,6 @@
{% extends "pylucene.html" %}
-{#
-No news section
-#}
{% block news %}
+
+ HI::::::::
{% endblock %}
+{% endextends %}
\ No newline at end of file
Modified: lucene/cms/trunk/templates/pylucene.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/pylucene.html?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/templates/pylucene.html (original)
+++ lucene/cms/trunk/templates/pylucene.html Mon Aug 15 21:11:31 2011
@@ -50,7 +50,7 @@
</ul>
{% endblock %}
{% block news %}
- <div>{% filter markdown %}{% include "../content/lucene/pylucene/pynews.mdtext" %}{% endfilter %}</div>
+ <div>{% filter markdown %}{% include "../content/pylucene/pynews.mdtext" %}{% endfilter %}</div>
{% endblock %}
{% block sidebar %}
Modified: lucene/cms/trunk/templates/solr.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr.html?rev=1158013&r1=1158012&r2=1158013&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr.html Mon Aug 15 21:11:31 2011
@@ -109,7 +109,7 @@
</ul>
{% endblock %}
{% block news %}
- <div>{% filter markdown %}{% include "../content/lucene/solr/solrnews.mdtext" %}{% endfilter %}</div>
+ <div>{% filter markdown %}{% include "../content/solr/solrnews.mdtext" %}{% endfilter %}</div>
{% endblock %}
{% block sidebar %}