diff --git a/apm-collector/apm-collector-agent/agent-jvm/pom.xml b/apm-collector/apm-collector-agent/agent-jvm/pom.xml deleted file mode 100644 index efdeb599a..000000000 --- a/apm-collector/apm-collector-agent/agent-jvm/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - apm-collector-agent - org.skywalking - 3.2.3-2017 - - 4.0.0 - - agent-jvm - jar - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-register/pom.xml b/apm-collector/apm-collector-agent/agent-register/pom.xml deleted file mode 100644 index 02757eb1d..000000000 --- a/apm-collector/apm-collector-agent/agent-register/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - apm-collector-agent - org.skywalking - 3.2.3-2017 - - 4.0.0 - - agent-register - jar - - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-tracing/pom.xml b/apm-collector/apm-collector-agent/agent-tracing/pom.xml deleted file mode 100644 index 74854e533..000000000 --- a/apm-collector/apm-collector-agent/agent-tracing/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - apm-collector-agent - org.skywalking - 3.2.3-2017 - - 4.0.0 - - agent-tracing - jar - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-define/pom.xml b/apm-collector/apm-collector-agent/collector-agent-define/pom.xml new file mode 100644 index 000000000..7dc8b36a9 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-define/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-agent-define + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-define/src/main/java/org/skywalking/apm/collector/agent/AgentModule.java b/apm-collector/apm-collector-agent/collector-agent-define/src/main/java/org/skywalking/apm/collector/agent/AgentModule.java new file mode 100644 index 000000000..202a5554b --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-define/src/main/java/org/skywalking/apm/collector/agent/AgentModule.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.agent; + +import org.skywalking.apm.collector.core.module.Module; + +/** + * @author peng-yongsheng + */ +public class AgentModule extends Module { + + public static final String NAME = "agent"; + + @Override public String name() { + return NAME; + } + + @Override public Class[] services() { + return new Class[0]; + } +} diff --git a/apm-collector/apm-collector-agent/collector-agent-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/collector-agent-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module new file mode 100644 index 000000000..53a054ae3 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-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.agent.AgentModule \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/pom.xml new file mode 100644 index 000000000..64ca7f9a5 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/pom.xml @@ -0,0 +1,40 @@ + + + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-agent-grpc-provider + jar + + + + org.skywalking + collector-agent-define + ${project.version} + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java new file mode 100644 index 000000000..33a06746e --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java @@ -0,0 +1,55 @@ +/* + * 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.agent.grpc; + +import java.util.Properties; +import org.skywalking.apm.collector.agent.AgentModule; +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 AgentModuleGRPCProvider extends ModuleProvider { + + @Override public String name() { + return "gRPC"; + } + + @Override public Class module() { + return AgentModule.class; + } + + @Override public void prepare(Properties config) throws ServiceNotProvidedException { + + } + + @Override public void start(Properties config) throws ServiceNotProvidedException { + + } + + @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { + + } + + @Override public String[] requiredModules() { + return new String[0]; + } +} diff --git a/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..45eb31cb2 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-grpc-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.agent.grpc.AgentModuleGRPCProvider \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/collector-agent-jetty-provider/pom.xml new file mode 100644 index 000000000..38e3ed262 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-jetty-provider/pom.xml @@ -0,0 +1,40 @@ + + + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-agent-jetty-provider + jar + + + + org.skywalking + collector-agent-define + ${project.version} + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java b/apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java new file mode 100644 index 000000000..023e268b7 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java @@ -0,0 +1,55 @@ +/* + * 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.agent.jetty; + +import java.util.Properties; +import org.skywalking.apm.collector.agent.AgentModule; +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 AgentModuleJettyProvider extends ModuleProvider { + + @Override public String name() { + return "jetty"; + } + + @Override public Class module() { + return AgentModule.class; + } + + @Override public void prepare(Properties config) throws ServiceNotProvidedException { + + } + + @Override public void start(Properties config) throws ServiceNotProvidedException { + + } + + @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { + + } + + @Override public String[] requiredModules() { + return new String[0]; + } +} diff --git a/apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..dead2c5cf --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-jetty-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.agent.jetty.AgentModuleJettyProvider \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml new file mode 100644 index 000000000..c25629046 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-agent-stream + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/pom.xml b/apm-collector/apm-collector-agent/pom.xml index ea92cd8bf..fa334830f 100644 --- a/apm-collector/apm-collector-agent/pom.xml +++ b/apm-collector/apm-collector-agent/pom.xml @@ -12,8 +12,17 @@ apm-collector-agent pom - agent-jvm - agent-register - agent-tracing + collector-agent-define + collector-agent-jetty-provider + collector-agent-grpc-provider + collector-agent-stream + + + + org.skywalking + apm-collector-core + ${project.version} + + \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 203f41651..cb65456be 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -79,12 +79,24 @@ ${project.version} - + + + org.skywalking + collector-agent-grpc-provider + ${project.version} + + + org.skywalking + collector-agent-jetty-provider + ${project.version} + + + org.skywalking collector-ui-jetty-provider ${project.version} - + \ No newline at end of file