freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker-docgen git commit: Fixing error when there are no secondaryTabs. Fixing outdated tests. Updated FreeMarker dependency.
Date Fri, 06 Jan 2017 14:21:21 GMT
Repository: incubator-freemarker-docgen
Updated Branches:
  refs/heads/master 7bc7b3abf -> 05ddf9339


Fixing error when there are no secondaryTabs. Fixing outdated tests. Updated FreeMarker dependency.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/05ddf933
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/05ddf933
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/05ddf933

Branch: refs/heads/master
Commit: 05ddf9339cbcb80fd021d94a2c7ec0b37fce6825
Parents: 7bc7b3a
Author: ddekany <ddekany@apache.org>
Authored: Fri Jan 6 15:21:12 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Fri Jan 6 15:21:12 2017 +0100

----------------------------------------------------------------------
 .classpath                                      |   2 +-
 ivy.xml                                         |   2 +-
 src/main/org/freemarker/docgen/Transform.java   |   4 +
 .../org/freemarker/docgen/templates/header.ftlh |  40 +++----
 src/test/1/docgen.cjson                         |   5 +
 src/test/2/docgen.cjson                         |   7 +-
 src/test/3/docgen.cjson                         |   7 +-
 src/test/4/docgen.cjson                         |   7 +-
 src/test/5/docgen.cjson                         |   5 +
 src/test/6/docgen.cjson                         | 120 ++++++-------------
 src/test/7/docgen.cjson                         |   5 +
 src/test/8/docgen.cjson                         |   5 +
 src/test/9/docgen.cjson                         |   5 +
 13 files changed, 102 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/.classpath
----------------------------------------------------------------------
diff --git a/.classpath b/.classpath
index 047151e..a3c6ca7 100644
--- a/.classpath
+++ b/.classpath
@@ -2,12 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="ide-dependencies/freemarker-2.3-branch-head.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/ant-1.9.3.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/ant-launcher-1.9.3.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/isorelax-20030108.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/jing-20091111.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/saxon-8.7.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/xercesImpl-2.9.1.jar"/>
+	<classpathentry kind="lib" path="ide-dependencies/freemarker-2.3.25-incubating.jar"/>
 	<classpathentry kind="output" path=".bin"/>
 </classpath>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 862dedd..5df2d91 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -8,7 +8,7 @@
     </publications>
     <dependencies>
         <dependency org="com.thaiopensource" name="jing" rev="20091111" conf="default->default"
/>
-        <dependency org="org.freemarker" name="freemarker" rev="2.3-branch-head" conf="default->default"
changing="true" />
+        <dependency org="org.freemarker" name="freemarker" rev="2.3.25-incubating" conf="default->default"
changing="true" />
         <dependency org="org.apache.ant" name="ant" rev="1.9.3" conf="default->default"
/>
     </dependencies>
 </ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/main/org/freemarker/docgen/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java
index 698bfb2..a9482f1 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -1174,6 +1174,10 @@ public final class Transform {
                 }
             } // for each cfg settings
 
