You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/12 20:04:40 UTC
svn commit: r1169852 - in /openejb/trunk/sandbox/tools/src/main:
java/org/apache/openejb/tools/examples/GenerateIndex.java
resources/generate-index/velocity/glossary.vm
resources/generate-index/velocity/index.vm
Author: rmannibucau
Date: Mon Sep 12 18:04:40 2011
New Revision: 1169852
URL: http://svn.apache.org/viewvc?rev=1169852&view=rev
Log:
sorting examples on index page
Modified:
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/glossary.vm
openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/index.vm
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java?rev=1169852&r1=1169851&r2=1169852&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java Mon Sep 12 18:04:40 2011
@@ -111,7 +111,7 @@ public class GenerateIndex {
// generate index.html by example
Map<String, Set<String>> exampleLinksByKeyword = new TreeMap<String, Set<String>>();
- Map<String, String> nameByLink = new TreeMap<String, String>();
+ TreeMap<String, String> nameByLink = new TreeMap<String, String>();
Map<String, String> zipLinks = new TreeMap<String, String>();
Collection<File> examples = listFolders(extractedDir, properties.getProperty("pom"));
if (examples.contains(extractedDir)) {
@@ -150,7 +150,7 @@ public class GenerateIndex {
File index = new File(generated, properties.getProperty("index"));
String link = getLink(generatedDir, index);
- nameByLink.put(link, example.getName());
+ nameByLink.put(example.getName(), link);
File zip = new File(generated, example.getName() + ".zip");
String zipLink = getLink(generatedDir, zip);
@@ -236,21 +236,21 @@ public class GenerateIndex {
Map<String, String> classesByApi = getClassesByApi(exampleLinksByKeyword, '.', ViewHelper.REPLACED_CHAR); // css class(es) for aggregates
Map<String, String> examplesClassesByApi = getExamplesClassesByApi(exampleLinksByKeyword); // css class(es) for buttons
- Map<String, String> aggregatedClasses = getAggregateClasses(new ArrayList<String>(nameByLink.keySet()), exampleLinksByKeyword);
+ Map<String, String> aggregatedClasses = getAggregateClasses(new ArrayList<String>(nameByLink.values()), exampleLinksByKeyword);
+
// create a glossary page (OR search)
tpl(properties.getProperty("template.glossary"),
- newMap(String.class, Object.class)
- .add("title", "OpenEJB Examples Glossary")
- .add(USER_JAVASCRIPTS, newList(String.class).add("glossary.js").list())
- .add("links", nameByLink)
- .add("zipLinks", zipLinks)
- .add("examples", nameByLink)
- .add("classes", classesByApi)
- .add("exampleByKeyword", exampleLinksByKeyword)
- .add("aggregatedClasses", aggregatedClasses)
- .map(),
- new File(generatedDir, properties.getProperty("glossary")).getPath());
+ newMap(String.class, Object.class)
+ .add("title", "OpenEJB Examples Glossary")
+ .add(USER_JAVASCRIPTS, newList(String.class).add("glossary.js").list())
+ .add("zipLinks", zipLinks)
+ .add("examples", nameByLink)
+ .add("classes", classesByApi)
+ .add("exampleByKeyword", exampleLinksByKeyword)
+ .add("aggregatedClasses", aggregatedClasses)
+ .map(),
+ new File(generatedDir, properties.getProperty("glossary")).getPath());
// create an index for all example directories
tpl(properties.getProperty("template.main"),
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/glossary.vm
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/glossary.vm?rev=1169852&r1=1169851&r2=1169852&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/glossary.vm (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/glossary.vm Mon Sep 12 18:04:40 2011
@@ -33,8 +33,8 @@
<div id="aggregate">
<ul>
-#foreach( $example in $links.entrySet() )
- <li class="$aggregatedClasses.get($example.key)"><a href="$example.key">$example.value</a> <a href="$zipLinks.get($example.key)">Download zip</a></li>
+#foreach( $example in $examples.entrySet() )
+ <li class="$aggregatedClasses.get($example.value)"><a href="$example.value">$example.key</a> <a href="$zipLinks.get($example.value)">Download zip</a></li>
#end
</ul>
</div>
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/index.vm
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/index.vm?rev=1169852&r1=1169851&r2=1169852&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/index.vm (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/index.vm Mon Sep 12 18:04:40 2011
@@ -21,7 +21,7 @@
<ul>
#foreach( $example in $examples.entrySet() )
- <li example="$example.value" class="$aggregatedClasses.get($example.key)"><a href="$example.key">$example.value</a> <a href="$zipLinks.get($example.key)">[Download zip]</a></li>
+ <li example="$example.value" class="$aggregatedClasses.get($example.value)"><a href="$example.value">$example.key</a> <a href="$zipLinks.get($example.value)">[Download zip]</a></li>
#end
</ul>
</div>