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/06/19 22:31:01 UTC
svn commit: r1137429 - in /openejb/trunk/sandbox/tools/src/main:
java/org/apache/openejb/tools/examples/ resources/generate-index/
resources/generate-index/css/ resources/generate-index/velocity/
Author: rmannibucau
Date: Sun Jun 19 20:31:01 2011
New Revision: 1137429
URL: http://svn.apache.org/viewvc?rev=1137429&view=rev
Log:
adding home link
Modified:
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/MapBuilder.java
openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties
openejb/trunk/sandbox/tools/src/main/resources/generate-index/css/openejb-examples.css
openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/header.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=1137429&r1=1137428&r2=1137429&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 Sun Jun 19 20:31:01 2011
@@ -71,8 +71,6 @@ import static org.apache.openejb.tools.e
public class GenerateIndex {
private static final Logger LOGGER = Logger.getLogger(GenerateIndex.class);
private static final MarkdownProcessor PROCESSOR = new MarkdownProcessor();
- private static final String BASE_VAR = ExamplesPropertiesManager.get().getProperty("template.var.base");
- private static final String TITLE_VAR = ExamplesPropertiesManager.get().getProperty("template.var.title");
/**
* Can be run in an IDE or via Maven like so:
@@ -85,9 +83,6 @@ public class GenerateIndex {
public static void generate(String examplesZip, String workFolder) {
Properties properties = ExamplesPropertiesManager.get();
- // will be used everywhere so keep it here
- String base = properties.getProperty("base");
-
// working folder
File extractedDir = new File(workFolder, properties.getProperty("extracted"));
File generatedDir = new File(workFolder, properties.getProperty("generated"));
@@ -146,8 +141,7 @@ public class GenerateIndex {
tpl(properties.getProperty("template.code"),
newMap(String.class, Object.class)
- .add(TITLE_VAR, source + " source")
- .add(BASE_VAR, base)
+ .add("title", source + " source")
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("file", source)
.add("code", code)
@@ -160,8 +154,7 @@ public class GenerateIndex {
tpl(properties.getProperty("template.default"),
newMap(String.class, Object.class)
- .add(TITLE_VAR, example.getName() + " example")
- .add(BASE_VAR, base)
+ .add("title", example.getName() + " example")
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("apis", apiCount)
.add("link", zip.getName())
@@ -171,8 +164,7 @@ public class GenerateIndex {
} else {
tpl(properties.getProperty("template.external"),
newMap(String.class, Object.class)
- .add(TITLE_VAR, example.getName() + " example")
- .add(BASE_VAR, base)
+ .add("title", example.getName() + " example")
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("content", html)
.map(),
@@ -187,8 +179,7 @@ public class GenerateIndex {
// create a glossary page (OR search)
tpl(properties.getProperty("template.glossary"),
newMap(String.class, Object.class)
- .add(TITLE_VAR, "OpenEJB Example Glossary")
- .add(BASE_VAR, base)
+ .add("title", "OpenEJB Example Glossary")
.add(USER_JAVASCRIPTS, newList(String.class).add("glossary.js").list())
.add("links", nameByLink)
.add("zipLinks", zipLinks)
@@ -202,8 +193,7 @@ public class GenerateIndex {
// create an index for all example directories
tpl(properties.getProperty("template.main"),
newMap(String.class, Object.class)
- .add(TITLE_VAR, "OpenEJB Example")
- .add(BASE_VAR, base)
+ .add("title", "OpenEJB Example")
.add(USER_JAVASCRIPTS, newList(String.class).add("index.js").list())
.add("zipLinks", zipLinks)
.add("examples", nameByLink)
@@ -216,6 +206,11 @@ public class GenerateIndex {
// just a shortcut
private static void tpl(String template, Map<String, Object> mapContext, String path) {
- OpenEJBTemplate.get().apply(template, mapContext, path);
+ OpenEJBTemplate.get().apply(template,
+ newMap(mapContext)
+ .add("base", ExamplesPropertiesManager.get().getProperty("home.resources"))
+ .add("home", ExamplesPropertiesManager.get().getProperty("home.site"))
+ .map(),
+ path);
}
}
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/MapBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/MapBuilder.java?rev=1137429&r1=1137428&r2=1137429&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/MapBuilder.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/MapBuilder.java Sun Jun 19 20:31:01 2011
@@ -16,10 +16,18 @@ public final class MapBuilder<A, B> {
vClass = b;
}
+ private MapBuilder(Map<A, B> init) {
+ internal = init;
+ }
+
public static <T1, T2> MapBuilder<T1, T2> newMap(Class<T1> kClass, Class<T2> vClass) {
return new MapBuilder<T1, T2>(kClass, vClass);
}
+ public static <T1, T2> MapBuilder<T1, T2> newMap(Map<T1, T2> init) {
+ return new MapBuilder<T1, T2>(init);
+ }
+
public MapBuilder<A, B> add(A key, B value) {
internal.put(key, value);
return this;
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties?rev=1137429&r1=1137428&r2=1137429&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties Sun Jun 19 20:31:01 2011
@@ -1,4 +1,6 @@
-base = http://people.apache.org/~rmannibucau
+# website config
+home.resources = http://people.apache.org/~rmannibucau
+home.site = http://people.apache.org/~rmannibucau/generated
# input/output
examples.zip = /tmp/examples.zip
@@ -24,9 +26,6 @@ template.default = example.vm
template.external = external.vm
template.glossary = glossary.vm
-template.var.title = title
-template.var.base = base
-
# api management
api.filtering = javax.
api.import = import
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/css/openejb-examples.css
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/css/openejb-examples.css?rev=1137429&r1=1137428&r2=1137429&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/css/openejb-examples.css (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/css/openejb-examples.css Sun Jun 19 20:31:01 2011
@@ -25,10 +25,12 @@ body {
text-align: center;
}
-#checkboxes-button ul, #checkboxes-check ul {
+#checkboxes-button ul, #checkboxes-check ul, #header ul {
list-style-type:none;
}
-
+#floatingbar ul li {
+ margin-top: -1.1em;
+}
#checkboxes-button ul li {
float:left;
}
@@ -50,10 +52,9 @@ body {
#floatingbar ul {
list-style-type:none;
}
-#floatingbar ul li {
+#floatingbar ul li, #header ul li {
float:left;
color:#666;
- margin-top: -1.1em;
}
#floatingbar ul li a {
text-decoration:none;
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/header.vm
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/header.vm?rev=1137429&r1=1137428&r2=1137429&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/header.vm (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/velocity/header.vm Sun Jun 19 20:31:01 2011
@@ -20,6 +20,14 @@
</head>
<body>
+ <div id="header">
+ <ul>
+ <li><a href="" onclick="javascript:history.go(-1);return false;"> << </a></li>
+ <li><a href="$home"> Examples browser </a></li>
+ </ul>
+ </div>
+ <div class="clear"></div>
+
<div id="floatingbar">
<ul>
<li><a href="http://twitter.com/#!/OpenEJB">OpenEJB on Twitter</a></li>