diff --git a/README.md b/README.md index 558cf5ed..5a7517bf 100644 --- a/README.md +++ b/README.md @@ -20,19 +20,16 @@ and into [WSO2 Messge broker] (http://techexplosives-pamod.blogspot.it/2014/05/m Start play with it, download the self distribution tar from [BinTray](http://dl.bintray.com/andsel/generic/distribution-0.6-bundle-tar.tar.gz) , the un untar and start the broker listening on 1883 port and enjoy! ``` -tar zxf distribution-0.6-bundle-tar.tar.gz +tar zxf distribution-0.7-bundle-tar.tar.gz cd bin ./moquette.sh ``` -### Running inside OSGi container - -Starting from version 0.6 Moquette is OSGi compliant, to see it in action: +Or if you are on Windows shell ``` -mvn clean install; -cd bundle; -mvn install pax:provision -``` + cd bin + .\moquette.bat + ``` ## Embedding in other projects To embed Moquette in another maven project is sufficient to include a repository and declare the dependency: @@ -56,9 +53,9 @@ Include dependency in your project: ``` - org.dna.mqtt + org.eclipse.moquette moquette-broker - 0.6 + 0.7 ``` @@ -68,36 +65,11 @@ After a git clone of the repository, cd into the cloned sources and: `mvn clean In distribution/target directory will be produced the selfcontained tar for the broker with all dependencies and a running script. -## SSL configuration -Here are some simple steps to do to configure Moquette to serve over SSL - **Details ** -Moquette uses JavaKeyStore? and certificates to handle SSL. In order to expose it over SSL you have create a keystore for -the broker (select the password), exporting a certificate and define 4 variables into moquette.conf. - - **Create a keystore** - In a directory generate the keystore using the JRE's keytool: - ``` - keytool -keystore serverkeystore.jks -alias testserver -genkey -keyalg RSA - ``` - - To make it work you have to answer at the first question, say moquette.dna.org and as password we could use passw0rdsrv - for both (keystore and keymanger) - - **Export a certificate** - Then you need export a certificate: - ``` - keytool -export -alias testserver -keystore serverkeystore.jks -file testserver.crt - ``` - - **Imporing on the client side** - Supposing you have already created the keystore for the client side, (name it clientkeystore for example), we could import the certificate with: - ``` - keytool -keystore clientkeystore.jks -import -alias testserver -file testserver.crt -trustcacerts - ``` - - It's done! We just need use the Paho client to connect to the server, check ServerIntegrationSSLTest.java integration test to see how. - - - **Developers resources** +## Guide + + **Documentation reference guide** + Web site http://andsel.github.io/moquette/ + + **Developers resources** Google Group https://groups.google.com/forum/#!forum/moquette-mqtt diff --git a/broker/pom.xml b/broker/pom.xml index 977ef61b..3fe7f632 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -7,7 +7,7 @@ moquette-parent org.eclipse.moquette - 0.7-SNAPSHOT + 0.7 moquette-broker @@ -17,6 +17,7 @@ UTF-8 + org.dna.mqtt.moquette-broker @@ -179,4 +180,11 @@ + + + + bintray + https://api.bintray.com/maven/${bintray.repo}/${bintray.package} + + diff --git a/broker/src/main/java/org/eclipse/moquette/server/Server.java b/broker/src/main/java/org/eclipse/moquette/server/Server.java index e7f78a0a..d1676cfc 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/Server.java +++ b/broker/src/main/java/org/eclipse/moquette/server/Server.java @@ -41,7 +41,7 @@ public class Server { public static void main(String[] args) throws IOException { final Server server = new Server(); server.startServer(); - System.out.println("Server started, version 0.7-SNAPSHOT"); + System.out.println("Server started, version 0.7"); //Bind a shutdown hook Runtime.getRuntime().addShutdownHook(new Thread() { @Override diff --git a/distribution/pom.xml b/distribution/pom.xml index 9ef5b7f3..a5ad678c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ moquette-parent org.eclipse.moquette - 0.7-SNAPSHOT + 0.7 distribution diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh index 82b31dc7..b817c4de 100644 --- a/distribution/src/main/scripts/moquette.sh +++ b/distribution/src/main/scripts/moquette.sh @@ -52,5 +52,5 @@ MOQUETTE_PATH=$MOQUETTE_HOME/ #LOG_FILE_LEVEL=fine JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true" -$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/moquette-broker-0.7-SNAPSHOT.jar:$MOQUETTE_HOME/lib/*" org.eclipse.moquette.server.Server +$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/*" org.eclipse.moquette.server.Server diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml index 9f3cb936..b2d04908 100644 --- a/netty_parser/pom.xml +++ b/netty_parser/pom.xml @@ -7,7 +7,7 @@ moquette-parent org.eclipse.moquette - 0.7-SNAPSHOT + 0.7 moquette-netty-parser @@ -17,6 +17,7 @@ UTF-8 + org.dna.mqtt.moquette-netty-parser @@ -89,6 +90,10 @@ - - + + + bintray + https://api.bintray.com/maven/${bintray.repo}/${bintray.package} + + diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml index 3894f848..c8712ff2 100644 --- a/parser_commons/pom.xml +++ b/parser_commons/pom.xml @@ -7,7 +7,7 @@ moquette-parent org.eclipse.moquette - 0.7-SNAPSHOT + 0.7 moquette-parser-commons @@ -17,6 +17,7 @@ UTF-8 + org.dna.mqtt.moquette-parser-commons @@ -41,4 +42,11 @@ test + + + + bintray + https://api.bintray.com/maven/${bintray.repo}/${bintray.package} + + diff --git a/pom.xml b/pom.xml index 22b48755..9406e3af 100644 --- a/pom.xml +++ b/pom.xml @@ -7,15 +7,17 @@ 4.0.24.Final 1.7 1.7 + andsel/maven + org.dna.mqtt.moquette-parent org.eclipse.moquette moquette-parent pom - 0.7-SNAPSHOT + 0.7 Moquette MQTT parent - http://code.google.com/p/moquette-mqtt/ + https://github.com/andsel/moquette/ @@ -62,4 +64,11 @@ https://oss.sonatype.org/content/repositories/snapshots + + + + bintray + https://api.bintray.com/maven/${bintray.repo}/${bintray.parent.package} + +