+            if (deployUrl == null) {
+                throw new DocgenException(
+                        "The \"" + SETTING_DEPLOY_URL + "\" setting wasn't specified");
+            }
             if (offline == null) {
                 throw new DocgenException(
                         "The \"" + SETTING_OFFLINE

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/main/org/freemarker/docgen/templates/header.ftlh
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/templates/header.ftlh b/src/main/org/freemarker/docgen/templates/header.ftlh
index 020d9aa..ef7aca7 100644
--- a/src/main/org/freemarker/docgen/templates/header.ftlh
+++ b/src/main/org/freemarker/docgen/templates/header.ftlh
@@ -21,7 +21,6 @@
 <#import "navigation.ftlh" as nav>
 <#import "google.ftlh" as google>
 
-
 <#macro header>
   <#if logo?? || tabs?? || secondaryTabs??>
     <div class="header-top-bg"><#t>
@@ -33,7 +32,21 @@
         </#if>
         <@nav.tabs /><#t>
         <#if secondaryTabs??>
-          <@secondaryTabs tabs=secondaryTabs /><#t>
+          <ul class="secondary-tabs"><#t>
+            <#list secondaryTabs as tabTitle, tab>
+              <li><#t>
+                <#if tab.href??>
+                  <a class="tab<#if tab.class??> ${tab.class}</#if>" href="${tab.href}"
title="${tabTitle}"><#t>
+                    <span>${tabTitle}</span><#t>
+                  </a><#t>
+                <#else>
+                  <div class="tab<#if tab.class??> ${tab.class}</#if>" title="${tabTitle}"><#t>
+                    <span>${tabTitle}</span><#t>
+                  </div><#t>
+                </#if>
+              </li><#t>
+            </#list>
+          </ul><#t>
         </#if>
       </div><#t>
     </div><#t>
@@ -43,7 +56,6 @@
   </#if>
 </#macro>
 
-
 <#macro navigationHeader>
   <div class="header-bottom-bg"><#t>
     <div class="site-width search-row"><#t>
@@ -62,7 +74,6 @@
   </div><#t>
 </#macro>
 
-
 <#macro searchForm>
   <#if searchKey?? && !offline>
     <form method="get" class="search-form<#if offline> offline</#if>" action="search-results.html"><#t>
@@ -75,24 +86,3 @@
     </form><#t>
   </#if>
 </#macro>
-
-
-<#macro secondaryTabs tabs>
-  <#local secondaryTabs = .dataModel.secondaryTabs>
-  <ul class="secondary-tabs"><#t>
-    <#list secondaryTabs?keys as tabTitle>
-      <#local tab = secondaryTabs[tabTitle]>
-      <li><#t>
-        <#if tab.href??>
-          <a class="tab<#if tab.class??> ${tab.class}</#if>" href="${tab.href}"
title="${tabTitle}"><#t>
-            <span>${tabTitle}</span><#t>
-          </a><#t>
-        <#else>
-          <div class="tab<#if tab.class??> ${tab.class}</#if>" title="${tabTitle}"><#t>
-            <span>${tabTitle}</span><#t>
-          </div><#t>
-        </#if>
-      </li><#t>
-    </#list>
-  </ul><#t>
-</#macro>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/1/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/1/docgen.cjson b/src/test/1/docgen.cjson
index 5363375..8003c8e 100644
--- a/src/test/1/docgen.cjson
+++ b/src/test/1/docgen.cjson
@@ -31,4 +31,9 @@ eclipse: {
   link_to: "freemarker-toc.xml#ManualLink"
 }
 
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"
+
 showXXELogo

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/2/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/2/docgen.cjson b/src/test/2/docgen.cjson
index 0a357dd..bf7fd01 100644
--- a/src/test/2/docgen.cjson
+++ b/src/test/2/docgen.cjson
@@ -13,4 +13,9 @@ logo: {
 
 timeZone: "GMT+01"
 generateEclipseTOC
-showEditoralNotes
\ No newline at end of file
+showEditoralNotes
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/3/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/3/docgen.cjson b/src/test/3/docgen.cjson
index 4b6ba1b..2c857b2 100644
--- a/src/test/3/docgen.cjson
+++ b/src/test/3/docgen.cjson
@@ -9,4 +9,9 @@ logo: {
   alt: "My Logo"
 }
 
-lowestFileElementRank: book
\ No newline at end of file
+lowestFileElementRank: book
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/4/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/4/docgen.cjson b/src/test/4/docgen.cjson
index 27fa73f..92d5937 100644
--- a/src/test/4/docgen.cjson
+++ b/src/test/4/docgen.cjson
@@ -29,4 +29,9 @@ maxTOFDisplayDepth: 2
 lowestPageTOCElementRank: simplesect
 numberedSections
 
-disableJavaScript
\ No newline at end of file
+disableJavaScript
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/5/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/5/docgen.cjson b/src/test/5/docgen.cjson
index 9525de3..b621484 100644
--- a/src/test/5/docgen.cjson
+++ b/src/test/5/docgen.cjson
@@ -11,3 +11,8 @@ logo: {
 lowestFileElementRank: book
 
 numberedSections
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/6/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/6/docgen.cjson b/src/test/6/docgen.cjson
index 123bfc3..be337e4 100644
--- a/src/test/6/docgen.cjson
+++ b/src/test/6/docgen.cjson
@@ -6,77 +6,31 @@ lowestFileElementRank: chapter
 // .icon-bug
 // .icon-download
 // .icon-star
-secondaryTabs: [{
-  "href": "javascript:;"
-  "text": "Contribute",
-  "class": "icon-heart"
- }, {
-   "href": "javascript:;"
-   "text": "Report a Bug",
-   "class": "icon-bug"
-}, {
-  "href": "javascript:;"
-  "text": "Download v2.3.21",
-  "class": "icon-download"
-}]
+secondaryTabs: {
+  "Contribute": {
+    "href": "javascript:;"
+    "class": "icon-heart"
+  }
+  "Report a Bug": {
+     "href": "javascript:;"
+     "class": "icon-bug"
+  }
+  "Download v2.3.21": {
+    "href": "javascript:;"
+    "class": "icon-download"
+  }
+}
 
-deployUrl: "http://freemarker.org/docs/"
+deployUrl: "http://example.com/"
 
 footerSiteMap: {
-    "Overview": [
-      {
-        "text": "What is FreeMarker?",
-        "href": "http://freemarker.org/features.html"
-      },{
-        "text": "Download",
-        "href": "http://freemarker.org/freemarkerdownload.html"
-      },{
-        "text": "Version history",
-        "href": "app_versions.html"
-      },{
-        "text": "About us",
-        "href": "http://freemarker.org/whoWeAre.html"
-      },{
-        "text": "License",
-        "href": "app_license.html"
-      }
-    ],
-    "Community": [
-      {
-        "text": "FreeMarker on Github",
-        "href": "https://github.com/freemarker"
-      },{
-        "text": "Follow us on Twitter",
-        "href": "https://twitter.com/freemarker"
-      },{
-        "text": "Report a bug",
-        "href": "https://sourceforge.net/p/freemarker/bugs/new/"
-      },{
-        "text": "Ask a question",
-        "href": "http://stackoverflow.com/questions/tagged/freemarker"
-      },{
-        "text": "Mailing lists",
-        "href": "http://freemarker.org/mailing-lists.html"
-      }
-    ],
-    "Shortcuts": [
-      {
-        "text": "Expressions cheatsheet",
-        "href": "dgui_template_exp.html#exp_cheatsheet"
-      }, {
-        "text": ".special_vars",
-        "href": "ref_specvar.html"
-      }, {
-        "text": "#directives",
-        "href": "ref_directive_alphaidx.html"
-      }, {
-        "text": "?built_ins",
-        "href": "ref_builtins_alphaidx.html"
-      }, {
-        "text": "FAQ",
-        "href": "app_faq.html"
-      }
-    ]
+    "Overview": {
+      "What is FreeMarker?": "http://freemarker.org/features.html"
+      "Download": "http://freemarker.org/freemarkerdownload.html"
+    }
+    "Community": {
+        "FreeMarker on Github": "https://github.com/freemarker"
+    }
 }
 
 logo: {
@@ -85,20 +39,22 @@ logo: {
   alt: "My Logo"
 }
 
-socialLinks: [
-  {
-    "href": "https://github.com/freemarker",
-    "class": "github",
-    "text": "Github"
-  }, {
-    "href": "https://twitter.com/freemarker",
-    "class": "twitter",
-    "text": "Twitter"
-  }, {
-    "href": "https://stackoverflow.com/questions/tagged/freemarker",
-    "class": "stack-overflow",
-    "text": "Stack Overflow"
+socialLinks: {
+  "Github": {
+    "href": "https://github.com/freemarker"
+    "class": "github"
   }
-]
+  "Twitter": {
+    "href": "https://twitter.com/freemarker"
+    "class": "twitter"
+  }
+  "Stack Overflow": {
+    "href": "https://stackoverflow.com/questions/tagged/freemarker"
+    "class": "stack-overflow"
+  }
+}
 
 searchKey: "014728049242975963158:8awjt03uofm"
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/7/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/7/docgen.cjson b/src/test/7/docgen.cjson
index c6ff55b..3ec4e54 100644
--- a/src/test/7/docgen.cjson
+++ b/src/test/7/docgen.cjson
@@ -9,3 +9,8 @@ logo: {
   src: logo.png
   alt: "My Logo"
 }
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/8/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/8/docgen.cjson b/src/test/8/docgen.cjson
index efc9cab..67fffb9 100644
--- a/src/test/8/docgen.cjson
+++ b/src/test/8/docgen.cjson
@@ -8,3 +8,8 @@ logo: {
   src: logo.png
   alt: "My Logo"
 }
+
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/05ddf933/src/test/9/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/test/9/docgen.cjson b/src/test/9/docgen.cjson
index 746558c..8b8e7f6 100644
--- a/src/test/9/docgen.cjson
+++ b/src/test/9/docgen.cjson
@@ -35,4 +35,9 @@ eclipse: {
   link_to: "freemarker-toc.xml#ManualLink"
 }
 
+copyrightHolder: "The Apache Software Foundation"
+copyrightStartYear: 1999
+
+deployUrl: "http://example.com/"
+
 showXXELogo


Mime
View raw message