ARTEMIS-2109: use default 1.8 compiler source/target config as with other examples, newest JDKs no longer target 1.6. Fix SSL example. Allows building on JDK 14+.
This commit is contained in:
parent
f69f03a205
commit
12bc494f72
|
@ -35,7 +35,6 @@ under the License.
|
||||||
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
|
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<projectBaseUri>${project.baseUri}</projectBaseUri>
|
<projectBaseUri>${project.baseUri}</projectBaseUri>
|
||||||
<java.version>1.6</java.version>
|
|
||||||
|
|
||||||
<servlet-api.version>3.0-alpha-1</servlet-api.version>
|
<servlet-api.version>3.0-alpha-1</servlet-api.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -76,15 +75,6 @@ under the License.
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<source>${java.version}</source>
|
|
||||||
<target>${java.version}</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.tomcat.maven</groupId>
|
<groupId>org.apache.tomcat.maven</groupId>
|
||||||
<artifactId>tomcat7-maven-plugin</artifactId>
|
<artifactId>tomcat7-maven-plugin</artifactId>
|
||||||
|
|
|
@ -6,7 +6,7 @@ This example shows you how to configure 2-way SSL along with 2 different authent
|
||||||
|
|
||||||
The various keystore files are generated using the following commands:
|
The various keystore files are generated using the following commands:
|
||||||
|
|
||||||
* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Server, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
|
* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
|
||||||
* `keytool -export -keystore server-side-keystore.jks -file server-side-cert.cer -storepass secureexample`
|
* `keytool -export -keystore server-side-keystore.jks -file server-side-cert.cer -storepass secureexample`
|
||||||
* `keytool -import -keystore client-side-truststore.jks -file server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
|
* `keytool -import -keystore client-side-truststore.jks -file server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
|
||||||
* `keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
|
* `keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
|
||||||
|
|
|
@ -29,9 +29,6 @@ import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.security.Security;
|
|
||||||
|
|
||||||
import com.sun.net.ssl.internal.ssl.Provider;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An example where a client will send a Stomp message on a TCP socket
|
* An example where a client will send a Stomp message on a TCP socket
|
||||||
|
@ -45,7 +42,6 @@ public class StompDualAuthenticationExample {
|
||||||
|
|
||||||
Connection connection = null;
|
Connection connection = null;
|
||||||
InitialContext initialContext = null;
|
InitialContext initialContext = null;
|
||||||
Security.addProvider(new Provider());
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// set up SSL keystores for Stomp connection
|
// set up SSL keystores for Stomp connection
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue