Initial commit

fengjiachun · Jan 19, 2017 · ec5f3d0 · ec5f3d0
1 parent 9c98eae
commit ec5f3d0
Show file tree

Hide file tree

Showing 106 changed files with 205 additions and 97 deletions.
diff --git a/jupiter-common/pom.xml b/jupiter-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jupiter-example/pom.xml b/jupiter-example/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jupiter-flightexec/pom.xml b/jupiter-flightexec/pom.xml
@@ -21,11 +21,12 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-flightexec</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

diff --git a/jupiter-monitor/pom.xml b/jupiter-monitor/pom.xml
@@ -21,11 +21,12 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-monitor</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -34,11 +35,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-transport-netty</artifactId>
+            <artifactId>jupiter-registry-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-registry</artifactId>
+            <artifactId>jupiter-transport-netty</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/jupiter-registry/jupiter-registry-api/pom.xml b/jupiter-registry/jupiter-registry-api/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015 The Jupiter Project
+  ~
+  ~ Licensed 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jupiter-registry</artifactId>
+        <groupId>org.jupiter</groupId>
+        <version>1.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>jupiter-registry-api</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jupiter-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...ter/registry/AbstractRegistryService.java → ...ter/registry/AbstractRegistryService.java b/...ter/registry/AbstractRegistryService.java → ...ter/registry/AbstractRegistryService.java
diff --git a/.../org/jupiter/registry/NotifyListener.java → .../org/jupiter/registry/NotifyListener.java b/.../org/jupiter/registry/NotifyListener.java → .../org/jupiter/registry/NotifyListener.java
diff --git a/...org/jupiter/registry/OfflineListener.java → ...org/jupiter/registry/OfflineListener.java b/...org/jupiter/registry/OfflineListener.java → ...org/jupiter/registry/OfflineListener.java
diff --git a/...va/org/jupiter/registry/RegisterMeta.java → ...va/org/jupiter/registry/RegisterMeta.java b/...va/org/jupiter/registry/RegisterMeta.java → ...va/org/jupiter/registry/RegisterMeta.java
diff --git a/...n/java/org/jupiter/registry/Registry.java → ...n/java/org/jupiter/registry/Registry.java b/...n/java/org/jupiter/registry/Registry.java → ...n/java/org/jupiter/registry/Registry.java
diff --git a/...org/jupiter/registry/RegistryMonitor.java → ...org/jupiter/registry/RegistryMonitor.java b/...org/jupiter/registry/RegistryMonitor.java → ...org/jupiter/registry/RegistryMonitor.java
diff --git a/.../org/jupiter/registry/RegistryServer.java → .../org/jupiter/registry/RegistryServer.java b/.../org/jupiter/registry/RegistryServer.java → .../org/jupiter/registry/RegistryServer.java
diff --git a/...org/jupiter/registry/RegistryService.java → ...org/jupiter/registry/RegistryService.java b/...org/jupiter/registry/RegistryService.java → ...org/jupiter/registry/RegistryService.java
diff --git a/jupiter-registry-default/pom.xml → ...registry/jupiter-registry-default/pom.xml b/jupiter-registry-default/pom.xml → ...registry/jupiter-registry-default/pom.xml
@@ -19,26 +19,28 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-registry</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-registry-default</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
+            <artifactId>jupiter-registry-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-registry</artifactId>
+            <artifactId>jupiter-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/...g/jupiter/registry/ConfigWithVersion.java → ...g/jupiter/registry/ConfigWithVersion.java b/...g/jupiter/registry/ConfigWithVersion.java → ...g/jupiter/registry/ConfigWithVersion.java
diff --git a/...org/jupiter/registry/DefaultRegistry.java → ...org/jupiter/registry/DefaultRegistry.java b/...org/jupiter/registry/DefaultRegistry.java → ...org/jupiter/registry/DefaultRegistry.java
diff --git a/...piter/registry/DefaultRegistryServer.java → ...piter/registry/DefaultRegistryServer.java b/...piter/registry/DefaultRegistryServer.java → ...piter/registry/DefaultRegistryServer.java
diff --git a/...iter/registry/DefaultRegistryService.java → ...iter/registry/DefaultRegistryService.java b/...iter/registry/DefaultRegistryService.java → ...iter/registry/DefaultRegistryService.java
diff --git a/...in/java/org/jupiter/registry/Message.java → ...in/java/org/jupiter/registry/Message.java b/...in/java/org/jupiter/registry/Message.java → ...in/java/org/jupiter/registry/Message.java
diff --git a/...jupiter/registry/RegisterInfoContext.java → ...jupiter/registry/RegisterInfoContext.java b/...jupiter/registry/RegisterInfoContext.java → ...jupiter/registry/RegisterInfoContext.java
diff --git a/...va/org/jupiter/registry/package-info.java → ...va/org/jupiter/registry/package-info.java b/...va/org/jupiter/registry/package-info.java → ...va/org/jupiter/registry/package-info.java
diff --git a/...ices/org.jupiter.registry.RegistryService → ...ices/org.jupiter.registry.RegistryService b/...ices/org.jupiter.registry.RegistryService → ...ices/org.jupiter.registry.RegistryService
diff --git a/jupiter-registry-zookeeper/pom.xml → ...gistry/jupiter-registry-zookeeper/pom.xml b/jupiter-registry-zookeeper/pom.xml → ...gistry/jupiter-registry-zookeeper/pom.xml
@@ -19,22 +19,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-registry</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-registry-zookeeper</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-registry</artifactId>
+            <artifactId>jupiter-registry-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...y/zookeeper/ZookeeperRegistryService.java → ...y/zookeeper/ZookeeperRegistryService.java b/...y/zookeeper/ZookeeperRegistryService.java → ...y/zookeeper/ZookeeperRegistryService.java
diff --git a/...ices/org.jupiter.registry.RegistryService → ...ices/org.jupiter.registry.RegistryService b/...ices/org.jupiter.registry.RegistryService → ...ices/org.jupiter.registry.RegistryService
diff --git a/jupiter-registry/pom.xml b/jupiter-registry/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-registry</artifactId>
+    <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>jupiter-registry-api</module>
+        <module>jupiter-registry-default</module>
+        <module>jupiter-registry-zookeeper</module>
+    </modules>
 </project>
