anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bumped verision 0.7

Browse Source
This commit is contained in:
andrea
2015-07-08 19:54:29 +02:00
parent a1fb2115cd
commit f0a8346ef4
8 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+13 -41
View File
@@ -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:
```
<dependency>
<groupId>org.dna.mqtt</groupId>
<groupId>org.eclipse.moquette</groupId>
<artifactId>moquette-broker</artifactId>
<version>0.6</version>
<version>0.7</version>
</dependency>
```
@@ -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
broker/pom.xml
+9 -1
View File
@@ -7,7 +7,7 @@
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>moquette-parent</artifactId>
<groupId>org.eclipse.moquette</groupId>
<version>0.7-SNAPSHOT</version>
<version>0.7</version>
</parent>
<artifactId>moquette-broker</artifactId>
@@ -17,6 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bintray.package>org.dna.mqtt.moquette-broker</bintray.package>
</properties>
<dependencies>
@@ -179,4 +180,11 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/${bintray.repo}/${bintray.package}</url>
</repository>
</distributionManagement>
</project>
broker/src/main/java/org/eclipse/moquette/server/Server.java
+1 -1
View File
@@ -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
distribution/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>moquette-parent</artifactId>
<groupId>org.eclipse.moquette</groupId>
<version>0.7-SNAPSHOT</version>
<version>0.7</version>
</parent>
<artifactId>distribution</artifactId>
distribution/src/main/scripts/moquette.sh
+1 -1
View File
@@ -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
netty_parser/pom.xml
+8 -3
View File
@@ -7,7 +7,7 @@
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>moquette-parent</artifactId>
<groupId>org.eclipse.moquette</groupId>
<version>0.7-SNAPSHOT</version>
<version>0.7</version>
</parent>
<artifactId>moquette-netty-parser</artifactId>
@@ -17,6 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bintray.package>org.dna.mqtt.moquette-netty-parser</bintray.package>
</properties>
<dependencies>
@@ -89,6 +90,10 @@
</plugins>
</build>
<repositories>
</repositories>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/${bintray.repo}/${bintray.package}</url>
</repository>
</distributionManagement>
</project>
parser_commons/pom.xml
+9 -1
View File
@@ -7,7 +7,7 @@
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>moquette-parent</artifactId>
<groupId>org.eclipse.moquette</groupId>
<version>0.7-SNAPSHOT</version>
<version>0.7</version>
</parent>
<artifactId>moquette-parser-commons</artifactId>
@@ -17,6 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bintray.package>org.dna.mqtt.moquette-parser-commons</bintray.package>
</properties>
<dependencies>
@@ -41,4 +42,11 @@
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/${bintray.repo}/${bintray.package}</url>
</repository>
</distributionManagement>
</project>
pom.xml
+11 -2
View File
@@ -7,15 +7,17 @@
<netty.version>4.0.24.Final</netty.version>
<source.version>1.7</source.version>
<target.version>1.7</target.version>
<bintray.repo>andsel/maven</bintray.repo>
<bintray.parent.package>org.dna.mqtt.moquette-parent</bintray.parent.package>
</properties>
<groupId>org.eclipse.moquette</groupId>
<artifactId>moquette-parent</artifactId>
<packaging>pom</packaging>
<version>0.7-SNAPSHOT</version>
<version>0.7</version>
<name>Moquette MQTT parent</name>
<url>http://code.google.com/p/moquette-mqtt/</url>
<url>https://github.com/andsel/moquette/</url>
<modules>
@@ -62,4 +64,11 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/${bintray.repo}/${bintray.parent.package}</url>
</repository>
</distributionManagement>
</project>