diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/Client.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java similarity index 93% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/Client.java rename to apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java index bc41093bc..f338b1869 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/Client.java +++ b/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 diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/ClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java similarity index 94% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/ClientException.java rename to apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java index 46efbd341..fc97f936e 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/client/ClientException.java +++ b/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; diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java index 48ecff2fa..fa5df5e9a 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java +++ b/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; diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java index 09a309db2..8988e1016 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java +++ b/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 diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java index bd57d4b24..f792c2ab9 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java +++ b/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 diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java index 3c6d8813c..701167cb5 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java +++ b/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 diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java index 4b1f2f23e..a6bef598e 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java +++ b/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; diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java index 7e29e6762..e50c2081d 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java +++ b/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 diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java index c72444c96..95508b667 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java +++ b/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; /** diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java index 4848ccae1..7d1cda277 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java +++ b/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 diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java index 3746641c3..2e247de42 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java +++ b/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; diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java index 248bafd83..3b450e02d 100644 --- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java +++ b/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 diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/Server.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java similarity index 94% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/Server.java rename to apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java index e177840b3..facf76e56 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/Server.java +++ b/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 diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java similarity index 94% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerException.java rename to apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java index 68ed3153b..cb88ebe99 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerException.java +++ b/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; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHandler.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java similarity index 92% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHandler.java rename to apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java index 917bc0199..0baaf38f2 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHandler.java +++ b/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 diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHolder.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHolder.java similarity index 97% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHolder.java rename to apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHolder.java index c630c34b9..a613a49ab 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerHolder.java +++ b/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; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerModuleDefine.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerModuleDefine.java similarity index 93% rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerModuleDefine.java rename to apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerModuleDefine.java index 6814568d3..84cf8b1f2 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/component/server/ServerModuleDefine.java +++ b/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; diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java index 8913e2556..b4c68fb7c 100644 --- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java +++ b/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; diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java index 98735c54b..fd1845de5 100644 --- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java +++ b/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 diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml new file mode 100644 index 000000000..e3c5a9d9d --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-server-manager + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-grpc-manager-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java new file mode 100644 index 000000000..6f04c14f6 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java @@ -0,0 +1,50 @@ +/* + * 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 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]; + } +} diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..71cd59a09 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider @@ -0,0 +1,19 @@ +# +# 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 diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml new file mode 100644 index 000000000..3737eff36 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-server-manager + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-jetty-manager-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java new file mode 100644 index 000000000..2fb9c3a87 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java @@ -0,0 +1,50 @@ +/* + * 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 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]; + } +} diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..c2db21739 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider @@ -0,0 +1,19 @@ +# +# 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 diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml b/apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml new file mode 100644 index 000000000..baa5ffe76 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-server-manager + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-server-manager-define + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java new file mode 100644 index 000000000..f5da9b121 --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java @@ -0,0 +1,37 @@ +/* + * 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]; + } +} diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module new file mode 100644 index 000000000..0519f8c4c --- /dev/null +++ b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module @@ -0,0 +1,19 @@ +# +# 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 diff --git a/apm-collector/apm-collector-server-manager/pom.xml b/apm-collector/apm-collector-server-manager/pom.xml new file mode 100644 index 000000000..ed1ff091a --- /dev/null +++ b/apm-collector/apm-collector-server-manager/pom.xml @@ -0,0 +1,50 @@ + + + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-server-manager + pom + + collector-server-manager-define + collector-jetty-manager-provider + collector-grpc-manager-provider + + + + + org.skywalking + apm-collector-core + ${project.version} + + + org.skywalking + server-component + ${project.version} + + + \ No newline at end of file diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index 36b573086..5cd494a62 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -40,6 +40,7 @@ apm-collector-cache apm-collector-storage apm-collector-naming + apm-collector-server-manager