You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2016/11/02 08:33:25 UTC
svn commit: r1767613 - in
/openwebbeans/microwave/trunk/microwave-doc/src/main:
java/org/apache/microwave/doc/ jbake/ jbake/content/ jbake/content/testing/
jbake/templates/
Author: rmannibucau
Date: Wed Nov 2 08:33:25 2016
New Revision: 1767613
URL: http://svn.apache.org/viewvc?rev=1767613&view=rev
Log:
using microwave context
Modified:
openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/JBake.java
openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/PDFify.java
openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/components.adoc
openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/testing/index.adoc
openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/jbake.properties
openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/templates/index.gsp
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/JBake.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/JBake.java?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/JBake.java (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/JBake.java Wed Nov 2 08:33:25 2016
@@ -80,6 +80,7 @@ public class JBake {
config.addConfiguration(new MapConfiguration(new HashMap<String, Object>() {{
put("asciidoctor.attributes", new ArrayList<String>() {{
add("source-highlighter=coderay");
+ add("context_rootpath=/microwave");
}});
}}));
config.addConfiguration(ConfigUtil.load(source));
@@ -202,9 +203,9 @@ public class JBake {
setWebResourceCached(false);
}}) {{
start();
- deployWebapp(destination);
+ deployWebapp("/microwave", destination);
}}) {
- System.out.println("Started on http://localhost:" + container.getConfiguration().getHttpPort());
+ System.out.println("Started on http://localhost:" + container.getConfiguration().getHttpPort() + "/microwave");
final Scanner console = new Scanner(System.in);
String cmd;
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/PDFify.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/PDFify.java?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/PDFify.java (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/java/org/apache/microwave/doc/PDFify.java Wed Nov 2 08:33:25 2016
@@ -63,7 +63,8 @@ public class PDFify {
.safe(UNSAFE)
.backend("pdf")
.attributes(AttributesBuilder.attributes()
- .attribute("source-highlighter", "coderay"))
+ .attribute("source-highlighter", "coderay")
+ .attribute("context_rootpath", "http://openwebbeans.apache.org/microwave"))
.toFile(target).get());
System.out.println("Generated " + target);
}
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/components.adoc
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/components.adoc?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/components.adoc (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/components.adoc Wed Nov 2 08:33:25 2016
@@ -12,9 +12,9 @@
Core component is the backbone of Microwave. It is based on Tomcat embedded for
Servlet container, CXF for JAX-RS, OpenWebBeans for CDI and Log4j2 for the logging.
-link:microwave-core/configuration.html[Read about Microwave configuration]
+link:{context_rootpath}/microwave-core/configuration.html[Read about Microwave configuration]
-link:microwave-core/cli.html[Read about Microwave command line]
+link:{context_rootpath}/microwave-core/cli.html[Read about Microwave command line]
== Microwave JPA
@@ -22,22 +22,22 @@ Microwave JPA provides a thin layer on t
without requiring to use a full container like JavaEE or Spring. It is just a
CDI extension.
-link:microwave-jpa/index.html[Read More]
+link:{context_rootpath}/microwave-jpa/index.html[Read More]
== Microwave Maven
Microwave provides a Maven plugin to run microwave with your preferred build tool.
-link:microwave-maven/index.html[Read More]
+link:{context_rootpath}/microwave-maven/index.html[Read More]
== Microwave Gradle
Microwave provides a Gradle plugin to run microwave with your preferred build tool.
-link:microwave-gradle/index.html[Read More]
+link:{context_rootpath}/microwave-gradle/index.html[Read More]
== Microwave and the Testing
Microwave provides two main testing integration: a JUnit one and an Arquillian Container.
-link:testing/index.html[Read More]
+link:{context_rootpath}/testing/index.html[Read More]
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/testing/index.adoc
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/testing/index.adoc?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/testing/index.adoc (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/content/testing/index.adoc Wed Nov 2 08:33:25 2016
@@ -79,7 +79,7 @@ Container dependency:
</dependency>
----
-For the configuration check link:../microwave-core/configuration.html[Core configuration].
+For the configuration check link:{context_rootpath}/microwave-core/configuration.html[Core configuration].
Here is a sample:
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/jbake.properties
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/jbake.properties?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/jbake.properties (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/jbake.properties Wed Nov 2 08:33:25 2016
@@ -1,9 +1,14 @@
+content.rootpath = /microwave
+content_rootpath = /microwave
+
default.status=published
+
render.encoding=UTF-8
render.tags = true
render.archive = false
render.feed = false
render.sitemap = false
+
template.folder = templates
template.index.file = index.gsp
template.page.file = page.gsp
Modified: openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/templates/index.gsp
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/templates/index.gsp?rev=1767613&r1=1767612&r2=1767613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/templates/index.gsp (original)
+++ openwebbeans/microwave/trunk/microwave-doc/src/main/jbake/templates/index.gsp Wed Nov 2 08:33:25 2016
@@ -5,7 +5,7 @@
<div class="branding">
<h1 class="logo">
<span aria-hidden="true" class="icon_documents_alt icon"></span>
- <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/index.html">
+ <a href="/microwave/index.html">
<span class="text-highlight">Micro</span><span class="text-bold">wave</span>
</a>
</h1>
@@ -30,7 +30,7 @@
</div><!--//icon-holder-->
<h3 class="title">Quick Start</h3>
<p class="intro">Deploy a JSON webservice in 5 mn!</p>
- <a class="link" href="start.html"><span></span></a>
+ <a class="link" href="/microwave/start.html"><span></span></a>
</div><!--//item-inner-->
</div><!--//item-->
<div class="item item-pink item-2 col-md-4 col-sm-6 col-xs-6">
@@ -40,7 +40,7 @@
</div><!--//icon-holder-->
<h3 class="title">Components</h3>
<p class="intro">Microwave extensions making development and production smoother.</p>
- <a class="link" href="components.html"><span></span></a>
+ <a class="link" href="/microwave/components.html"><span></span></a>
</div><!--//item-inner-->
</div><!--//item-->
<div class="item item-blue col-md-4 col-sm-6 col-xs-6">
@@ -50,7 +50,7 @@
</div><!--//icon-holder-->
<h3 class="title">Downloads and License</h3>
<p class="intro">Ready to get started? Grab microwave and run your services!</p>
- <a class="link" href="download.html"><span></span></a>
+ <a class="link" href="/microwave/download.html"><span></span></a>
</div><!--//item-inner-->
</div><!--//item-->
<div class="item item-primary item-2 col-md-offset-4 col-md-4 col-sm-offset-2 col-xs-offset-2 col-sm-6 col-xs-6">
@@ -60,7 +60,7 @@
</div><!--//icon-holder-->
<h3 class="title">Community</h3>
<p class="intro">OpenWebBeans community is proud to host Microwave project.</p>
- <a class="link" href="community.html"><span></span></a>
+ <a class="link" href="/microwave/community.html"><span></span></a>
</div><!--//item-inner-->
</div><!--//item-->
</div><!--//cards-->