Polish openmessaging-java repo structure

.travis.yml

@@ -2,10 +2,10 @@ language: java
 jdk:
 - oraclejdk8
 
-script: cd code/ && mvn install
+script: mvn install
 env:
   global:
     secure: hmPdcALAi6qE3TqJDRqdVCqZftd/i2hWLCyZbIAcRzu38nO94JZYKSZjfif1FvXTJYotFW25JClXNyvOMwMjjK3OPQINfYFZIp6LLeOmXGbUcktwQ8TIoKZ7IOvvWiZK054H7zNKapz+ke3OPN/5WTmMBezV0Ct4+bSf9udKVnQSMG2sJ8YJ/SeZkh7RTlqO+zTkh+yq8Hk0BdaWEOK8RtEoWgcUFGVfkycvjgvna+TbDp3K7vjmhYBBqACsNKxXPgIumStbCGW4vwjoVkCOGIJKWnuQEVHxiqBUH3pp81bxnt+RIcMuZMR2HnDSpHyAIulTJNHVo3VFAAiy9HMdP8Wfy/OVdjBSZ8xIOoQvFijo+yGNNn8v4hILcX4IpumQeyjpG134BOWVbMLhKH7qWR3Z8TGgijSd4lYYjabCJ564E93KvqK1u2CuS9u89N8J7AKFYMbknH1DP8E5tCD+VI3Gwut9YNofywj3Jln8uCOP4I//8p61j9A9QF7ORpY59Ru4RNzxYrFn2QSTltMfaBfVZchh5AqURUamcJd+1orZfz/v+6yH9FOW+MAG8EJdzHDsqzP1NXrt+4VtF6yqOnhBxnKVNEwFwjsinW9PFi9dXyzdEd33jKGL7UO8Old5XlBoA7idWIDH4GKKSlBRZhEKWMe4ZfxpQVg3VPz2Qqo=
 
 after_success:
-- cd .. && bash .utility/push-javadoc-to-gh-pages.sh
+- bash .utility/push-javadoc-to-gh-pages.sh

.utility/push-javadoc-to-gh-pages.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
-if [ "$TRAVIS_REPO_SLUG" == "openmessaging/openmessaging" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+if [ "$TRAVIS_REPO_SLUG" == "openmessaging/openmessaging-java" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
 
   echo -e "Publishing javadoc...\n"
-  cd code/ && mvn javadoc:aggregate -pl :parent,:openmessaging-api
+  mvn javadoc:aggregate -pl :parent,:openmessaging-api
   rm -rf $HOME/javadoc-latest
   cp -R target/site/apidocs/ $HOME/javadoc-latest
 
   cd $HOME
   git config --global user.email "[email protected]"
   git config --global user.name "travis-ci"
-  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/openmessaging/openmessaging gh-pages > /dev/null
+  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/openmessaging/openmessaging-java gh-pages > /dev/null
 
   cd gh-pages
   git rm -rf .

README.md

@@ -1,15 +1,15 @@
-## ![logo](./docs/images/logo2.png)
+## ![logo](./assets/images/logo2.png)
 
-[![Build Status](https://travis-ci.org/openmessaging/openmessaging.svg?branch=master)](https://travis-ci.org/openmessaging/openmessaging) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.openmessaging/openmessaging-api/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Copenmessaging) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/openmessaging/public) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![Build Status](https://travis-ci.org/openmessaging/openmessaging-java.svg?branch=master)](https://travis-ci.org/openmessaging/openmessaging-java) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.openmessaging/openmessaging-api/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Copenmessaging) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/openmessaging/public) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 ### A vendor-neutral open standard for distributed messaging and streaming
 OpenMessaging, which includes the establishment of industry guidelines and messaging, streaming specifications to provide a common framework for finance, e-commerce, IoT and big-data area. The design principles are the cloud-oriented, simplicity, flexibility, and language independent in distributed heterogeneous environments. Conformance to these specifications will make it possible to develop a heterogeneous messaging applications across all major platforms and operating systems.
 
 ## The domain architecture
-![domain-design](./docs/images/new-domain-design.png)
+![domain-design](./assets/images/new-domain-design.png)
 
 ## Doc
-[API Doc](https://openmessaging.github.io/openmessaging/).
+[API Doc](https://openmessaging.github.io/openmessaging-cloud/).
 
 
 ## Powered by Linux Foundation

code/messaging-admin/pom.xml → openmessaging-admin/pom.xml

@@ -3,14 +3,13 @@
     <parent>
         <groupId>io.openmessaging</groupId>
         <artifactId>parent</artifactId>
-        <version>0.1.0-alpha-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>0.1.1-alpha-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>messaging-admin</artifactId>
-    <name>messaging-admin ${project.version}</name>
+    <artifactId>openmessaging-admin</artifactId>
+    <name>openmessaging-admin ${project.version}</name>
 
     <dependencies>
         <dependency>

code/messaging-user-level-samples/java/pom.xml → openmessaging-api-samples/pom.xml

@@ -4,7 +4,6 @@
         <groupId>io.openmessaging</groupId>
         <artifactId>parent</artifactId>
         <version>0.1.1-alpha-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

code/messaging-user-level-api/java/pom.xml → openmessaging-api/pom.xml

@@ -4,7 +4,6 @@
         <groupId>io.openmessaging</groupId>
         <artifactId>parent</artifactId>
         <version>0.1.1-alpha-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

code/messaging-user-level-api/java/src/main/java/io/openmessaging/Promise.java → openmessaging-api/src/main/java/io/openmessaging/Promise.java

@@ -24,7 +24,7 @@
  * ready.  Cancellation is performed by the {@code cancel} method.  Additional methods are provided to determine if the
  * task completed normally or was cancelled. Once a computation has completed, the computation cannot be cancelled. If
  * you would like to use a {@code Promise} for the sake of cancellability but not provide a usable result, you can
- * declare types of the form {@code Promise<?>} and return {@code null} as a result of the underlying task.
+ * declare type+s of the form {@code Promise<?>} and return {@code null} as a result of the underlying task.
  *
  * @author [email protected]
  * @author [email protected]

code/messaging-storm/pom.xml → openmessaging-benchmark/pom.xml

@@ -3,14 +3,13 @@
     <parent>
         <groupId>io.openmessaging</groupId>
         <artifactId>parent</artifactId>
-        <version>0.1.0-alpha-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>0.1.1-alpha-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>messaging-storm</artifactId>
-    <name>messaging-storm ${project.version}</name>
+    <artifactId>openmessaging-benchmark</artifactId>
+    <name>openmessaging-benchmark ${project.version}</name>
 
     <dependencies>
         <dependency>

code/pom.xml → pom.xml

@@ -56,12 +56,10 @@
     </properties>
 
     <modules>
-        <!--<module>messaging-binlog-core</module>-->
-        <!--<module>messaging-benchmark</module>-->
-        <!--<module>messaging-router</module>-->
-        <!--<module>messaging-wire-level-api</module>-->
-        <module>messaging-user-level-api/java</module>
-        <module>messaging-user-level-samples/java</module>
+        <module>openmessaging-admin</module>
+        <module>openmessaging-benchmark</module>
+        <module>openmessaging-api</module>
+        <module>openmessaging-api-samples</module>
     </modules>
 
     <build>

code/style/codeStyle.xml → style/codeStyle.xml

@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<code_scheme name="rocketmq">
+<code_scheme name="openmessaging">
     <option name="USE_SAME_INDENTS" value="true"/>
     <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true"/>
     <option name="OTHER_INDENT_OPTIONS">