diff --git a/jupiter-rpc/pom.xml b/jupiter-rpc/pom.xml
@@ -21,11 +21,12 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-rpc</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -34,15 +35,15 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-transport</artifactId>
+            <artifactId>jupiter-transport-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-registry</artifactId>
+            <artifactId>jupiter-registry-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>

diff --git a/jupiter-serialization/jupiter-serialization-api/pom.xml b/jupiter-serialization/jupiter-serialization-api/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015 The Jupiter Project
+  ~
+  ~ Licensed 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jupiter-serialization</artifactId>
+        <groupId>org.jupiter</groupId>
+        <version>1.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>jupiter-serialization-api</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jupiter-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...org/jupiter/serialization/Serializer.java → ...org/jupiter/serialization/Serializer.java b/...org/jupiter/serialization/Serializer.java → ...org/jupiter/serialization/Serializer.java
diff --git a/...iter/serialization/SerializerFactory.java → ...iter/serialization/SerializerFactory.java b/...iter/serialization/SerializerFactory.java → ...iter/serialization/SerializerFactory.java
diff --git a/...jupiter/serialization/SerializerType.java → ...jupiter/serialization/SerializerType.java b/...jupiter/serialization/SerializerType.java → ...jupiter/serialization/SerializerType.java
diff --git a/jupiter-serialization-hessian/pom.xml → ...ion/jupiter-serialization-hessian/pom.xml b/jupiter-serialization-hessian/pom.xml → ...ion/jupiter-serialization-hessian/pom.xml
@@ -19,23 +19,21 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-serialization</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-serialization-hessian</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.caucho</groupId>
             <artifactId>hessian</artifactId>

