diff --git a/.travis.yml b/.travis.yml index 29e838cc..4c9ad336 100644 --- a/.travis.yml +++ b/.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 diff --git a/.utility/push-javadoc-to-gh-pages.sh b/.utility/push-javadoc-to-gh-pages.sh index 9ac82a4c..186b53a9 100644 --- a/.utility/push-javadoc-to-gh-pages.sh +++ b/.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 "travis@travis-ci.org" 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 . diff --git a/README.md b/README.md index 21e1e30c..b57d722c 100644 --- a/README.md +++ b/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 diff --git a/docs/images/domain-design.png b/assets/images/domain-design.png similarity index 100% rename from docs/images/domain-design.png rename to assets/images/domain-design.png diff --git a/docs/images/logo.png b/assets/images/logo.png similarity index 100% rename from docs/images/logo.png rename to assets/images/logo.png diff --git a/docs/images/logo2.png b/assets/images/logo2.png similarity index 100% rename from docs/images/logo2.png rename to assets/images/logo2.png diff --git a/docs/images/new-domain-design.png b/assets/images/new-domain-design.png similarity index 100% rename from docs/images/new-domain-design.png rename to assets/images/new-domain-design.png diff --git a/code/messaging-benchmark/pom.xml b/code/messaging-benchmark/pom.xml deleted file mode 100644 index bd737af9..00000000 --- a/code/messaging-benchmark/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-benchmark - messaging-benchmark ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-binlog-core/pom.xml b/code/messaging-binlog-core/pom.xml deleted file mode 100644 index f73d2bc6..00000000 --- a/code/messaging-binlog-core/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-binlog-core - messaging-binlog-core ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogImportService.java b/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogImportService.java deleted file mode 100644 index b128d454..00000000 --- a/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogImportService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.openmessaging.binlogcore; - -/** - * @author vintagewang@apache.org - */ -public interface BinlogImportService { - void start(); - - void shutdown(); - - BinlogOffset binlogOffset(); - - void putMessage(); -} diff --git a/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogOffset.java b/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogOffset.java deleted file mode 100644 index c775183b..00000000 --- a/code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogOffset.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.openmessaging.binlogcore; - -public interface BinlogOffset { -} diff --git a/code/messaging-log4j-appender/pom.xml b/code/messaging-log4j-appender/pom.xml deleted file mode 100644 index bb75d078..00000000 --- a/code/messaging-log4j-appender/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-log4j-appender - messaging-log4j2-appender ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-log4j2-appender/pom.xml b/code/messaging-log4j2-appender/pom.xml deleted file mode 100644 index 84e39857..00000000 --- a/code/messaging-log4j2-appender/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-log4j2-appender - messaging-log4j2-appender ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-logback-appender/pom.xml b/code/messaging-logback-appender/pom.xml deleted file mode 100644 index 5c67b175..00000000 --- a/code/messaging-logback-appender/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-logback-appender - messaging-logback-appender ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-mysql-export/pom.xml b/code/messaging-mysql-export/pom.xml deleted file mode 100644 index 660328ff..00000000 --- a/code/messaging-mysql-export/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-mysql-export - messaging-mysql-export ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-router/pom.xml b/code/messaging-router/pom.xml deleted file mode 100644 index c5f33431..00000000 --- a/code/messaging-router/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-router - messaging-router ${project.version} - - - - junit - junit - - - diff --git a/code/messaging-spark/pom.xml b/code/messaging-spark/pom.xml deleted file mode 100644 index 261be4b5..00000000 --- a/code/messaging-spark/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - io.openmessaging - parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml - - - 4.0.0 - jar - messaging-spark - messaging-spark ${project.version} - - - - junit - junit - - - diff --git a/docs/OpenMessagingDomainArchitecture-v1.0.pdf b/docs/OpenMessagingDomainArchitecture-v1.0.pdf deleted file mode 100644 index 0a4398ed..00000000 Binary files a/docs/OpenMessagingDomainArchitecture-v1.0.pdf and /dev/null differ diff --git a/docs/openmessaging-design-v1.0.pptx b/docs/openmessaging-design-v1.0.pptx deleted file mode 100644 index a525a9c1..00000000 Binary files a/docs/openmessaging-design-v1.0.pptx and /dev/null differ diff --git a/code/messaging-admin/pom.xml b/openmessaging-admin/pom.xml similarity index 74% rename from code/messaging-admin/pom.xml rename to openmessaging-admin/pom.xml index 7789ede2..cbd2dd95 100644 --- a/code/messaging-admin/pom.xml +++ b/openmessaging-admin/pom.xml @@ -3,14 +3,13 @@ io.openmessaging parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml + 0.1.1-alpha-SNAPSHOT 4.0.0 jar - messaging-admin - messaging-admin ${project.version} + openmessaging-admin + openmessaging-admin ${project.version} diff --git a/code/messaging-user-level-samples/java/pom.xml b/openmessaging-api-samples/pom.xml similarity index 95% rename from code/messaging-user-level-samples/java/pom.xml rename to openmessaging-api-samples/pom.xml index 0a8498b1..0ef05f85 100644 --- a/code/messaging-user-level-samples/java/pom.xml +++ b/openmessaging-api-samples/pom.xml @@ -4,7 +4,6 @@ io.openmessaging parent 0.1.1-alpha-SNAPSHOT - ../../pom.xml 4.0.0 diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/PullConsumerApp.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/PullConsumerApp.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/PullConsumerApp.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/PullConsumerApp.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/PushConsumerApp.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/PushConsumerApp.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/PushConsumerApp.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/PushConsumerApp.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/StreamingConsumerApp.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/StreamingConsumerApp.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/consumer/StreamingConsumerApp.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/consumer/StreamingConsumerApp.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/producer/AnotherProducerApp.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/producer/AnotherProducerApp.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/producer/AnotherProducerApp.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/producer/AnotherProducerApp.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/producer/ProducerApp.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/producer/ProducerApp.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/producer/ProducerApp.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/producer/ProducerApp.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/Consumer.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/Consumer.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/Consumer.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/Consumer.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/Provider.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/Provider.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/Provider.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/Provider.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/CallRequest.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/CallRequest.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/CallRequest.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/CallRequest.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/CallResponse.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/CallResponse.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/CallResponse.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/CallResponse.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/HelloService.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/HelloService.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/api/HelloService.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/api/HelloService.java diff --git a/code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/impl/HelloServiceImpl.java b/openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/impl/HelloServiceImpl.java similarity index 100% rename from code/messaging-user-level-samples/java/src/main/java/io/openmessaging/samples/service/impl/HelloServiceImpl.java rename to openmessaging-api-samples/src/main/java/io/openmessaging/samples/service/impl/HelloServiceImpl.java diff --git a/code/messaging-user-level-api/README.md b/openmessaging-api/README.md similarity index 100% rename from code/messaging-user-level-api/README.md rename to openmessaging-api/README.md diff --git a/code/messaging-user-level-api/java/pom.xml b/openmessaging-api/pom.xml similarity index 91% rename from code/messaging-user-level-api/java/pom.xml rename to openmessaging-api/pom.xml index e0b7e7d7..b52678cc 100644 --- a/code/messaging-user-level-api/java/pom.xml +++ b/openmessaging-api/pom.xml @@ -4,7 +4,6 @@ io.openmessaging parent 0.1.1-alpha-SNAPSHOT - ../../pom.xml 4.0.0 diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/BatchMessageSender.java b/openmessaging-api/src/main/java/io/openmessaging/BatchMessageSender.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/BatchMessageSender.java rename to openmessaging-api/src/main/java/io/openmessaging/BatchMessageSender.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/BytesMessage.java b/openmessaging-api/src/main/java/io/openmessaging/BytesMessage.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/BytesMessage.java rename to openmessaging-api/src/main/java/io/openmessaging/BytesMessage.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/InvokeContext.java b/openmessaging-api/src/main/java/io/openmessaging/InvokeContext.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/InvokeContext.java rename to openmessaging-api/src/main/java/io/openmessaging/InvokeContext.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/KeyValue.java b/openmessaging-api/src/main/java/io/openmessaging/KeyValue.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/KeyValue.java rename to openmessaging-api/src/main/java/io/openmessaging/KeyValue.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/LocalTransactionBranchExecutor.java b/openmessaging-api/src/main/java/io/openmessaging/LocalTransactionBranchExecutor.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/LocalTransactionBranchExecutor.java rename to openmessaging-api/src/main/java/io/openmessaging/LocalTransactionBranchExecutor.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/Message.java b/openmessaging-api/src/main/java/io/openmessaging/Message.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/Message.java rename to openmessaging-api/src/main/java/io/openmessaging/Message.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageFactory.java b/openmessaging-api/src/main/java/io/openmessaging/MessageFactory.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageFactory.java rename to openmessaging-api/src/main/java/io/openmessaging/MessageFactory.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageIterator.java b/openmessaging-api/src/main/java/io/openmessaging/MessageIterator.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageIterator.java rename to openmessaging-api/src/main/java/io/openmessaging/MessageIterator.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageListener.java b/openmessaging-api/src/main/java/io/openmessaging/MessageListener.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessageListener.java rename to openmessaging-api/src/main/java/io/openmessaging/MessageListener.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessagingAccessPoint.java b/openmessaging-api/src/main/java/io/openmessaging/MessagingAccessPoint.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessagingAccessPoint.java rename to openmessaging-api/src/main/java/io/openmessaging/MessagingAccessPoint.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessagingAccessPointFactory.java b/openmessaging-api/src/main/java/io/openmessaging/MessagingAccessPointFactory.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/MessagingAccessPointFactory.java rename to openmessaging-api/src/main/java/io/openmessaging/MessagingAccessPointFactory.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/OMS.java b/openmessaging-api/src/main/java/io/openmessaging/OMS.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/OMS.java rename to openmessaging-api/src/main/java/io/openmessaging/OMS.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/OMSBuiltinKeys.java b/openmessaging-api/src/main/java/io/openmessaging/OMSBuiltinKeys.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/OMSBuiltinKeys.java rename to openmessaging-api/src/main/java/io/openmessaging/OMSBuiltinKeys.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/Producer.java b/openmessaging-api/src/main/java/io/openmessaging/Producer.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/Producer.java rename to openmessaging-api/src/main/java/io/openmessaging/Producer.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/Promise.java b/openmessaging-api/src/main/java/io/openmessaging/Promise.java similarity index 97% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/Promise.java rename to openmessaging-api/src/main/java/io/openmessaging/Promise.java index 6731b43e..24505725 100644 --- a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/Promise.java +++ b/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 vintagewang@apache.org * @author yukon@apache.org diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/PromiseListener.java b/openmessaging-api/src/main/java/io/openmessaging/PromiseListener.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/PromiseListener.java rename to openmessaging-api/src/main/java/io/openmessaging/PromiseListener.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/PullConsumer.java b/openmessaging-api/src/main/java/io/openmessaging/PullConsumer.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/PullConsumer.java rename to openmessaging-api/src/main/java/io/openmessaging/PullConsumer.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/PushConsumer.java b/openmessaging-api/src/main/java/io/openmessaging/PushConsumer.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/PushConsumer.java rename to openmessaging-api/src/main/java/io/openmessaging/PushConsumer.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/ResourceManager.java b/openmessaging-api/src/main/java/io/openmessaging/ResourceManager.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/ResourceManager.java rename to openmessaging-api/src/main/java/io/openmessaging/ResourceManager.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/SendResult.java b/openmessaging-api/src/main/java/io/openmessaging/SendResult.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/SendResult.java rename to openmessaging-api/src/main/java/io/openmessaging/SendResult.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceEndPoint.java b/openmessaging-api/src/main/java/io/openmessaging/ServiceEndPoint.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceEndPoint.java rename to openmessaging-api/src/main/java/io/openmessaging/ServiceEndPoint.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceInstance.java b/openmessaging-api/src/main/java/io/openmessaging/ServiceInstance.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceInstance.java rename to openmessaging-api/src/main/java/io/openmessaging/ServiceInstance.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceLifecycle.java b/openmessaging-api/src/main/java/io/openmessaging/ServiceLifecycle.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceLifecycle.java rename to openmessaging-api/src/main/java/io/openmessaging/ServiceLifecycle.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceLoadBalanceStrategy.java b/openmessaging-api/src/main/java/io/openmessaging/ServiceLoadBalanceStrategy.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/ServiceLoadBalanceStrategy.java rename to openmessaging-api/src/main/java/io/openmessaging/ServiceLoadBalanceStrategy.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/Stream.java b/openmessaging-api/src/main/java/io/openmessaging/Stream.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/Stream.java rename to openmessaging-api/src/main/java/io/openmessaging/Stream.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/StreamingConsumer.java b/openmessaging-api/src/main/java/io/openmessaging/StreamingConsumer.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/StreamingConsumer.java rename to openmessaging-api/src/main/java/io/openmessaging/StreamingConsumer.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSMessageFormatException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSMessageFormatException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSMessageFormatException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSMessageFormatException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSNotSupportedException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSNotSupportedException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSNotSupportedException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSNotSupportedException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSResourceNotExistException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSResourceNotExistException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSResourceNotExistException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSResourceNotExistException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSRuntimeException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSRuntimeException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSRuntimeException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSRuntimeException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSTimeOutException.java b/openmessaging-api/src/main/java/io/openmessaging/exception/OMSTimeOutException.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/exception/OMSTimeOutException.java rename to openmessaging-api/src/main/java/io/openmessaging/exception/OMSTimeOutException.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/MessagingAccessPointInterceptor.java b/openmessaging-api/src/main/java/io/openmessaging/interceptor/MessagingAccessPointInterceptor.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/MessagingAccessPointInterceptor.java rename to openmessaging-api/src/main/java/io/openmessaging/interceptor/MessagingAccessPointInterceptor.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/ProducerInterceptor.java b/openmessaging-api/src/main/java/io/openmessaging/interceptor/ProducerInterceptor.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/ProducerInterceptor.java rename to openmessaging-api/src/main/java/io/openmessaging/interceptor/ProducerInterceptor.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/PushConsumerInterceptor.java b/openmessaging-api/src/main/java/io/openmessaging/interceptor/PushConsumerInterceptor.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/interceptor/PushConsumerInterceptor.java rename to openmessaging-api/src/main/java/io/openmessaging/interceptor/PushConsumerInterceptor.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/DefaultKeyValue.java b/openmessaging-api/src/main/java/io/openmessaging/internal/DefaultKeyValue.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/DefaultKeyValue.java rename to openmessaging-api/src/main/java/io/openmessaging/internal/DefaultKeyValue.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/MessagingAccessPointAdapter.java b/openmessaging-api/src/main/java/io/openmessaging/internal/MessagingAccessPointAdapter.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/MessagingAccessPointAdapter.java rename to openmessaging-api/src/main/java/io/openmessaging/internal/MessagingAccessPointAdapter.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/MessagingAccessPointInterceptorFactory.java b/openmessaging-api/src/main/java/io/openmessaging/internal/MessagingAccessPointInterceptorFactory.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/internal/MessagingAccessPointInterceptorFactory.java rename to openmessaging-api/src/main/java/io/openmessaging/internal/MessagingAccessPointInterceptorFactory.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/OMSEvent.java b/openmessaging-api/src/main/java/io/openmessaging/observer/OMSEvent.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/OMSEvent.java rename to openmessaging-api/src/main/java/io/openmessaging/observer/OMSEvent.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/OMSExceptionEvent.java b/openmessaging-api/src/main/java/io/openmessaging/observer/OMSExceptionEvent.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/OMSExceptionEvent.java rename to openmessaging-api/src/main/java/io/openmessaging/observer/OMSExceptionEvent.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/Observer.java b/openmessaging-api/src/main/java/io/openmessaging/observer/Observer.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/observer/Observer.java rename to openmessaging-api/src/main/java/io/openmessaging/observer/Observer.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/package-info.java b/openmessaging-api/src/main/java/io/openmessaging/package-info.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/package-info.java rename to openmessaging-api/src/main/java/io/openmessaging/package-info.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/routing/Operator.java b/openmessaging-api/src/main/java/io/openmessaging/routing/Operator.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/routing/Operator.java rename to openmessaging-api/src/main/java/io/openmessaging/routing/Operator.java diff --git a/code/messaging-user-level-api/java/src/main/java/io/openmessaging/routing/Routing.java b/openmessaging-api/src/main/java/io/openmessaging/routing/Routing.java similarity index 100% rename from code/messaging-user-level-api/java/src/main/java/io/openmessaging/routing/Routing.java rename to openmessaging-api/src/main/java/io/openmessaging/routing/Routing.java diff --git a/code/messaging-storm/pom.xml b/openmessaging-benchmark/pom.xml similarity index 74% rename from code/messaging-storm/pom.xml rename to openmessaging-benchmark/pom.xml index e199ee2b..999eddc6 100644 --- a/code/messaging-storm/pom.xml +++ b/openmessaging-benchmark/pom.xml @@ -3,14 +3,13 @@ io.openmessaging parent - 0.1.0-alpha-SNAPSHOT - ../pom.xml + 0.1.1-alpha-SNAPSHOT 4.0.0 jar - messaging-storm - messaging-storm ${project.version} + openmessaging-benchmark + openmessaging-benchmark ${project.version} diff --git a/code/pom.xml b/pom.xml similarity index 95% rename from code/pom.xml rename to pom.xml index db92ec9c..f7458b04 100644 --- a/code/pom.xml +++ b/pom.xml @@ -56,12 +56,10 @@ - - - - - messaging-user-level-api/java - messaging-user-level-samples/java + openmessaging-admin + openmessaging-benchmark + openmessaging-api + openmessaging-api-samples diff --git a/code/style/checkstyle.xml b/style/checkstyle.xml similarity index 100% rename from code/style/checkstyle.xml rename to style/checkstyle.xml diff --git a/code/style/codeStyle.xml b/style/codeStyle.xml similarity index 99% rename from code/style/codeStyle.xml rename to style/codeStyle.xml index 7c7ce54b..d969c15c 100644 --- a/code/style/codeStyle.xml +++ b/style/codeStyle.xml @@ -15,7 +15,7 @@ limitations under the License. --> - +