Author: sebb
Date: Wed Apr 25 09:33:26 2018
New Revision: 1830058

URL: http://svn.apache.org/viewvc?rev=1830058&view=rev
Log:
Rename id=>stem because that is what it is

Modified:
    attic/site-jekyll/src/_data/project.txt
    attic/site-jekyll/src/_data/projects.json
    attic/site-jekyll/src/_includes/project.list
    attic/site-jekyll/src/_plugins/generate_projects.rb

Modified: attic/site-jekyll/src/_data/project.txt
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_data/project.txt?rev=1830058&r1=1830057&r2=1830058&view=diff
==============================================================================
--- attic/site-jekyll/src/_data/project.txt (original)
+++ attic/site-jekyll/src/_data/project.txt Wed Apr 25 09:33:26 2018
@@ -7,7 +7,7 @@ nokeys: suppress the KEYS entry in the d
 ------ cut here ------
 {
    "name":        "Object",
-   "id":          "the generated file name stem | default: name to lower-case; 
replace space and / by -",
+   "stem":        "the generated file name stem | default: name to lower-case; 
replace space and / by -",
    "project":     "object",
    "subproject":  "<optional>",
    "website":     "website URL | default: project.apache.org/subproject OR '#' 
to suppress the entry",

Modified: attic/site-jekyll/src/_data/projects.json
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_data/projects.json?rev=1830058&r1=1830057&r2=1830058&view=diff
==============================================================================
--- attic/site-jekyll/src/_data/projects.json (original)
+++ attic/site-jekyll/src/_data/projects.json Wed Apr 25 09:33:26 2018
@@ -38,8 +38,8 @@
    "description": "Apache AxKit was an XML Application Server for Apache. It 
provided on-the-fly conversion from XML to any format, such as HTML, WAP or 
text using either W3C standard techniques, or flexible custom code."
 },
 {
-   "id":          "axis-sandesha-c",
    "name":        "Axis Sandesha2/C",
+   "stem":        "axis-sandesha-c",
    "project":     "axis",
    "subproject":  "axis2/c/sandesha",
    "retired":     "September 2014",
@@ -288,8 +288,8 @@
    "description": "Apache MRUnit was a Java library that helped developers 
unit test Apache Hadoop map reduce jobs."
 },
 {
-   "id":          "ojb",
    "name":        "ObJectRelationalBridge (OJB)",
+   "stem":        "ojb",
    "project":     "db",
    "subproject":  "ojb",
    "retired":     "January 2011",
@@ -362,8 +362,8 @@
    "description": "Apache Shindig was an OpenSocial container to help you to 
start hosting OpenSocial apps quickly."
 },
 {
-   "id":          "stdcxx",
    "name":        "Standard C++ Library (STDCXX)",
+   "stem":        "stdcxx",
    "project":     "stdcxx",
    "retired":     "July 2013",
    "scm":         "svn",
@@ -425,8 +425,8 @@
    "description": "Wookie was a Java server application that allowed you to 
upload and deploy W3C/OpenSocial/Google Wave widgets to your applications."
 },
 {
-   "id":          "muse",
    "name":        "WS Muse",
+   "stem":        "muse",
    "website":     "#",
    "project":     "ws",
    "subproject":  "muse",

Modified: attic/site-jekyll/src/_includes/project.list
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_includes/project.list?rev=1830058&r1=1830057&r2=1830058&view=diff
==============================================================================
--- attic/site-jekyll/src/_includes/project.list (original)
+++ attic/site-jekyll/src/_includes/project.list Wed Apr 25 09:33:26 2018
@@ -1,4 +1,4 @@
      <h6>Projects in the Attic</h6>
   <ul>{% for project in site.data.projects %}
-          <li><a href="/projects/{{ project.id }}.html">{{ project.name 
}}</a></li> {% endfor %}
+          <li><a href="/projects/{{ project.stem }}.html">{{ project.name 
}}</a></li> {% endfor %}
       </ul>
\ No newline at end of file

Modified: attic/site-jekyll/src/_plugins/generate_projects.rb
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_plugins/generate_projects.rb?rev=1830058&r1=1830057&r2=1830058&view=diff
==============================================================================
--- attic/site-jekyll/src/_plugins/generate_projects.rb (original)
+++ attic/site-jekyll/src/_plugins/generate_projects.rb Wed Apr 25 09:33:26 2018
@@ -11,21 +11,22 @@ module Jekyll
 
       # fetch the html page name; 
       # default to project name => lowercase and special chars => '-'
-      id = prj['id'] || (prj['name'].downcase.gsub(%r{[ /]},'-'))
+      stem = prj['stem'] || (prj['name'].downcase.gsub(%r{[ /]},'-'))
 
       # These are needed by Jekyll
       @site = site
       @dir = 'projects'
-      @page = "#{id}.html" # output file name
+      @page = "#{stem}.html" # output file name
 
+      puts @page
       self.process(@page)
       self.read_yaml(File.join(site.source, '_layouts'), 'project.html')
 
-      # set up various data items used by the template
+      # set up various data items used by the template and the include file
 
-      prj['id'] = id # in case we had to calculate it
+      prj['stem'] = stem # Needed by the include file template
       # Simplify template processing
-      prj['dist'] = id.sub 'jakarta-','jakarta/'
+      prj['dist'] = stem.sub 'jakarta-','jakarta/'
 
       unless prj['website'] # generate the website URL unless it is overridden
         prj['website'] = 
"http://#{prj['project']}.apache.org/#{prj['subproject']}"


Reply via email to