Skip to content

Commit 18e130e

Browse files
committed
Polish openmessaging-java repo structure
1 parent 0c843d4 commit 18e130e

File tree

84 files changed

+21
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+21
-247
lines changed

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ language: java
22
jdk:
33
- oraclejdk8
44

5-
script: cd code/ && mvn install
5+
script: mvn install
66
env:
77
global:
88
secure: hmPdcALAi6qE3TqJDRqdVCqZftd/i2hWLCyZbIAcRzu38nO94JZYKSZjfif1FvXTJYotFW25JClXNyvOMwMjjK3OPQINfYFZIp6LLeOmXGbUcktwQ8TIoKZ7IOvvWiZK054H7zNKapz+ke3OPN/5WTmMBezV0Ct4+bSf9udKVnQSMG2sJ8YJ/SeZkh7RTlqO+zTkh+yq8Hk0BdaWEOK8RtEoWgcUFGVfkycvjgvna+TbDp3K7vjmhYBBqACsNKxXPgIumStbCGW4vwjoVkCOGIJKWnuQEVHxiqBUH3pp81bxnt+RIcMuZMR2HnDSpHyAIulTJNHVo3VFAAiy9HMdP8Wfy/OVdjBSZ8xIOoQvFijo+yGNNn8v4hILcX4IpumQeyjpG134BOWVbMLhKH7qWR3Z8TGgijSd4lYYjabCJ564E93KvqK1u2CuS9u89N8J7AKFYMbknH1DP8E5tCD+VI3Gwut9YNofywj3Jln8uCOP4I//8p61j9A9QF7ORpY59Ru4RNzxYrFn2QSTltMfaBfVZchh5AqURUamcJd+1orZfz/v+6yH9FOW+MAG8EJdzHDsqzP1NXrt+4VtF6yqOnhBxnKVNEwFwjsinW9PFi9dXyzdEd33jKGL7UO8Old5XlBoA7idWIDH4GKKSlBRZhEKWMe4ZfxpQVg3VPz2Qqo=
99

1010
after_success:
11-
- cd .. && bash .utility/push-javadoc-to-gh-pages.sh
11+
- bash .utility/push-javadoc-to-gh-pages.sh

