mirror of
https://github.com/apache/activemq-artemis.git
synced 2025-02-07 10:38:44 +00:00
3a4b421d2e
Markdown, which is currently used for user-facing documentation, is good for a lot of things. However, it's not great for the kind of complex documentation we have and our need to produce both multi-page HTML and single-page PDF output via Maven. Markdown lacks features which would make the documentation easier to read, easier to navigate, and just look better overall. The current tool-chain uses honkit and a tool called Calibre. Honkit is written in TypeScript and is installed via NPM. Calibre is a native tool so it must be installed via an OS-specific package manager. All this complexity makes building, releasing, uploading, etc. a pain. AsciiDoc is relatively simple like Markdown, but it has more features for presentation and navigation not to mention Java-based Maven tooling to generate both HTML and PDF. Migrating will improve both the appearance of the documentation as well as the processes to generate and upload it. This commit contains the following changes: - Convert all the Markdown for the User Manual, Migration Guide, and Hacking guide to AsciiDoc via kramdown [1]. - Update the `artemis-website` build to use AsciiDoctor Maven tooling. - Update `RELEASING.md` with simplified instructions. - Update Hacking Guide with simplified instructions. - Use AsciiDoc link syntax in Artemis Maven doc plugin. - Drop EPUB & MOBI docs for User Manual as well as PDF for the Hacking Guide. All docs will be HTML only except for the User Manual which will have PDF. - Move all docs up out of their respective "en" directory. This was a hold-over from when we had docs in different languages. - Migration & Hacking Guides are now single-page HTML since they are relatively short. - Refactor README.md to simplify and remove redundant content. Benefits of the change: - Much simplified tooling. No more NPM packages or native tools. - Auto-generated table of contents for every chapter. - Auto-generated anchor links for every sub-section. - Overall more appealing presentation. - All docs will use the ActiveMQ favicon. - No more manual line-wrapping! AsciiDoc recommends one sentence per line and paragraphs are separated by a blank line. - AsciiDoctor plugins for IDEA are quite good. - Resulting HTML is less than *half* of the previous size. All previous links/bookmarks should continue to work. [1] https://github.com/asciidoctor/kramdown-asciidoc
86 lines
5.5 KiB
Diff
86 lines
5.5 KiB
Diff
diff --git a/broker-instance/bin/artemis-service.xml b/broker-instance/bin/artemis-service.xml
|
|
index 77fdc16a49..0f7881b5e9 100644
|
|
--- a/broker-instance/bin/artemis-service.xml
|
|
+++ b/broker-instance/bin/artemis-service.xml
|
|
@@ -33,7 +33,6 @@
|
|
<logmode>roll</logmode>
|
|
|
|
<executable>%JAVA_HOME%\bin\java.exe</executable>
|
|
- <startargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\jboss-logmanager-2.1.18.Final.jar;%ARTEMIS_HOME%\lib\wildfly-common-1.5.2.Final.jar</startargument>
|
|
<startargument>-XX:+UseParallelGC</startargument>
|
|
<startargument>-Xms512M</startargument>
|
|
<startargument>-Xmx1024M</startargument>
|
|
@@ -51,8 +50,6 @@
|
|
<startargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</startargument>
|
|
<startargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</startargument>
|
|
<startargument>-Dartemis.instance.etc=%ARTEMIS_INSTANCE_ETC%</startargument>
|
|
- <startargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</startargument>
|
|
- <startargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</startargument>
|
|
<startargument>-Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config</startargument>
|
|
<startargument>-Dhawtio.disableProxy=true</startargument>
|
|
<startargument>-Dhawtio.realm=activemq</startargument>
|
|
@@ -70,7 +67,6 @@
|
|
<startargument>run</startargument>
|
|
|
|
<stopexecutable>%JAVA_HOME%\bin\java.exe</stopexecutable>
|
|
- <stopargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\jboss-logmanager-2.1.18.Final.jar;%ARTEMIS_HOME%\lib\wildfly-common-1.5.2.Final.jar</stopargument>
|
|
<stopargument>-XX:+UseParallelGC</stopargument>
|
|
<stopargument>-Xms512M</stopargument>
|
|
<stopargument>-Xmx1024M</stopargument>
|
|
@@ -81,8 +77,6 @@
|
|
<stopargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</stopargument>
|
|
<stopargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</stopargument>
|
|
<stopargument>-Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%"</stopargument>
|
|
- <stopargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</stopargument>
|
|
- <stopargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</stopargument>
|
|
|
|
<stopargument>org.apache.activemq.artemis.boot.Artemis</stopargument>
|
|
|
|
diff --git a/broker-instance/bin/artemis.cmd b/broker-instance/bin/artemis.cmd
|
|
index 2d39231708..ed7ea68955 100644
|
|
--- a/broker-instance/bin/artemis.cmd
|
|
+++ b/broker-instance/bin/artemis.cmd
|
|
@@ -48,13 +48,9 @@ rem "Load Profile Config"
|
|
set ARTEMIS_INSTANCE_ETC="${artemis.instance.etc}"
|
|
call %ARTEMIS_INSTANCE_ETC%\artemis.profile.cmd %*
|
|
|
|
-rem "Set Defaults."
|
|
-set ARTEMIS_LOGGING_CONF=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties
|
|
-set ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
|
|
-
|
|
-if not exist "%ARTEMIS_OOME_DUMP%" goto NO_ARTEMIS_OOME_DUMP
|
|
+if not exist %ARTEMIS_OOME_DUMP% goto NO_ARTEMIS_OOME_DUMP
|
|
rem "Backup the last OOME heap dump"
|
|
-move /Y "%ARTEMIS_OOME_DUMP%" "%ARTEMIS_OOME_DUMP%.bkp"
|
|
+move /Y %ARTEMIS_OOME_DUMP% %ARTEMIS_OOME_DUMP%.bkp
|
|
|
|
:NO_ARTEMIS_OOME_DUMP
|
|
|
|
@@ -66,11 +62,10 @@ set JVM_ARGS=%JVM_ARGS% -Dartemis.home=%ARTEMIS_HOME%
|
|
set JVM_ARGS=%JVM_ARGS% -Dartemis.instance=%ARTEMIS_INSTANCE%
|
|
set JVM_ARGS=%JVM_ARGS% -Ddata.dir=%ARTEMIS_DATA_DIR%
|
|
set JVM_ARGS=%JVM_ARGS% -Dartemis.instance.etc=%ARTEMIS_INSTANCE_ETC%
|
|
-set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager=%ARTEMIS_LOG_MANAGER%
|
|
-set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration=%ARTEMIS_LOGGING_CONF%
|
|
set JVM_ARGS=%JVM_ARGS% -Dartemis.default.sensitive.string.codec.key=%ARTEMIS_DEFAULT_SENSITIVE_STRING_CODEC_KEY%
|
|
|
|
if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
|
|
+if not "%$JAVA_ARGS_APPEND%"=="" set JVM_ARGS=%JVM_ARGS% %$JAVA_ARGS_APPEND%
|
|
|
|
"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.Artemis %*
|
|
|
|
|
|
diff --git a/broker-instance/etc/artemis.profile.cmd b/broker-instance/etc/artemis.profile.cmd
|
|
index 5367e34fe4..c4ebbff04a 100644
|
|
--- a/broker-instance/etc/artemis.profile.cmd
|
|
+++ b/broker-instance/etc/artemis.profile.cmd
|
|
@@ -33,7 +33,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
|
|
rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
|
|
|
|
rem Java Opts
|
|
-IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx${java-memory} -Xbootclasspath/a:%ARTEMIS_HOME%\lib\jboss-logmanager-2.1.18.Final.jar;%ARTEMIS_HOME%\lib\wildfly-common-1.5.2.Final.jar -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%)
|
|
+IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx${java-memory} -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%)
|
|
|
|
rem Logs Safepoints JVM pauses: Uncomment to enable them
|
|
rem In addition to the traditional GC logs you could enable some JVM flags to know any meaningful and "hidden" pause that could
|