You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/06/20 15:42:12 UTC
[activemq-artemis] branch master updated: NO-JIRA a few example
updates
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new d92c9bb NO-JIRA a few example updates
new f54c299 This closes #2715
d92c9bb is described below
commit d92c9bbf1fb1efd8dac49b57d9c84fd041ddd684
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Jun 18 13:09:42 2019 -0500
NO-JIRA a few example updates
---
.../features/standard/exclusive-queue/readme.md | 13 +++--
examples/features/standard/netty-openssl/pom.xml | 2 +-
examples/features/standard/netty-openssl/readme.md | 6 +--
examples/features/standard/pom.xml | 4 ++
.../standard/spring-boot-integration/pom.xml | 59 ++++++++++------------
.../{README.md => readme.md} | 2 +-
.../features/standard/spring-integration/readme.md | 2 +-
examples/features/sub-modules/tomcat/pom.xml | 13 +++++
.../sub-modules/tomcat/{README => readme.md} | 0
9 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/examples/features/standard/exclusive-queue/readme.md b/examples/features/standard/exclusive-queue/readme.md
index bcaa7c7..2712afd 100644
--- a/examples/features/standard/exclusive-queue/readme.md
+++ b/examples/features/standard/exclusive-queue/readme.md
@@ -6,18 +6,17 @@ This example shows you how to configure ActiveMQ Artemis so all messages are del
## ExclusiveQueueExample.java
-The broker is configured (using 'address-settings'), so that the queue is exclusive and will deliver all messages to the same
+The broker is configured (using `address-settings`), so that the queue is exclusive and will deliver all messages to the same
consumer
```xml
- <address-settings>
- <address-setting match="my.exclusive.queue">
- <default-exclusive-queue>true</default-exclusive-queue>
- </address-setting>
- </address-settings>
+<address-settings>
+ <address-setting match="my.exclusive.queue">
+ <default-exclusive-queue>true</default-exclusive-queue>
+ </address-setting>
+</address-settings>
```
-
## ExclusiveQueueClientSideExample.java
The JMS Queue is auto created from the client code and uses the `exclusive` parameter.
diff --git a/examples/features/standard/netty-openssl/pom.xml b/examples/features/standard/netty-openssl/pom.xml
index ebd9c41..45176e1 100644
--- a/examples/features/standard/netty-openssl/pom.xml
+++ b/examples/features/standard/netty-openssl/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.broker</groupId>
<artifactId>jms-examples</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<artifactId>netty-openssl</artifactId>
diff --git a/examples/features/standard/netty-openssl/readme.md b/examples/features/standard/netty-openssl/readme.md
index 2ccb693..fbae0e9 100644
--- a/examples/features/standard/netty-openssl/readme.md
+++ b/examples/features/standard/netty-openssl/readme.md
@@ -12,6 +12,6 @@ To secure your messaging application with Netty's OpenSSL, you need to configure
In the configuration, the `activemq.example.keystore` is the key store file holding the server's certificate. The `activemq.example.truststore` is the file holding the certificates which the client trusts (i.e. the server's certificate exported from activemq.example.keystore). They are generated via the following commands:
-* `keytool -genkey -keystore activemq.example.keystore -storepass secureexample -keypass secureexample -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg EC -sigalg SHA256withECDSA
-* `keytool -export -keystore activemq.example.keystore -file activemq-jks.cer -storepass secureexample
-* `keytool -import -keystore activemq.example.truststore -file activemq-jks.cer -storepass secureexample -keypass secureexample -noprompt
+* `keytool -genkey -keystore activemq.example.keystore -storepass secureexample -keypass secureexample -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg EC -sigalg SHA256withECDSA`
+* `keytool -export -keystore activemq.example.keystore -file activemq-jks.cer -storepass secureexample`
+* `keytool -import -keystore activemq.example.truststore -file activemq-jks.cer -storepass secureexample -keypass secureexample -noprompt`
diff --git a/examples/features/standard/pom.xml b/examples/features/standard/pom.xml
index 76df69b..19ef58b 100644
--- a/examples/features/standard/pom.xml
+++ b/examples/features/standard/pom.xml
@@ -77,6 +77,7 @@ under the License.
<module>message-group</module>
<module>message-group2</module>
<module>message-priority</module>
+ <module>netty-openssl</module>
<module>no-consumer-buffering</module>
<module>paging</module>
<module>pre-acknowledge</module>
@@ -130,6 +131,7 @@ under the License.
<module>durable-subscription</module>
<module>embedded</module>
<module>embedded-simple</module>
+ <module>exclusive-queue</module>
<module>expiry</module>
<module>http-transport</module>
<module>interceptor</module>
@@ -148,6 +150,7 @@ under the License.
<module>message-group</module>
<module>message-group2</module>
<module>message-priority</module>
+ <module>netty-openssl</module>
<module>no-consumer-buffering</module>
<module>paging</module>
<module>pre-acknowledge</module>
@@ -165,6 +168,7 @@ under the License.
<module>shared-consumer</module>
<module>slow-consumer</module>
<module>spring-integration</module>
+ <module>spring-boot-integration</module>
<module>ssl-enabled</module>
<module>ssl-enabled-crl-mqtt</module>
<module>ssl-enabled-dual-authentication</module>
diff --git a/examples/features/standard/spring-boot-integration/pom.xml b/examples/features/standard/spring-boot-integration/pom.xml
index 7007d49..9046710 100644
--- a/examples/features/standard/spring-boot-integration/pom.xml
+++ b/examples/features/standard/spring-boot-integration/pom.xml
@@ -45,6 +45,32 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>runClient</id>
+ <goals>
+ <goal>runClient</goal>
+ </goals>
+ <configuration>
+ <clientClass>org.apache.activemq.artemis.jms.example.springboot.Application</clientClass>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq.examples.broker</groupId>
+ <artifactId>spring-boot-integration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.4.RELEASE</version>
@@ -53,39 +79,6 @@
</build>
<profiles>
<profile>
- <id>example</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>runClient</id>
- <goals>
- <goal>runClient</goal>
- </goals>
- <configuration>
- <clientClass>org.apache.activemq.artemis.jms.example.springboot.Application</clientClass>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq.examples.broker</groupId>
- <artifactId>spring-boot-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>release</id>
<build>
<plugins>
diff --git a/examples/features/standard/spring-boot-integration/README.md b/examples/features/standard/spring-boot-integration/readme.md
similarity index 76%
rename from examples/features/standard/spring-boot-integration/README.md
rename to examples/features/standard/spring-boot-integration/readme.md
index 075bbd0..108b9a1 100644
--- a/examples/features/standard/spring-boot-integration/README.md
+++ b/examples/features/standard/spring-boot-integration/readme.md
@@ -1,6 +1,6 @@
# ActiveMQ Artemis Spring Boot Example
-To run the example, simply type **mvn verify -Pexample** from this directory.
+To run the example, simply type **mvn verify** from this directory.
This example shows how to setup and run an embedded broker within a Spring Boot Application relying on [AMQP 1.0 JMS Spring Boot project](https://github.com/amqphub/amqp-10-jms-spring-boot) for configuration.
diff --git a/examples/features/standard/spring-integration/readme.md b/examples/features/standard/spring-integration/readme.md
index 41c2c9e..e139278 100644
--- a/examples/features/standard/spring-integration/readme.md
+++ b/examples/features/standard/spring-integration/readme.md
@@ -1,5 +1,5 @@
# ActiveMQ Artemis Spring Example
-To run the example, simply type **mvn verify -Pexample** from this directory
+To run the example, simply type **mvn verify** from this directory
This examples shows how to setup and run an embedded broker within a Spring ApplicationContext using ActiveMQ Artemis along with ActiveMQ Artemis configuration files.
\ No newline at end of file
diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml
index c085f48..b7a2872 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -122,4 +122,17 @@ under the License.
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/examples/features/sub-modules/tomcat/README b/examples/features/sub-modules/tomcat/readme.md
similarity index 100%
rename from examples/features/sub-modules/tomcat/README
rename to examples/features/sub-modules/tomcat/readme.md