You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/06/09 22:07:57 UTC
[1/2] lucene-solr:master: SOLR-10616: parameterize Guide HTML path in
sitemap.xml
Repository: lucene-solr
Updated Branches:
refs/heads/master b3b8344a7 -> f434e34d5
SOLR-10616: parameterize Guide HTML path in sitemap.xml
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f434e34d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f434e34d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f434e34d
Branch: refs/heads/master
Commit: f434e34d5c7b33783875e77f919c05f0cd806b3f
Parents: 072e720
Author: Cassandra Targett <ct...@apache.org>
Authored: Fri Jun 9 17:06:27 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Fri Jun 9 17:07:31 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/build.xml | 31 +++++++++++++++--------
solr/solr-ref-guide/src/_config.yml.template | 3 ++-
solr/solr-ref-guide/src/sitemap.xml | 2 +-
3 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f434e34d/solr/solr-ref-guide/build.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 4e00992..6a610b1 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -44,34 +44,45 @@
</filterchain>
</loadresource>
<!-- NOTE: ${solr-guide-version} is the version of this ref-guide.
-
+
By default, we assume this is the same as ${solr-docs-version} with a "-DRAFT" suffix
When releasing, specify an explicit value of this property on the command line.
-
+
NOTE: the ${solr-guide-version} used *may* be different from the version of Solr the guide
covers if we decide to do a bug-fix release of the ref-guide
-
+
Examples: (assume branch_6_1 where version=6.1.SOMETHING)
-
+
Basic nightly/local build of the 6.1 guide...
-
+
=> ant build-pdf
-
+
Official release build of the 6.1 guide...
-
+
=> ant build-pdf -Dsolr-guide-version=6.1
-
+
Release of a "6.1.1" ref guide, correcting some serious error in the docs
(even if there is no 6.1.1 version - or if we've alreayd released up to 6.1.5 - of Solr itself)
-
+
=> ant build-pdf -Dsolr-guide-version=6.1.1
-
+
-->
<property name="solr-guide-version" value="${solr-docs-version}-DRAFT" />
<condition property="solr-guide-draft-status" value="" else="DRAFT">
<matches pattern="^\d+\.\d+(|\.\d+)$" string="${solr-guide-version}" />
</condition>
+ <loadresource property="solr-guide-version-path">
+ <!-- NOTE: This is the ${solr-guide-version} as a path suitable for use publishing the HTML -->
+ <propertyresource name="solr-guide-version"/>
+ <filterchain>
+ <tokenfilter>
+ <filetokenizer/>
+ <replaceregex pattern="^(\d+)\.(\d+)(-DRAFT)?.*" replace="\1_\2\3" flags="s"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+
<property name="solr-javadocs" value="https://lucene.apache.org/solr/${solr-docs-version-path}/" />
<property name="lucene-javadocs" value="https://lucene.apache.org/core/${solr-docs-version-path}/" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f434e34d/solr/solr-ref-guide/src/_config.yml.template
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index 0db495e..9d40209 100755
--- a/solr/solr-ref-guide/src/_config.yml.template
+++ b/solr/solr-ref-guide/src/_config.yml.template
@@ -55,7 +55,7 @@ defaults:
search: true
# needed for sitemap.xml
-url: https://home.apache.org/~ctargett/RefGuidePOC/jekyll-full
+url: https://lucene.apache.org/solr/guide/
# Asciidoc settings - disabled so we can use asciidoctor instead
asciidoc: {}
@@ -71,6 +71,7 @@ asciidoc: {}
solr-attributes: &solr-attributes-ref
solr-guide-draft-status: "${solr-guide-draft-status}"
solr-guide-version: "${solr-guide-version}"
+ solr-guide-version-path: "${solr-guide-version-path}"
solr-docs-version: "${solr-docs-version}"
solr-javadocs: "${solr-javadocs}"
lucene-javadocs: "${lucene-javadocs}"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f434e34d/solr/solr-ref-guide/src/sitemap.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/sitemap.xml b/solr/solr-ref-guide/src/sitemap.xml
index d5fa97a..ba2032d 100755
--- a/solr/solr-ref-guide/src/sitemap.xml
+++ b/solr/solr-ref-guide/src/sitemap.xml
@@ -10,7 +10,7 @@ search: exclude
{% for page in site.pages %}
{% unless page.search == "exclude" %}
<url>
- <loc>{{site.url}}{{page.url}}</loc>
+ <loc>{{site.url}}{{site.solr-attributes.solr-guide-version-path}}{{page.url}}</loc>
</url>
{% endunless %}
{% endfor %}
[2/2] lucene-solr:master: SOLR-10863: remove feed.xml from HTML
version of Ref Guide
Posted by ct...@apache.org.
SOLR-10863: remove feed.xml from HTML version of Ref Guide
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/072e7209
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/072e7209
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/072e7209
Branch: refs/heads/master
Commit: 072e72097cac1515199fb032b2b0cbdd9f6d6331
Parents: b3b8344
Author: Cassandra Targett <ct...@apache.org>
Authored: Fri Jun 9 16:40:32 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Fri Jun 9 17:07:31 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/_config.yml.template | 6 +----
solr/solr-ref-guide/src/_includes/head.html | 2 --
solr/solr-ref-guide/src/feed.xml | 28 -----------------------
3 files changed, 1 insertion(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/072e7209/solr/solr-ref-guide/src/_config.yml.template
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index eac2d28..0db495e 100755
--- a/solr/solr-ref-guide/src/_config.yml.template
+++ b/solr/solr-ref-guide/src/_config.yml.template
@@ -54,11 +54,7 @@ defaults:
layout: "post"
search: true
-
-# the description is used in the feed.xml file
-description: "The Apache Solr Reference Guide is the official documentation for the Apache Solr project."
-
-# needed for sitemap.xml and feed.xml files
+# needed for sitemap.xml
url: https://home.apache.org/~ctargett/RefGuidePOC/jekyll-full
# Asciidoc settings - disabled so we can use asciidoctor instead
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/072e7209/solr/solr-ref-guide/src/_includes/head.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.html
index 47bf867..de0bd44 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -31,5 +31,3 @@
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
-
-<link rel="alternate" type="application/rss+xml" title="{{ site.site_title }}" href="{{ "/feed.xml" | prepend: site.url }}">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/072e7209/solr/solr-ref-guide/src/feed.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/feed.xml b/solr/solr-ref-guide/src/feed.xml
deleted file mode 100755
index d9faae8..0000000
--- a/solr/solr-ref-guide/src/feed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-search: exclude
-layout: none
----
-
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
- <channel>
- <title>{{ site.site_title | xml_escape }}</title>
- <description>{{ site.description | xml_escape }}</description>
- <link>{{ site.url }}</link>
- <atom:link href="{{ "/feed.xml" | prepend: site.url }}" rel="self" type="application/rss+xml"/>
- <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
- <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
- <generator>Jekyll v{{ jekyll.version }}</generator>
- {% for page in site.pages limit:10 %}
- <item>
- <title>{{ page.title | xml_escape }}</title>
- <description>{{ page.content | xml_escape }}</description>
- <link>{{ page.url | prepend: site.url }}</link>
- <guid isPermaLink="true">{{ page.url | prepend: site.url }}</guid>
- {% for tag in page.tags %}
- <category>{{ tag | xml_escape }}</category>
- {% endfor %}
- </item>
- {% endfor %}
- </channel>
-</rss>