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 2018/07/06 08:50:15 UTC
svn commit: r1835221 - in /openwebbeans/meecrowave/trunk/meecrowave-doc: ./
src/main/java/org/apache/meecrowave/doc/
src/main/java/org/apache/meecrowave/doc/generator/ src/main/jbake/content/
src/main/jbake/content/meecrowave-letsencrypt/ src/main/jbak...
Author: rmannibucau
Date: Fri Jul 6 08:50:15 2018
New Revision: 1835221
URL: http://svn.apache.org/viewvc?rev=1835221&view=rev
Log:
adding letsencrypt doc
Added:
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/LetsEncryptConfiguration.java
- copied, changed from r1835206, openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc (with props)
Modified:
openwebbeans/meecrowave/trunk/meecrowave-doc/pom.xml
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/components.adoc
openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/page.gsp
Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/pom.xml?rev=1835221&r1=1835220&r2=1835221&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/pom.xml Fri Jul 6 08:50:15 2018
@@ -44,17 +44,23 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>1.6.0-alpha.5</version>
+ <version>1.6.0-alpha.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>9.1.12.0</version>
+ <version>9.1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
- <version>7.0.1</version>
+ <version>7.0.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomee</groupId>
@@ -77,6 +83,11 @@
</dependency>
<dependency>
<groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-letsencrypt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.meecrowave</groupId>
<artifactId>meecrowave-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -98,17 +109,17 @@
<dependency>
<groupId>org.jbake</groupId>
<artifactId>jbake-core</artifactId>
- <version>2.4.0</version>
+ <version>2.6.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>2.3.6</version>
+ <version>3.0.0-alpha-1</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
- <version>2.3.6</version>
+ <version>3.0.0-alpha-1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -122,7 +133,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
<executions>
<execution>
<id>meecrowave-site</id>
Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java?rev=1835221&r1=1835220&r2=1835221&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java Fri Jul 6 08:50:15 2018
@@ -25,6 +25,7 @@ import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.doc.generator.ArquillianConfiguration;
import org.apache.meecrowave.doc.generator.CliConfiguration;
import org.apache.meecrowave.doc.generator.Configuration;
+import org.apache.meecrowave.doc.generator.LetsEncryptConfiguration;
import org.apache.meecrowave.doc.generator.MavenConfiguration;
import org.apache.meecrowave.doc.generator.OAuth2Configuration;
import org.jbake.app.ConfigUtil;
@@ -70,6 +71,7 @@ public class JBake {
new ArquillianConfiguration().run();
new MavenConfiguration().run();
new OAuth2Configuration().run();
+ new LetsEncryptConfiguration().run();
final Runnable build = () -> {
System.out.println("Building Meecrowave website in " + destination);
Copied: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/LetsEncryptConfiguration.java (from r1835206, openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java)
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/LetsEncryptConfiguration.java?p2=openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/LetsEncryptConfiguration.java&p1=openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java&r1=1835206&r2=1835221&rev=1835221&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/LetsEncryptConfiguration.java Fri Jul 6 08:50:15 2018
@@ -18,63 +18,24 @@
*/
package org.apache.meecrowave.doc.generator;
-import org.apache.meecrowave.Meecrowave;
-import org.apache.meecrowave.runner.cli.CliOption;
+import static java.util.stream.Collectors.joining;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.Comparator;
import java.util.stream.Stream;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.joining;
+import org.apache.meecrowave.letencrypt.LetsEncryptReloadLifecycle;
+import org.apache.meecrowave.runner.cli.CliOption;
-public class CliConfiguration extends BaseGenerator {
+public class LetsEncryptConfiguration extends BaseGenerator {
@Override
protected String generate() {
return super.tableConfig() + "|===\n|Name|Description\n" +
- Stream.of(
- Stream.of(Meecrowave.Builder.class.getDeclaredFields())
+ Stream.of(LetsEncryptReloadLifecycle.LetsEncryptConfig.class.getDeclaredFields())
.filter(f -> f.isAnnotationPresent(CliOption.class))
.sorted(Comparator.comparing(Field::getName))
- .map(f -> f.getAnnotation(CliOption.class)),
- Stream.of(
- new DocCliOption("help", "Show the CLI help/usage"),
- new DocCliOption("context", "The context to use to deploy the webapp"),
- new DocCliOption("webapp", "Location of the webapp, if not set the classpath will be deployed"),
- new DocCliOption("docbase", "Location of the docbase for a classpath deployment")))
- .flatMap(identity())
+ .map(f -> f.getAnnotation(CliOption.class))
.map(opt -> "|--" + opt.name() + "|" + opt.description())
.collect(joining("\n")) + "\n|===\n";
}
-
- private static final class DocCliOption implements CliOption {
- private final String description;
- private final String name;
-
- private DocCliOption(final String name, final String description) {
- this.description = description;
- this.name = name;
- }
-
- @Override
- public Class<? extends Annotation> annotationType() {
- return CliOption.class;
- }
-
- @Override
- public String name() {
- return name;
- }
-
- @Override
- public String description() {
- return description;
- }
-
- @Override
- public String[] alias() {
- return new String[0];
- }
- }
}
Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/components.adoc
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/components.adoc?rev=1835221&r1=1835220&r2=1835221&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/components.adoc (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/components.adoc Fri Jul 6 08:50:15 2018
@@ -57,10 +57,17 @@ link:{context_rootpath}/meecrowave-jta/i
== Meecrowave and OAuth2
This is an experimental module integrating CXF OAuth2 server in Meecrowave
-through an embeddable dependency or a directly executable har.
+through an embeddable dependency or a directly executable jar.
link:{context_rootpath}/meecrowave-oauth2/index.html[OAuth2 module]
+== Meecrowave Let's Encrypt
+
+This is an experimental module integrating with Let's Encrypt to provide you
+free and easy SSL support on your HTTPS connectors.
+
+link:{context_rootpath}/meecrowave-letsencrypt/index.html[Let's Encrypt module]
+
== Going further
Meecrowave scope is not the full scope of microservices (whatever it means) or at least enterprise needs
Added: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc?rev=1835221&view=auto
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc (added)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc Fri Jul 6 08:50:15 2018
@@ -0,0 +1,16 @@
+= Meecrowave Let's Encrypt Extension
+:jbake-date: 2018-07-05
+:jbake-type: page
+:jbake-status: published
+:jbake-meecrowavepdf:
+:jbake-meecrowavetitleicon: icon icon_shield
+:jbake-meecrowavecolor: body-blue
+:icons: font
+
+
+Meecrowave provides a Let's Encrypt integration which will grab the default tomcat connector
+and reload regularly its certificate based on Let's Encrypt protocol.
+
+You must configure the domain(s) to include during Let's Encrypt discussion to activate that feature.
+
+include::../../../../../target/generated-doc/LetsEncryptConfiguration.adoc[]
Propchange: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-letsencrypt/index.adoc
------------------------------------------------------------------------------
svn:executable = *
Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/page.gsp
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/page.gsp?rev=1835221&r1=1835220&r2=1835221&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/page.gsp (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/page.gsp Fri Jul 6 08:50:15 2018
@@ -14,7 +14,7 @@
<div class="doc-wrapper">
<div class="container">
<div id="doc-header" class="doc-header text-center">
- <h1 class="doc-title"><span aria-hidden="true" class="icon icon_lifesaver"></span> ${content.title}</h1>
+ <h1 class="doc-title"><span aria-hidden="true" class="icon ${content.getOrDefault('meecrowavetitleicon', 'icon_documents_alt')}"></span> ${content.title}</h1>
</div><!--//doc-header-->
<div class="doc-body">