define server manager module

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/Client.java → apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.client;
+package org.skywalking.apm.collector.client;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/ClientException.java → apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.client;
+package org.skywalking.apm.collector.client;
 
 import org.skywalking.apm.collector.core.CollectorException;
 

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java

@@ -38,8 +38,8 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.skywalking.apm.collector.core.component.client.Client;
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.Client;
+import org.skywalking.apm.collector.client.ClientException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.client.elasticsearch;
 
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java

@@ -20,8 +20,8 @@ package org.skywalking.apm.collector.client.grpc;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import org.skywalking.apm.collector.core.component.client.Client;
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.Client;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.client.grpc;
 
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java

@@ -25,7 +25,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import org.h2.util.IOUtils;
-import org.skywalking.apm.collector.core.component.client.Client;
+import org.skywalking.apm.collector.client.Client;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.client.h2;
 
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java

@@ -18,8 +18,8 @@
 
 package org.skywalking.apm.collector.client.redis;
 
-import org.skywalking.apm.collector.core.component.client.Client;
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.Client;
+import org.skywalking.apm.collector.client.ClientException;
 import redis.clients.jedis.Jedis;
 
 /**

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.client.redis;
 
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java

@@ -26,7 +26,7 @@ import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
-import org.skywalking.apm.collector.core.component.client.Client;
+import org.skywalking.apm.collector.client.Client;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.client.zookeeper;
 
-import org.skywalking.apm.collector.core.component.client.ClientException;
+import org.skywalking.apm.collector.client.ClientException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/Server.java → apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.server;
+package org.skywalking.apm.collector.server;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerException.java → apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.server;
+package org.skywalking.apm.collector.server;
 
 import org.skywalking.apm.collector.core.CollectorException;
 

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHandler.java → apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.server;
+package org.skywalking.apm.collector.server;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHolder.java → apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHolder.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.server;
+package org.skywalking.apm.collector.server;
 
 import java.util.LinkedList;
 import java.util.List;

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerModuleDefine.java → apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerModuleDefine.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.core.component.server;
+package org.skywalking.apm.collector.server;
 
 import org.skywalking.apm.collector.core.module.ModuleDefine;
 

apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java

@@ -21,9 +21,9 @@ package org.skywalking.apm.collector.server.grpc;
 import io.grpc.netty.NettyServerBuilder;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import org.skywalking.apm.collector.core.component.server.Server;
-import org.skywalking.apm.collector.core.component.server.ServerException;
-import org.skywalking.apm.collector.core.component.server.ServerHandler;
+import org.skywalking.apm.collector.server.Server;
+import org.skywalking.apm.collector.server.ServerException;
+import org.skywalking.apm.collector.server.ServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.server.grpc;
 
-import org.skywalking.apm.collector.core.component.server.ServerException;
+import org.skywalking.apm.collector.server.ServerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ 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 repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<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>apm-collector-server-manager</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-grpc-manager-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java

+/*
+ * Copyright 2017, OpenSkywalking Organization All rights reserved.
+ *
+ * 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 repository: https://github.com/OpenSkywalking/skywalking
+ */
+
+package org.skywalking.apm.collector.server.manager.grpc;
+
+import java.util.Properties;
+import org.skywalking.apm.collector.core.module.Module;
+import org.skywalking.apm.collector.core.module.ModuleProvider;
+import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+
+/**
+ * @author peng-yongsheng
+ */
+public class ServerManagerModuleGRPCProvider extends ModuleProvider {
+
+    @Override public String name() {
+        return null;
+    }
+
+    @Override public Class<? extends Module> module() {
+        return null;
+    }
+
+    @Override public void prepare(Properties config) throws ServiceNotProvidedException {
+
+    }
+
+    @Override public void init(Properties config) throws ServiceNotProvidedException {
+
+    }
+
+    @Override public String[] requiredModules() {
+        return new String[0];
+    }
+}

apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider

+#
+# Copyright 2017, OpenSkywalking Organization All rights reserved.
+#
+# 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 repository: https://github.com/OpenSkywalking/skywalking
+#
+
+org.skywalking.apm.collector.server.manager.grpc.ServerManagerModuleGRPCProvider
\ No newline at end of file

apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ 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 repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<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>apm-collector-server-manager</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-jetty-manager-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java

+/*
+ * Copyright 2017, OpenSkywalking Organization All rights reserved.
+ *
+ * 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 repository: https://github.com/OpenSkywalking/skywalking
+ */
+
+package org.skywalking.apm.collector.server.manager.jetty;
+
+import java.util.Properties;
+import org.skywalking.apm.collector.core.module.Module;
+import org.skywalking.apm.collector.core.module.ModuleProvider;
+import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+
+/**
+ * @author peng-yongsheng
+ */
+public class ServerManagerModuleJettyProvider extends ModuleProvider {
+
+    @Override public String name() {
+        return null;
+    }
+
+    @Override public Class<? extends Module> module() {
+        return null;
+    }
+
+    @Override public void prepare(Properties config) throws ServiceNotProvidedException {
+
+    }
+
+    @Override public void init(Properties config) throws ServiceNotProvidedException {
+
+    }
+
+    @Override public String[] requiredModules() {
+        return new String[0];
+    }
+}

apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider

+#
+# Copyright 2017, OpenSkywalking Organization All rights reserved.
+#
+# 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 repository: https://github.com/OpenSkywalking/skywalking
+#
+
+org.skywalking.apm.collector.server.manager.jetty.ServerManagerModuleJettyProvider
\ No newline at end of file

apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ 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 repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<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>apm-collector-server-manager</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-server-manager-define</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java

+/*
+ * Copyright 2017, OpenSkywalking Organization All rights reserved.
+ *
+ * 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 repository: https://github.com/OpenSkywalking/skywalking
+ */
+
+package org.skywalking.apm.collector.server.manager;
+
+import org.skywalking.apm.collector.core.module.Module;
+
+/**
+ * @author peng-yongsheng
+ */
+public class ServerManagerModule extends Module {
+
+    public static final String NAME = "Server_Manager";
+
+    @Override public String name() {
+        return NAME;
+    }
+
+    @Override public Class[] services() {
+        return new Class[0];
+    }
+}

apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module

+#
+# Copyright 2017, OpenSkywalking Organization All rights reserved.
+#
+# 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 repository: https://github.com/OpenSkywalking/skywalking
+#
+
+org.skywalking.apm.collector.server.manager.ServerManagerModule
\ No newline at end of file

apm-collector/apm-collector-server-manager/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ 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 repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<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>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-server-manager</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>collector-server-manager-define</module>
+        <module>collector-jetty-manager-provider</module>
+        <module>collector-grpc-manager-provider</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>apm-collector-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>server-component</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

apm-collector/pom.xml

@@ -40,6 +40,7 @@
         <module>apm-collector-cache</module>
         <module>apm-collector-storage</module>
         <module>apm-collector-naming</module>
+        <module>apm-collector-server-manager</module>
     </modules>
 
     <properties>