You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
ARTEMIS-5725 parameterize project name in the docs
This commit adds a few parameters to the doc build and uses those
parameters throughout the docs. Changes include:
- Eliminating unnecessary uses of the full project name
- Updating punctuation to increase clarity
- Fixing spelling, spacing, & captitalization for consistency
Copy file name to clipboardExpand all lines: docs/hacking-guide/_building.adoc
+7-3Lines changed: 7 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -64,11 +64,15 @@ $ mvn -o ...
64
64
65
65
== Building the ASYNC IO library
66
66
67
-
ActiveMQ Artemis provides the `ASYNCIO` `journal-type` which interacts with the Linux kernel libaio library. The ASYNCIO journal type should be used where possible as it is far superior in terms of performance.
67
+
The `ASYNCIO` `journal-type` which interacts with the Linux kernel libaio library.
68
+
The ASYNCIO journal type should be used where possible as it is far superior in terms of performance.
68
69
69
-
ActiveMQ Artemis does not ship with the Artemis Native ASYNCIO library in the _source_ distribution. This need to be built prior to running `mvn install`, to ensure that the ASYNCIO journal type is available in the resulting build. Don't worry if you don't want to use ASYNCIO or your system does not support libaio, ActiveMQ Artemis will check at runtime to see if the required libraries and system dependencies are available, if not it will default to using NIO.
70
+
The ASYNCIO native library is not included in the broker _source_ distribution.
71
+
It needs to be built prior to running `mvn install` to ensure that the ASYNCIO journal type is available in the resulting build.
72
+
Don't worry if you don't want to use ASYNCIO or your system does not support libaio.
73
+
The broker will check at runtime to see if the required libraries and system dependencies are available and, if not, it will default to using NIO.
70
74
71
-
To build the ActiveMQ Artemis ASYNCIO native libraries, please follow link:https://github.com/apache/activemq-artemis-native[these instructions].
75
+
To build the ASYNCIO native libraries, please follow link:https://github.com/apache/activemq-artemis-native[these instructions].
72
76
73
77
== Open Web Application Security Project (OWASP) Report
Copy file name to clipboardExpand all lines: docs/hacking-guide/_code.adoc
+6-6Lines changed: 6 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
= Working with the Code
2
2
3
-
While the canonical Apache ActiveMQ Artemis git repository is hosted on Apache hardware at https://gitbox.apache.org/repos/asf/activemq-artemis.git contributors are encouraged (but not required) to use a mirror on GitHub for collaboration and pull-request review functionality.
3
+
While the canonical git repository is hosted on Apache hardware at https://gitbox.apache.org/repos/asf/activemq-artemis.git contributors are encouraged (but not required) to use a mirror on GitHub for collaboration and pull-request review functionality.
4
4
Follow the steps below to get set up with GitHub, etc.
5
5
6
6
If you do not wish to use GitHub for whatever reason you can follow the overall process outlined in the "Typical development cycle" section below but instead attach https://git-scm.com/docs/git-format-patch[a patch file] to the related JIRA or an email to the http://activemq.apache.org/mailing-lists.html[dev list].
@@ -86,7 +86,7 @@ $ git commit
86
86
[#commitMessageDetails]
87
87
When you commit your changes you will need to supply a commit message.
88
88
We follow the 50/72 git commit message format as recommended in the https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project[official Git book].
89
-
An ActiveMQ Artemis commit message should be formatted in the following manner:
89
+
The commit message should be formatted in the following manner:
90
90
91
91
.. Add the first line with the summary, using maximum 50 characters.
92
92
Start the summary with the jira key (ARTEMIS-XXX) followed by a brief description of the change.
@@ -184,8 +184,8 @@ You might need to specify `-f` to force the changes.
184
184
Due to incompatibilities between some open source licenses and the Apache v2.0 license (that this project is licensed under) care must be taken when adding new dependencies to the project.
185
185
The Apache Software Foundation 3rd party licensing policy has more information here: https://www.apache.org/legal/3party.html
186
186
187
-
To keep track of all licenses in ActiveMQ Artemis, new dependencies must be added in either the top level `pom.xml` or in `test/pom.xml` (depending on whether this is a testonly dependency or if it is used in the main code base).
188
-
The dependency should be added under the dependency management section with version and labelled with a comment highlighting the license for the dependency version.
187
+
To keep track of all licenses, new dependencies must be added in either the top level `pom.xml` or in `test/pom.xml` (depending on whether this is a test-only dependency or if it is used in the main code base).
188
+
The dependency should be added under the dependency management section with version and labeled with a comment highlighting the license for the dependency version.
189
189
See existing dependencies in the main `pom.xml` for examples.
190
-
The dependency can then be added to individual ActiveMQ Artemis modules _without_ the version specified (the version is implied from the dependency management section of the top level pom).
191
-
This allows ActiveMQ Artemis developers to keep track of all dependencies and licenses.
190
+
The dependency can then be added to individual modules _without_ the version specified (the version is implied from the dependency management section of the top level pom).
191
+
This allows developers to keep track of all dependencies and licenses.
Copy file name to clipboardExpand all lines: docs/hacking-guide/_history.adoc
+2-3Lines changed: 2 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,8 +1,7 @@
1
1
= History
2
2
3
-
The Apache ActiveMQ Artemis project was started in October 2014.
4
-
The Artemis code base was seeded with a code donation granted by Red Hat, of the HornetQ project.
5
-
The code donation process consisted of taking a snapshot of the latest HornetQ code base and contributing this snapshot as an https://issues.apache.org/jira/browse/ARTEMIS-1[initial git commit] into the Artemis git repository.
3
+
In October 2014 the {project-name-full} code-base was seeded with a donation of the HornetQ project from Red Hat.
4
+
The code donation process consisted of taking a snapshot of the latest HornetQ code base and contributing it as the https://issues.apache.org/jira/browse/ARTEMIS-1[initial commit] into the corresponding Git repository.
6
5
7
6
The HornetQ commit history is preserved and can be accessed here: https://github.com/hornetq/hornetq/tree/apache-donation
Copy file name to clipboardExpand all lines: docs/hacking-guide/_maintainers.adoc
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,8 +1,8 @@
1
1
= Notes for Maintainers
2
2
3
-
ActiveMQ Artemis committers have write access to the Apache ActiveMQ Artemis repositories and will be responsible for acknowledging and pushing commits contributed via pull requests on GitHub.
3
+
Committers have write access to all project repositories and will be responsible for acknowledging and pushing commits contributed via pull requests on GitHub.
4
4
5
-
Core ActiveMQ Artemis members are also able to push their own commits directly to the canonical Apache repository.
5
+
Core members are also able to push their own commits directly to the canonical Apache repository.
6
6
However, the expectation here is that the developer has made a good effort to test their changes and is reasonably confident that the changes that are being committed will not break the build.
Now that we have our acceptors and addresses ready, it's time to deal with broker security.
4
-
Artemis inherited most of the security concepts from ActiveMQ.
5
-
One of the most notable differences is that ActiveMQ _groups_ are now called _roles_ in Artemis.
4
+
{project-name-short} inherited most of the security concepts from ActiveMQ.
5
+
One of the most notable differences is that ActiveMQ _groups_ are now called _roles_ in {project-name-short}.
6
6
Besides that things should be pretty familiar to existing ActiveMQ users.
7
7
Let's start by looking into the authentication mechanisms and defining users and roles (groups).
8
8
9
-
Both ActiveMQ and Artemis use JAAS to define authentication credentials.
9
+
Both ActiveMQ and {project-name-short} use JAAS to define authentication credentials.
10
10
In ActiveMQ, that's configured through the appropriate broker plugin in `conf/activemq.xml`
11
11
12
12
[,xml]
@@ -18,18 +18,18 @@ In ActiveMQ, that's configured through the appropriate broker plugin in `conf/ac
18
18
19
19
The name of the JAAS domain is specified as a configuration parameter.
20
20
21
-
In Artemis, the same thing is achieved by defining `<jaas-security>` configuration in `etc/bootstrap.xml`
21
+
In {project-name-short}, the same thing is achieved by defining `<jaas-security>` configuration in `etc/bootstrap.xml`
22
22
23
23
[,xml]
24
24
----
25
25
<jaas-securitydomain="activemq"/>
26
26
----
27
27
28
28
From this point on, you can go and define your users and their roles in appropriate files, like `conf/users.properties` and `conf/groups.properties` in ActiveMQ.
29
-
Similarly, `etc/artemis-users.properties` and `etc/artemis-roles.properties` files are used in Artemis.
29
+
Similarly, `etc/artemis-users.properties` and `etc/artemis-roles.properties` files are used in {project-name-short}.
30
30
These files are interchangeable, so you should be able to just copy your existing configuration over to the new broker.
31
31
32
32
If your deployment is more complicated than this and requires some advanced JAAS configuration, you'll need go and change the `etc/login.config` file.
33
-
It's important to say that all custom JAAS modules and configuration you were using in ActiveMQ should be compatible with Artemis.
33
+
It's important to say that all custom JAAS modules and configuration you were using in ActiveMQ should be compatible with {project-name-short}.
34
34
35
-
Finally, in case you're still using ActiveMQ's _Simple Authentication Plugin_, which defines users and groups directly in the broker's xml configuration file, you'll need to migrate to JAAS as Artemis doesn't support the similar concept.
35
+
Finally, in case you're still using ActiveMQ's _Simple Authentication Plugin_, which defines users and groups directly in the broker's xml configuration file, you'll need to migrate to JAAS as {project-name-short} doesn't support the similar concept.
Copy file name to clipboardExpand all lines: docs/migration-guide/_authorization.adoc
+11-11Lines changed: 11 additions & 11 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -22,7 +22,7 @@ In ActiveMQ, authorization is specified using the appropriate broker plugin in `
22
22
</authorizationPlugin>
23
23
----
24
24
25
-
The equivalent Artemis configuration is specified in `etc/broker.xml` and should look like this
25
+
The equivalent {project-name-short} configuration is specified in `etc/broker.xml` and should look like this
26
26
27
27
[,xml]
28
28
----
@@ -60,24 +60,24 @@ The equivalent Artemis configuration is specified in `etc/broker.xml` and should
60
60
----
61
61
62
62
As you can see, things are pretty comparable with some minor differences.
63
-
The most important one is that policies in ActiveMQ are defined on destination names, while in Artemis they are applied to _core queues_ (refresh your knowledge about relation between queues and addresses in previous sections and Artemis user manual).
63
+
The most important one is that policies in ActiveMQ are defined on destination names, while in {project-name-short} they are applied to _core queues_ (refresh your knowledge about relation between queues and addresses in previous sections and {project-name-short} user manual).
64
64
65
-
The other notable difference is that policies are more fine-grained in Artemis.
66
-
The following paragraphs and tables show Artemis policies that corresponds to ActiveMQ ones.
65
+
The other notable difference is that policies are more fine-grained in {project-name-short}.
66
+
The following paragraphs and tables show {project-name-short} policies that corresponds to ActiveMQ ones.
67
67
68
68
If you wish to allow users to send messages, you need to define the following policies in the respective brokers.
69
69
70
70
|===
71
-
| ActiveMQ | Artemis
71
+
| ActiveMQ | {project-name-short}
72
72
73
73
| write
74
74
| send
75
75
|===
76
76
77
-
In Artemis, policies for consuming and browsing are separated and you need to define them both in order to control `read` access to the destination.
77
+
In {project-name-short}, policies for consuming and browsing are separated and you need to define them both in order to control `read` access to the destination.
78
78
79
79
|===
80
-
| ActiveMQ | Artemis
80
+
| ActiveMQ | {project-name-short}
81
81
82
82
| read
83
83
| consume
@@ -90,7 +90,7 @@ It's the same story with `admin` privileges.
90
90
You need to define separate create and delete policies for durable and non-durable core queues.
91
91
92
92
|===
93
-
| ActiveMQ | Artemis
93
+
| ActiveMQ | {project-name-short}
94
94
95
95
| admin
96
96
| createNonDurableQueue
@@ -109,7 +109,7 @@ Finally, there's a topic of using wildcards to define policies.
109
109
The following table shows the wildcard syntax difference.
@@ -127,6 +127,6 @@ The following table shows the wildcard syntax difference.
127
127
| #
128
128
|===
129
129
130
-
Basically, by default only the _any word_ character is different, so that's why we used `GUESTS.#` in Artemis example instead of ActiveMQ's `GUESTS.>` syntax.
130
+
Basically, by default only the _any word_ character is different, so that's why we used `GUESTS.#` in {project-name-short} example instead of ActiveMQ's `GUESTS.>` syntax.
131
131
132
-
Powered with this knowledge, you should be able to transform your current ActiveMQ authorization policies to Artemis.
132
+
Powered with this knowledge, you should be able to transform your current ActiveMQ authorization policies to {project-name-short}.
0 commit comments