diff --git a/...ialization/hessian/HessianSerializer.java → ...ialization/hessian/HessianSerializer.java b/...ialization/hessian/HessianSerializer.java → ...ialization/hessian/HessianSerializer.java
diff --git a/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer b/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer
diff --git a/...zation/hessian/HessianSerializerTest.java → ...zation/hessian/HessianSerializerTest.java b/...zation/hessian/HessianSerializerTest.java → ...zation/hessian/HessianSerializerTest.java
diff --git a/jupiter-serialization-java/pom.xml → ...zation/jupiter-serialization-java/pom.xml b/jupiter-serialization-java/pom.xml → ...zation/jupiter-serialization-java/pom.xml
@@ -19,22 +19,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-serialization</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-serialization-java</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/...er/serialization/java/JavaSerializer.java → ...er/serialization/java/JavaSerializer.java b/...er/serialization/java/JavaSerializer.java → ...er/serialization/java/JavaSerializer.java
diff --git a/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer b/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer
diff --git a/...erialization/java/JavaSerializerTest.java → ...erialization/java/JavaSerializerTest.java b/...erialization/java/JavaSerializerTest.java → ...erialization/java/JavaSerializerTest.java
diff --git a/jupiter-serialization-kryo/pom.xml → ...zation/jupiter-serialization-kryo/pom.xml b/jupiter-serialization-kryo/pom.xml → ...zation/jupiter-serialization-kryo/pom.xml
@@ -19,23 +19,21 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-serialization</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-serialization-kryo</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.esotericsoftware.kryo</groupId>
             <artifactId>kryo</artifactId>

diff --git a/...er/serialization/kryo/KryoSerializer.java → ...er/serialization/kryo/KryoSerializer.java b/...er/serialization/kryo/KryoSerializer.java → ...er/serialization/kryo/KryoSerializer.java
diff --git a/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer b/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer
diff --git a/...erialization/kryo/KryoSerializerTest.java → ...erialization/kryo/KryoSerializerTest.java b/...erialization/kryo/KryoSerializerTest.java → ...erialization/kryo/KryoSerializerTest.java
diff --git a/jupiter-serialization-protostuff/pom.xml → .../jupiter-serialization-protostuff/pom.xml b/jupiter-serialization-protostuff/pom.xml → .../jupiter-serialization-protostuff/pom.xml
@@ -19,23 +19,21 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jupiter</artifactId>
+        <artifactId>jupiter-serialization</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-serialization-protostuff</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-serialization</artifactId>
+            <artifactId>jupiter-serialization-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>

diff --git a/...alization/proto/ProtoStuffSerializer.java → ...alization/proto/ProtoStuffSerializer.java b/...alization/proto/ProtoStuffSerializer.java → ...alization/proto/ProtoStuffSerializer.java
diff --git a/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer b/...ices/org.jupiter.serialization.Serializer → ...ices/org.jupiter.serialization.Serializer
diff --git a/...ation/proto/ProtoStuffSerializerTest.java → ...ation/proto/ProtoStuffSerializerTest.java b/...ation/proto/ProtoStuffSerializerTest.java → ...ation/proto/ProtoStuffSerializerTest.java
diff --git a/jupiter-serialization/pom.xml b/jupiter-serialization/pom.xml
@@ -21,16 +21,18 @@
     <parent>
         <artifactId>jupiter</artifactId>
         <groupId>org.jupiter</groupId>
-        <version>1.1.16</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jupiter-serialization</artifactId>
+    <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jupiter-common</artifactId>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>jupiter-serialization-api</module>
+        <module>jupiter-serialization-hessian</module>
+        <module>jupiter-serialization-java</module>
+        <module>jupiter-serialization-kryo</module>
+        <module>jupiter-serialization-protostuff</module>
+    </modules>
 </project>