Diff for: .utility/push-javadoc-to-gh-pages.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
2-
if [ "$TRAVIS_REPO_SLUG" == "openmessaging/openmessaging" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
2+
if [ "$TRAVIS_REPO_SLUG" == "openmessaging/openmessaging-java" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
33

44
echo -e "Publishing javadoc...\n"
5-
cd code/ && mvn javadoc:aggregate -pl :parent,:openmessaging-api
5+
mvn javadoc:aggregate -pl :parent,:openmessaging-api
66
rm -rf $HOME/javadoc-latest
77
cp -R target/site/apidocs/ $HOME/javadoc-latest
88

99
cd $HOME
1010
git config --global user.email "[email protected]"
1111
git config --global user.name "travis-ci"
12-
git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/openmessaging/openmessaging gh-pages > /dev/null
12+
git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/openmessaging/openmessaging-java gh-pages > /dev/null
1313

1414
cd gh-pages
1515
git rm -rf .

Diff for: README.md

+4-4
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: code/messaging-benchmark/pom.xml

-21
This file was deleted.

Diff for: code/messaging-binlog-core/pom.xml

-21
This file was deleted.

Diff for: code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogImportService.java

-31
This file was deleted.

Diff for: code/messaging-binlog-core/src/main/java/io/openmessaging/binlogcore/BinlogOffset.java

-21
This file was deleted.

Diff for: code/messaging-log4j-appender/pom.xml

-21
This file was deleted.

Diff for: code/messaging-log4j2-appender/pom.xml

-21
This file was deleted.

Diff for: code/messaging-logback-appender/pom.xml

-21
This file was deleted.

Diff for: code/messaging-mysql-export/pom.xml

-21
This file was deleted.

Diff for: code/messaging-router/pom.xml

-21
This file was deleted.

Diff for: code/messaging-spark/pom.xml

-21
This file was deleted.

Diff for: docs/OpenMessagingDomainArchitecture-v1.0.pdf

-115 KB
Binary file not shown.

Diff for: docs/openmessaging-design-v1.0.pptx

-41.8 KB
Binary file not shown.

Diff for: code/messaging-admin/pom.xml renamed to openmessaging-admin/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<parent>
44
<groupId>io.openmessaging</groupId>
55
<artifactId>parent</artifactId>
6-
<version>0.1.0-alpha-SNAPSHOT</version>
7-
<relativePath>../pom.xml</relativePath>
6+
<version>0.1.1-alpha-SNAPSHOT</version>
87
</parent>
98

109
<modelVersion>4.0.0</modelVersion>
1110
<packaging>jar</packaging>
12-
<artifactId>messaging-admin</artifactId>
13-
<name>messaging-admin ${project.version}</name>
11+
<artifactId>openmessaging-admin</artifactId>
12+
<name>openmessaging-admin ${project.version}</name>
1413

1514
<dependencies>
1615
<dependency>

Diff for: code/messaging-user-level-samples/java/pom.xml renamed to openmessaging-api-samples/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<groupId>io.openmessaging</groupId>
55
<artifactId>parent</artifactId>
66
<version>0.1.1-alpha-SNAPSHOT</version>
7-
<relativePath>../../pom.xml</relativePath>
87
</parent>
98

109
<modelVersion>4.0.0</modelVersion>

Diff for: code/messaging-user-level-api/java/pom.xml renamed to openmessaging-api/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<groupId>io.openmessaging</groupId>
55
<artifactId>parent</artifactId>
66
<version>0.1.1-alpha-SNAPSHOT</version>
7-
<relativePath>../../pom.xml</relativePath>
87
</parent>
98

109
<modelVersion>4.0.0</modelVersion>

Diff for: code/messaging-user-level-api/java/src/main/java/io/openmessaging/Promise.java renamed to openmessaging-api/src/main/java/io/openmessaging/Promise.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* ready. Cancellation is performed by the {@code cancel} method. Additional methods are provided to determine if the
2525
* task completed normally or was cancelled. Once a computation has completed, the computation cannot be cancelled. If
2626
* you would like to use a {@code Promise} for the sake of cancellability but not provide a usable result, you can
27-
* declare types of the form {@code Promise<?>} and return {@code null} as a result of the underlying task.
27+
* declare type+s of the form {@code Promise<?>} and return {@code null} as a result of the underlying task.
2828
*
2929
3030

Diff for: code/messaging-storm/pom.xml renamed to openmessaging-benchmark/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<parent>
44
<groupId>io.openmessaging</groupId>
55
<artifactId>parent</artifactId>
6-
<version>0.1.0-alpha-SNAPSHOT</version>
7-
<relativePath>../pom.xml</relativePath>
6+
<version>0.1.1-alpha-SNAPSHOT</version>
87
</parent>
98

109
<modelVersion>4.0.0</modelVersion>
1110
<packaging>jar</packaging>
12-
<artifactId>messaging-storm</artifactId>
13-
<name>messaging-storm ${project.version}</name>
11+
<artifactId>openmessaging-benchmark</artifactId>
12+
<name>openmessaging-benchmark ${project.version}</name>
1413

1514
<dependencies>
1615
<dependency>

Diff for: code/pom.xml renamed to pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@
5656
</properties>
5757

5858
<modules>
59-
<!--<module>messaging-binlog-core</module>-->
60-
<!--<module>messaging-benchmark</module>-->
61-
<!--<module>messaging-router</module>-->
62-
<!--<module>messaging-wire-level-api</module>-->
63-
<module>messaging-user-level-api/java</module>
64-
<module>messaging-user-level-samples/java</module>
59+
<module>openmessaging-admin</module>
60+
<module>openmessaging-benchmark</module>
61+
<module>openmessaging-api</module>
62+
<module>openmessaging-api-samples</module>
6563
</modules>
6664

6765
<build>
File renamed without changes.

Diff for: code/style/codeStyle.xml renamed to style/codeStyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
limitations under the License.
1616
-->
1717

18-
<code_scheme name="rocketmq">
18+
<code_scheme name="openmessaging">
1919
<option name="USE_SAME_INDENTS" value="true"/>
2020
<option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true"/>
2121
<option name="OTHER_INDENT_OPTIONS">
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)