Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Ajay 2.0 #21

Open
wants to merge 26 commits into
base: 2.3-gae
Choose a base branch
from
Open

Ajay 2.0 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
44ab969
Docgen config: Added logo (just mock) + tabs, removed external links
ddekany Oct 3, 2014
4349239
Changed docgen version to 2.0-branch-head in Ivy
ddekany Oct 4, 2014
e92ea5b
Manual: Added Google Analytics, and separate online and offline manua…
ddekany Oct 4, 2014
2707f05
Had problems with IvyDE again... just let ant generate an ide-depende…
ddekany Oct 5, 2014
3159c9f
adding search key setting, and search page
Apr 29, 2015
37af44c
config updates
May 6, 2015
a3501ee
adding favicon
May 10, 2015
09990eb
changing analytics markup
May 10, 2015
7d6ea28
fixing typos
May 10, 2015
1d45702
fixing more typos
May 10, 2015
5ef29fa
adding search to appendix
May 10, 2015
5ffba7b
adding search to the appendixes
May 10, 2015
7df5484
updating logo and favicon
May 10, 2015
13233af
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 18, 2015
9a67042
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 18, 2015
e0387c8
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 19, 2015
38d6ba9
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 20, 2015
f57c9d7
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 22, 2015
70d8f49
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 23, 2015
7d3bde6
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 25, 2015
de3b836
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 30, 2015
784688a
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany May 30, 2015
cceeaec
Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0
ddekany Jun 23, 2015
09dfb28
Changes related to bug #35
ddekany Jun 24, 2015
597d44a
Because we have a ToC on the left side anyway, let the starting page …
ddekany Jun 25, 2015
d5f566a
No search appendix (or such) is needed for having a search result pag…
ddekany Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 18 additions & 44 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,49 +10,23 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/annotations-3.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/ant-1.6.5.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/avalon-logkit-2.0.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/com.sun.el-1.0.0.v201105211818.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/hamcrest-core-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/javarebel-sdk-1.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/javax.el-2.1.0.v201105211819.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/javax.servlet-2.5.0.v201103041518.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/javax.servlet.jsp-2.1.0.v201105211820.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jaxen-1.0-FCS.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jdom-1.0-beta8-dev.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-continuation-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-http-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-io-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-jsp-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-security-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-server-7.6.16.v20140903.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/jetty-server-7.6.16.v20140903-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-servlet-7.6.16.v20140903.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/jetty-servlet-7.6.16.v20140903-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-util-7.6.16.v20140903.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/jetty-util-7.6.16.v20140903-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-webapp-7.6.16.v20140903.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/jetty-webapp-7.6.16.v20140903-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jetty-xml-7.6.16.v20140903.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/js-1.6R1.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/jython-2.5.0.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/org.apache.jasper.glassfish-2.1.0.v201110031002.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/org.eclipse.jdt.core-3.7.1.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/saxpath-1.0-FCS.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/xalan-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/dom4j-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/logback-classic-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/logback-core-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/slf4j-api-1.7.6.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/commons-io-2.2.jar" sourcepath="D:/Temp/git_fm/!non-git/jetty/commons-io-2.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/guava-jdk5-17.0.jar"/>
<classpathentry exported="true" kind="lib" path="ide-dependencies/log4j-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="ide-dependencies/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/commons-lang-2.3.jar"/>
<classpathentry kind="lib" path="ide-dependencies/displaytag-1.2.jar"/>
<classpathentry kind="lib" path="ide-dependencies/jcl-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/junit-4.12.jar"/>
<classpathentry kind="lib" path="ide-dependencies/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="ide-dependencies/annotations-3.0.0.jar"/>
<classpathentry kind="lib" path="ide-dependencies/ant-1.6.5.jar"/>
<classpathentry kind="lib" path="ide-dependencies/avalon-logkit-2.0.jar"/>
<classpathentry kind="lib" path="ide-dependencies/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="ide-dependencies/javarebel-sdk-1.2.2.jar"/>
<classpathentry kind="lib" path="ide-dependencies/jaxen-1.0-FCS.jar"/>
<classpathentry kind="lib" path="ide-dependencies/jdom-1.0-beta8-dev.jar"/>
<classpathentry kind="lib" path="ide-dependencies/js-1.6R1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/jsp-api-2.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/junit-4.11.jar"/>
<classpathentry kind="lib" path="ide-dependencies/jython-2.5.0.jar"/>
<classpathentry kind="lib" path="ide-dependencies/log4j-1.2.6.jar"/>
<classpathentry kind="lib" path="ide-dependencies/saxpath-1.0-FCS.jar"/>
<classpathentry kind="lib" path="ide-dependencies/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="ide-dependencies/slf4j-api-1.6.1.jar"/>
<classpathentry kind="lib" path="ide-dependencies/xalan-2.7.0.jar"/>
<classpathentry kind="lib" path="ide-dependencies/dom4j-1.3.jar"/>
<classpathentry kind="output" path=".bin/"/>
</classpath>
2 changes: 1 addition & 1 deletion ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

<!-- docs -->

<dependency org="org.freemarker" name="docgen" rev="1.0-branch-head" conf="manual->default" changing="true" />
<dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="manual->default" changing="true" />

<!-- parser -->

Expand Down
10 changes: 7 additions & 3 deletions src/manual/book.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
<title>FreeMarker Manual</title>
<info>
<title>FreeMarker Manual</title>

<subtitle>For FreeMarker 2.3.23-RC1</subtitle>
<titleabbrev>Manual</titleabbrev>

<preface xml:id="preface">
<productname>Freemarker 2.3.23</productname>
</info>

<preface role="index.html" xml:id="preface">
<title>What's FreeMarker?</title>

<para>FreeMarker is a <emphasis>template engine</emphasis>: a generic tool
Expand Down
7 changes: 3 additions & 4 deletions src/manual/docgen-misc/googleAnalytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();
})(window,document,'','','ga');
ga('create', 'UA-55420501-1', 'auto');
ga('send', 'pageview');
</script>
<script async src="http://www.google-analytics.com/analytics.js"></script>
117 changes: 110 additions & 7 deletions src/manual/docgen.cjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@

internalBookmarks: {
"Alpha. index": alphaidx
"Expressions": exp_cheatsheet
"Glossary": gloss
"Expressions": exp_cheatsheet
"?builtins": ref_builtins_alphaidx
"#directives": ref_directive_alphaidx
".spec_vars": ref_specvar
"FAQ": app_faq
"Glossary": gloss
}

externalBookmarks: {
"API": "api/index.html"
"Home": "../index.html"
}

validation: {
Expand All @@ -29,6 +24,114 @@ generateEclipseTOC
// link_to: "freemarker-toc.xml#ManualLink"
// }

logo: {
href: "http://freemarker.org"
src: logo.png,
alt: "FreeMarker"
}

tabs: {
"Home": "http://freemarker.org"
"Manual": "" // Empty => We are here
"Java API": "../api/index.html"
}

// Available icons:
// .icon-heart
// .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",
"class": "icon-download"
}]

deployUrl: "http://freemarker.org/docs/"

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"
}
]
}

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"
}
]

onlineTrackerHTML: "docgen-misc/googleAnalytics.html"

showXXELogo

searchKey: "014728049242975963158:8awjt03uofm"
Binary file added src/manual/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added src/manual/favicon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/manual/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.