You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2023/03/07 02:51:40 UTC
[incubator-eventmesh] branch revert-3354-eventmesh-3353 created (now df11c3fab)
This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a change to branch revert-3354-eventmesh-3353
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
at df11c3fab Revert "[ISSUE #3353]Tidy up the eventmesh-storage module"
This branch includes the following new commits:
new df11c3fab Revert "[ISSUE #3353]Tidy up the eventmesh-storage module"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org
[incubator-eventmesh] 01/01: Revert "[ISSUE #3353]Tidy up the eventmesh-storage module"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch revert-3354-eventmesh-3353
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
commit df11c3fabd66bb14defae62bc41727d49d3841ac
Author: mike_xwm <mi...@126.com>
AuthorDate: Tue Mar 7 10:51:35 2023 +0800
Revert "[ISSUE #3353]Tidy up the eventmesh-storage module"
---
build.gradle | 4 +-
docs/en/design-document/08-spi.md | 8 +--
docs/zh/design-document/08-spi.md | 10 +--
.../eventmesh-admin-rocketmq/build.gradle | 4 +-
.../common/config/CommonConfiguration.java | 3 -
.../common/config/CommonConfigurationTest.java | 1 -
.../src/test/resources/configuration.properties | 1 -
eventmesh-connectors/{README.md => README} | 0
eventmesh-examples/build.gradle | 2 +-
eventmesh-runtime/build.gradle | 4 +-
eventmesh-runtime/conf/eventmesh.properties | 5 +-
.../admin/controller/ClientManageController.java | 4 +-
.../eventmesh/runtime/boot/EventMeshServer.java | 10 +--
.../runtime/connector/ConnectorResource.java | 14 ++--
.../runtime/core/plugin/MQAdminWrapper.java | 4 +-
.../runtime/core/plugin/MQConsumerWrapper.java | 4 +-
.../runtime/core/plugin/MQProducerWrapper.java | 4 +-
.../protocol/grpc/consumer/EventMeshConsumer.java | 4 +-
.../protocol/grpc/producer/EventMeshProducer.java | 3 +-
.../protocol/http/consumer/EventMeshConsumer.java | 6 +-
.../protocol/http/producer/EventMeshProducer.java | 2 +-
.../tcp/client/group/ClientGroupWrapper.java | 9 ++-
.../eventmesh/runtime/storage/StorageResource.java | 78 ---------------------
.../controller/ClientManageControllerTest.java | 1 -
.../runtime/boot/EventMeshServerTest.java | 1 -
.../EventMeshGrpcConfigurationTest.java | 3 +-
.../EventMeshHTTPConfigurationTest.java | 3 +-
.../EventMeshTCPConfigurationTest.java | 4 +-
.../eventmesh/runtime/util/EventMeshUtilTest.java | 2 +-
.../src/test/resources/configuration.properties | 1 -
eventmesh-starter/build.gradle | 4 +-
.../build.gradle | 0
.../gradle.properties | 0
.../org/apache/eventmesh/api/AbstractContext.java | 0
.../apache/eventmesh/api/AsyncConsumeContext.java | 0
.../org/apache/eventmesh/api/EventListener.java | 0
.../org/apache/eventmesh/api/EventMeshAction.java | 0
.../api/EventMeshAsyncConsumeContext.java | 0
.../java/org/apache/eventmesh/api/LifeCycle.java | 0
.../apache/eventmesh/api/RequestReplyCallback.java | 0
.../org/apache/eventmesh/api/SendCallback.java | 0
.../java/org/apache/eventmesh/api/SendResult.java | 0
.../java/org/apache/eventmesh/api/admin/Admin.java | 0
.../eventmesh/api/admin/TopicProperties.java | 0
.../api/connector/ConnectorResourceService.java} | 4 +-
.../apache/eventmesh/api/consumer/Consumer.java | 0
.../api/exception/ConnectorRuntimeException.java | 0
.../api/exception/OnExceptionContext.java | 0
.../api/factory/ConnectorPluginFactory.java} | 4 +-
.../apache/eventmesh/api/producer/Producer.java | 0
.../build.gradle | 4 +-
.../gradle.properties | 0
.../connector}/kafka/common/Constants.java | 2 +-
.../kafka/common/EventMeshConstants.java | 2 +-
.../kafka/config/ClientConfiguration.java | 2 +-
.../ConnectorResourceServiceKafkaImpl.java} | 6 +-
.../connector}/kafka/consumer/ConsumerImpl.java | 4 +-
.../kafka/consumer/KafkaConsumerImpl.java | 4 +-
.../kafka/consumer/KafkaConsumerRunner.java | 4 +-
.../kafka/producer/KafkaProducerImpl.java | 4 +-
.../connector}/kafka/producer/ProducerImpl.java | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/kafka-client.properties | 0
.../kafka/config/ClientConfigurationTest.java | 12 ++--
.../org.apache.io.openmessaging.producer.Producer | 2 +-
.../src/test/resources/kafka-client.properties | 0
.../build.gradle | 4 +-
.../gradle.properties | 0
.../knative/cloudevent/KnativeMessageFactory.java | 4 +-
.../impl/KnativeBinaryMessageReader.java | 2 +-
.../knative/cloudevent/impl/KnativeHeaders.java | 2 +-
.../cloudevent/impl/KnativeMessageWriter.java | 2 +-
.../knative/config/ClientConfiguration.java | 2 +-
.../ConnectorResourceServiceKnativeImpl.java} | 6 +-
.../knative/consumer/DefaultConsumer.java | 4 +-
.../knative/consumer/KnativeConsumerImpl.java | 4 +-
.../knative/consumer/PullConsumerImpl.java | 10 +--
.../connector}/knative/domain/NonStandardKeys.java | 4 +-
.../patch/EventMeshConsumeConcurrentlyContext.java | 2 +-
.../patch/EventMeshConsumeConcurrentlyStatus.java | 2 +-
.../EventMeshMessageListenerConcurrently.java | 2 +-
.../knative/producer/AbstractProducer.java | 2 +-
.../knative/producer/KnativeProducerImpl.java | 4 +-
.../connector}/knative/producer/ProducerImpl.java | 8 +--
.../connector}/knative/utils/CloudEventUtils.java | 4 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/knative-client.properties | 0
.../knative/config/ClientConfigurationTest.java | 12 ++--
.../knative/consumer/KnativeConsumerImplTest.java | 6 +-
.../knative/producer/KnativeProducerImplTest.java | 10 +--
.../src/test/resources/knative-client.properties | 0
.../README.md | 0
.../build.gradle | 2 +-
.../gradle.properties | 0
.../pravega-connector.jpg | Bin
.../PravegaConnectorResourceServiceImpl.java} | 8 +--
.../connector}/pravega/PravegaConsumerImpl.java | 8 +--
.../connector}/pravega/PravegaProducerImpl.java | 8 +--
.../connector}/pravega/client/PravegaClient.java | 6 +-
.../pravega/client/PravegaCloudEventWriter.java | 2 +-
.../connector}/pravega/client/PravegaEvent.java | 4 +-
.../connector}/pravega/client/SubscribeTask.java | 2 +-
.../pravega/config/PravegaConnectorConfig.java | 2 +-
.../exception/PravegaConnectorException.java | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../main/resources/pravega-connector.properties | 0
.../pravega/client/PravegaClientTest.java | 4 +-
.../pravega/config/PravegaConnectorConfigTest.java | 12 ++--
.../test/resources/pravega-connector.properties | 0
.../build.gradle | 4 +-
.../gradle.properties | 0
.../pulsar/client/PulsarClientWrapper.java | 6 +-
.../pulsar/config/ClientConfiguration.java | 4 +-
.../ConnectorResourceServicePulsarImpl.java} | 6 +-
.../pulsar/consumer/PulsarConsumerImpl.java | 4 +-
.../pulsar/producer/AbstractProducer.java | 2 +-
.../connector}/pulsar/producer/ProducerImpl.java | 8 +--
.../pulsar/producer/PulsarProducerImpl.java | 4 +-
.../connector}/pulsar/utils/CloudEventUtils.java | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/pulsar-client.properties | 0
.../pulsar/config/ClientConfigurationTest.java | 12 ++--
.../src/test/resources/pulsar-client.properties | 0
.../build.gradle | 4 +-
.../gradle.properties | 0
.../connector}/rabbitmq/client/RabbitmqClient.java | 2 +-
.../rabbitmq/client/RabbitmqConnectionFactory.java | 2 +-
.../rabbitmq/cloudevent/RabbitmqCloudEvent.java | 6 +-
.../cloudevent/RabbitmqCloudEventWriter.java | 2 +-
.../rabbitmq/config/ConfigurationHolder.java | 2 +-
.../RabbitmqConnectorResourceService.java} | 6 +-
.../rabbitmq/consumer/RabbitmqConsumer.java | 8 +--
.../rabbitmq/consumer/RabbitmqConsumerHandler.java | 6 +-
.../exception/RabbitmqaConnectorException.java | 2 +-
.../rabbitmq/producer/RabbitmqProducer.java | 14 ++--
.../connector}/rabbitmq/utils/ByteArrayUtils.java | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/rabbitmq-client.properties | 0
.../rabbitmq/RabbitmqMockConnectionFactory.java | 4 +-
.../connector}/rabbitmq/RabbitmqServer.java | 12 ++--
.../cloudevent/RabbitmqCloudEventTest.java | 2 +-
.../rabbitmq/config/ConfigurationHolderTest.java | 12 ++--
.../rabbitmq/consumer/RabbitmqConsumerTest.java | 4 +-
.../rabbitmq/producer/RabbitmqProducerTest.java | 4 +-
.../src/test/resources/rabbitmq-client.properties | 0
.../build.gradle | 2 +-
.../gradle.properties | 0
.../connector}/redis/client/RedissonClient.java | 6 +-
.../redis/cloudevent/CloudEventCodec.java | 2 +-
.../connector}/redis/config/RedisProperties.java | 2 +-
.../connector/RedisConnectorResourceService.java} | 6 +-
.../connector}/redis/consumer/RedisConsumer.java | 4 +-
.../connector}/redis/producer/RedisProducer.java | 4 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/redis-client.properties | 0
.../connector}/redis/AbstractRedisServer.java | 2 +-
.../redis/client/RedissonClientTest.java | 6 +-
.../redis/config/RedisPropertiesTest.java | 4 +-
.../connector/redis/connector}/UnitTest.java | 10 +--
.../redis/consumer/RedisConsumerTest.java | 6 +-
.../redis/producer/RedisProducerTest.java | 4 +-
.../src/test/resources/redis-client.properties | 0
.../build.gradle | 4 +-
.../gradle.properties | 0
.../connector}/rocketmq/admin/RocketMQAdmin.java | 4 +-
.../rocketmq/admin/RocketMQAdminAdaptor.java | 2 +-
.../connector}/rocketmq/admin/command/Command.java | 4 +-
.../cloudevent/RocketMQMessageFactory.java | 8 +--
.../impl/RocketMQBinaryMessageReader.java | 2 +-
.../rocketmq/cloudevent/impl/RocketMQHeaders.java | 2 +-
.../cloudevent/impl/RocketMQMessageWriter.java | 2 +-
.../rocketmq/common/EventMeshConstants.java | 2 +-
.../connector}/rocketmq/config/ClientConfig.java | 4 +-
.../rocketmq/config/ClientConfiguration.java | 2 +-
.../ConnectorResourceServiceRocketmqImpl.java} | 6 +-
.../rocketmq/consumer/PushConsumerImpl.java | 22 +++---
.../rocketmq/consumer/RocketMQConsumerImpl.java | 4 +-
.../rocketmq/domain/NonStandardKeys.java | 2 +-
.../exception/RMQMessageFormatException.java | 2 +-
.../rocketmq/exception/RMQTimeoutException.java | 2 +-
.../patch/EventMeshConsumeConcurrentlyContext.java | 2 +-
.../patch/EventMeshConsumeConcurrentlyStatus.java | 2 +-
.../EventMeshMessageListenerConcurrently.java | 2 +-
.../rocketmq/producer/AbstractProducer.java | 12 ++--
.../connector}/rocketmq/producer/ProducerImpl.java | 6 +-
.../rocketmq/producer/RocketMQProducerImpl.java | 6 +-
.../connector}/rocketmq/utils/BeanUtils.java | 2 +-
.../connector}/rocketmq/utils/CloudEventUtils.java | 2 +-
.../connector}/rocketmq/utils/OMSUtil.java | 2 +-
.../ConsumeMessageConcurrentlyService.java | 2 +-
.../eventmesh/org.apache.eventmesh.api.admin.Admin | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../src/main/resources/rocketmq-client.properties | 0
.../rocketmq/config/ClientConfigurationTest.java | 12 ++--
.../producer/DefaultProducerImplTest.java | 0
.../rocketmq/consumer/PushConsumerImplTest.java | 4 +-
.../apache/rocketmq/producer/ProducerImplTest.java | 4 +-
.../rocketmq/promise/DefaultPromiseTest.java | 0
.../org/apache/rocketmq/utils/BeanUtilsTest.java | 6 +-
.../org.apache.io.openmessaging.producer.Producer | 2 +-
.../src/test/resources/rocketmq-client.properties | 0
.../build.gradle | 2 +-
.../gradle.properties | 0
.../standalone/admin/StandaloneAdmin.java | 8 +--
.../standalone/admin/StandaloneAdminAdaptor.java | 2 +-
.../connector}/standalone/broker/MessageQueue.java | 4 +-
.../standalone/broker/StandaloneBroker.java | 8 +--
.../standalone/broker/model/MessageEntity.java | 2 +-
.../standalone/broker/model/TopicMetadata.java | 2 +-
.../broker/task/HistoryMessageClearTask.java | 8 +--
.../standalone/broker/task/SubScribeTask.java | 4 +-
.../standalone/consumer/StandaloneConsumer.java | 8 +--
.../consumer/StandaloneConsumerAdaptor.java | 2 +-
.../standalone/producer/StandaloneProducer.java | 6 +-
.../producer/StandaloneProducerAdaptor.java | 2 +-
.../StandaloneConnectorResourceService.java} | 6 +-
.../eventmesh/org.apache.eventmesh.api.admin.Admin | 2 +-
...entmesh.api.connector.ConnectorResourceService} | 2 +-
.../org.apache.eventmesh.api.consumer.Consumer | 2 +-
.../org.apache.eventmesh.api.producer.Producer | 2 +-
.../standalone/broker/StandaloneBrokerTest.java | 6 +-
...he.eventmesh.api.storage.StorageResourceService | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
.../org.apache.eventmesh.api.consumer.Consumer | 16 -----
.../org.apache.eventmesh.api.producer.Producer | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
.../org.apache.eventmesh.api.consumer.Consumer | 16 -----
.../org.apache.eventmesh.api.producer.Producer | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
.../resource/StandaloneStorageResourceService.java | 33 ---------
.../org.apache.eventmesh.api.consumer.Consumer | 16 -----
.../org.apache.eventmesh.api.producer.Producer | 16 -----
...he.eventmesh.api.storage.StorageResourceService | 16 -----
.../eventmesh-webhook-receive/build.gradle | 2 +-
.../webhook/receive/WebHookMQProducer.java | 4 +-
settings.gradle | 20 +++---
252 files changed, 410 insertions(+), 738 deletions(-)
diff --git a/build.gradle b/build.gradle
index d73111db9..bc2503977 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,7 +267,7 @@ subprojects {
Set<String> rootProject = ["eventmesh-admin",
"eventmesh-admin-rocketmq",
"eventmesh-common",
- "eventmesh-storage-api",
+ "eventmesh-connector-api",
"eventmesh-metrics-api",
"eventmesh-registry-api",
"eventmesh-trace-api",
@@ -509,7 +509,7 @@ subprojects {
dependency 'org.apache.curator:curator-framework:4.0.1'
dependency 'org.apache.curator:curator-recipes:4.0.1'
dependency 'org.apache.curator:curator-test:2.12.0'
-
+
dependency "org.projectlombok:lombok:1.18.22"
dependency "com.github.seancfoley:ipaddress:5.3.3"
dependency "javax.annotation:javax.annotation-api:1.3.2"
diff --git a/docs/en/design-document/08-spi.md b/docs/en/design-document/08-spi.md
index 9815e109c..94da666e7 100644
--- a/docs/en/design-document/08-spi.md
+++ b/docs/en/design-document/08-spi.md
@@ -81,7 +81,7 @@ In the future, we might support the implementation to load from the maven reposi
The following is an example of how to use the SPI to declare a plugin.
-First, we create an eventmesh-storage-api module, and define the extension interface MeshMQProducer, and we use @EventMeshSPI on the MeshMQProducer,
+First, we create an eventmesh-connector-api module, and define the extension interface MeshMQProducer, and we use @EventMeshSPI on the MeshMQProducer,
which indicates the MeshMQProducer is an SPI interface.
```java
@@ -91,7 +91,7 @@ public interface MeshMQProducer extends Producer {
}
```
-Then we create an eventmesh-storage-rocketmq module, which contains the concrete implementation named RocketMQProducerImpl.
+Then we create an eventmesh-connector-rocketmq module, which contains the concrete implementation named RocketMQProducerImpl.
```java
public class RocketMQProducerImpl implements MeshMQProducer {
@@ -100,14 +100,14 @@ public class RocketMQProducerImpl implements MeshMQProducer {
```
At the same time, we need to create a file with the full qualified name of the SPI interface under the resource/META-INF/eventmesh directory
-in the eventmesh-storage-rocketmq module.
+in the eventmesh-connector-rocketmq module.
org.apache.eventmesh.api.producer.Producer
The content of the file is the extension instance name and the corresponding instance full class name
```properties
-rocketmq=org.apache.eventmesh.storage.rocketmq.producer.RocketMQProducerImpl
+rocketmq=org.apache.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl
```
At this point, an SPI expansion module is complete. We can use `EventMeshExtensionFactory.getExtension(MeshMQProducer.class, "rocketmq")` to get the `RocketMQProducerImpl` instance.
diff --git a/docs/zh/design-document/08-spi.md b/docs/zh/design-document/08-spi.md
index fe608b2e3..5fb301f40 100644
--- a/docs/zh/design-document/08-spi.md
+++ b/docs/zh/design-document/08-spi.md
@@ -80,9 +80,9 @@ MetaInfExtensionClassLoader用于从classPath直接加载实现类，JarExtensio
## SPI使用示例
-下面以eventmesh-storage为例，介绍SPI具体的使用过程。
+下面以eventmesh-connector-plugin为例，介绍SPI具体的使用过程。
-首先定义一个eventmesh-storage-api模块，并且定义扩展接口MeshMQProducer。在MeshMQProducer接口上使用@EventMeshSPI注解进行声明，表明该接口是一个SPI扩展接口
+首先定义一个eventmesh-connector-api模块，并且定义扩展接口MeshMQProducer。在MeshMQProducer接口上使用@EventMeshSPI注解进行声明，表明该接口是一个SPI扩展接口
```java
@EventMeshSPI(isSingleton = false)
@@ -91,7 +91,7 @@ public interface MeshMQProducer extends Producer {
}
```
-eventmesh-storage-rocketmq模块中包含采用rocketmq的具体实现方式RocketMQProducerImpl。
+eventmesh-connector-rocketmq模块中包含采用rocketmq的具体实现方式RocketMQProducerImpl。
```java
public class RocketMQProducerImpl implements MeshMQProducer {
@@ -99,13 +99,13 @@ public class RocketMQProducerImpl implements MeshMQProducer {
}
```
-同时，还需要在eventmesh-storage-rocketmq模块中resource/META-INF/eventmesh目录下创建文件名为SPI接口全限定名的文件
+同时，还需要在eventmesh-connector-rocketmq模块中resource/META-INF/eventmesh目录下创建文件名为SPI接口全限定名的文件
org.apache.eventmesh.api.producer.Producer
文件内容为扩展实例名和对应的实例全类名
```properties
-rocketmq=org.apache.eventmesh.storage.rocketmq.producer.RocketMQProducerImpl
+rocketmq=org.apache.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl
```
至此，一个SPI扩展模块就完成了。在使用的时候只需要通过EventMeshExtensionFactory.getExtension(MeshMQProducer.class, “rocketmq”)就可以获取RocketMQProducerImpl实现类。
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle b/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
index 1ebd03000..4819d15ca 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
@@ -24,10 +24,10 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-core"
implementation "com.fasterxml.jackson.core:jackson-annotations"
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
}
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
index 066c9853b..8e2de91f5 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
@@ -72,9 +72,6 @@ public class CommonConfiguration {
@ConfigFiled(field = "connector.plugin.type", notEmpty = true)
private String eventMeshConnectorPluginType = "rocketmq";
- @ConfigFiled(field = "storage.plugin.type", notEmpty = true)
- private String eventMeshStoragePluginType = "rocketmq";
-
@ConfigFiled(field = "registry.plugin.username")
private String eventMeshRegistryPluginUsername = "";
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java
index b0468b4cc..755ac1d5e 100644
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java
@@ -46,7 +46,6 @@ public class CommonConfigurationTest {
Assert.assertEquals("name-succeed!!!", config.getEventMeshName());
Assert.assertEquals("816", config.getSysID());
Assert.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
Assert.assertEquals("registry-succeed!!!", config.getEventMeshRegistryPluginType());
Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
diff --git a/eventmesh-common/src/test/resources/configuration.properties b/eventmesh-common/src/test/resources/configuration.properties
index 74b5cc025..47bbb1c36 100644
--- a/eventmesh-common/src/test/resources/configuration.properties
+++ b/eventmesh-common/src/test/resources/configuration.properties
@@ -21,7 +21,6 @@ eventMesh.server.cluster=cluster-succeed!!!
eventMesh.server.name=name-succeed!!!
eventMesh.server.hostIp=hostIp-succeed!!!
eventMesh.connector.plugin.type=connector-succeed!!!
-eventMesh.storage.plugin.type=storage-succeed!!!
eventMesh.security.plugin.type=security-succeed!!!
eventMesh.registry.plugin.type=registry-succeed!!!
eventMesh.trace.plugin=trace-succeed!!!
diff --git a/eventmesh-connectors/README.md b/eventmesh-connectors/README
similarity index 100%
rename from eventmesh-connectors/README.md
rename to eventmesh-connectors/README
diff --git a/eventmesh-examples/build.gradle b/eventmesh-examples/build.gradle
index ca6a902f6..5afca4f39 100644
--- a/eventmesh-examples/build.gradle
+++ b/eventmesh-examples/build.gradle
@@ -24,7 +24,7 @@ configurations {
dependencies {
implementation project(":eventmesh-sdk-java")
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'io.netty:netty-all'
implementation "io.cloudevents:cloudevents-core"
diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle
index 8a9a10584..684102e60 100644
--- a/eventmesh-runtime/build.gradle
+++ b/eventmesh-runtime/build.gradle
@@ -37,8 +37,8 @@ dependencies {
implementation project(":eventmesh-common")
implementation project(":eventmesh-spi")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
- implementation project(":eventmesh-storage:eventmesh-storage-standalone")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-standalone")
implementation project(":eventmesh-security-plugin:eventmesh-security-api")
implementation project(":eventmesh-security-plugin:eventmesh-security-acl")
implementation project(":eventmesh-security-plugin:eventmesh-security-auth-http-basic")
diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
index d02434634..17bfab067 100644
--- a/eventmesh-runtime/conf/eventmesh.properties
+++ b/eventmesh-runtime/conf/eventmesh.properties
@@ -72,10 +72,7 @@ eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255
eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
#connector plugin
-#eventMesh.connector.plugin.type=standalone
-
-#storage plugin
-eventMesh.storage.plugin.type=standalone
+eventMesh.connector.plugin.type=standalone
#security plugin
eventMesh.server.security.enabled=false
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
index 1614fddfa..737a00405 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/ClientManageController.java
@@ -126,8 +126,8 @@ public class ClientManageController {
eventMeshHTTPServer.getEventMeshHttpConfiguration(),
eventMeshGrpcServer.getEventMeshGrpcConfiguration(), httpHandlerManager);
new MetricsHandler(eventMeshHTTPServer, eventMeshTCPServer, httpHandlerManager);
- new TopicHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType(), httpHandlerManager);
- new EventHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType(), httpHandlerManager);
+ new TopicHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType(), httpHandlerManager);
+ new EventHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType(), httpHandlerManager);
new RegistryHandler(eventMeshRegistry, httpHandlerManager);
if (Objects.nonNull(adminWebHookConfigOperationManage.getWebHookConfigOperation())) {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
index a2a142e42..b9e885106 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
@@ -24,9 +24,9 @@ import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.runtime.acl.Acl;
import org.apache.eventmesh.runtime.admin.controller.ClientManageController;
import org.apache.eventmesh.runtime.common.ServiceState;
+import org.apache.eventmesh.runtime.connector.ConnectorResource;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.registry.Registry;
-import org.apache.eventmesh.runtime.storage.StorageResource;
import org.apache.eventmesh.runtime.trace.Trace;
import java.util.List;
@@ -45,7 +45,7 @@ public class EventMeshServer {
private static Trace trace;
- private final StorageResource storageResource;
+ private final ConnectorResource connectorResource;
private ServiceState serviceState;
@@ -66,7 +66,7 @@ public class EventMeshServer {
this.registry = Registry.getInstance(this.configuration.getEventMeshRegistryPluginType());
trace = Trace.getInstance(this.configuration.getEventMeshTracePluginType(), this.configuration.isEventMeshServerTraceEnable());
- this.storageResource = StorageResource.getInstance(this.configuration.getEventMeshStoragePluginType());
+ this.connectorResource = ConnectorResource.getInstance(this.configuration.getEventMeshConnectorPluginType());
final List<String> provideServerProtocols = configuration.getEventMeshProvideServerProtocols();
for (final String provideServerProtocol : provideServerProtocols) {
@@ -83,7 +83,7 @@ public class EventMeshServer {
}
public void init() throws Exception {
- storageResource.init();
+ connectorResource.init();
if (configuration.isEventMeshServerSecurityEnable()) {
acl.init();
}
@@ -173,7 +173,7 @@ public class EventMeshServer {
registry.shutdown();
}
- storageResource.release();
+ connectorResource.release();
if (configuration != null && configuration.isEventMeshServerSecurityEnable()) {
acl.shutdown();
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
index 1b20ed688..21ce82ccb 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorResource.java
@@ -17,7 +17,7 @@
package org.apache.eventmesh.runtime.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
import org.apache.eventmesh.spi.EventMeshExtensionFactory;
@@ -33,7 +33,7 @@ public class ConnectorResource {
private static final Map<String, ConnectorResource> CONNECTOR_RESOURCE_CACHE = new HashMap<>(16);
- private StorageResourceService storageResourceService;
+ private ConnectorResourceService connectorResourceService;
private final AtomicBoolean inited = new AtomicBoolean(false);
@@ -51,15 +51,15 @@ public class ConnectorResource {
}
private static ConnectorResource connectorResourceBuilder(String connectorResourcePluginType) {
- StorageResourceService storageResourceServiceExt = EventMeshExtensionFactory.getExtension(StorageResourceService.class,
+ ConnectorResourceService connectorResourceServiceExt = EventMeshExtensionFactory.getExtension(ConnectorResourceService.class,
connectorResourcePluginType);
- if (storageResourceServiceExt == null) {
+ if (connectorResourceServiceExt == null) {
String errorMsg = "can't load the connectorResourceService plugin, please check.";
log.error(errorMsg);
throw new RuntimeException(errorMsg);
}
ConnectorResource connectorResource = new ConnectorResource();
- connectorResource.storageResourceService = storageResourceServiceExt;
+ connectorResource.connectorResourceService = connectorResourceServiceExt;
return connectorResource;
}
@@ -67,7 +67,7 @@ public class ConnectorResource {
if (!inited.compareAndSet(false, true)) {
return;
}
- storageResourceService.init();
+ connectorResourceService.init();
}
public void release() throws Exception {
@@ -75,6 +75,6 @@ public class ConnectorResource {
return;
}
inited.compareAndSet(true, false);
- storageResourceService.release();
+ connectorResourceService.release();
}
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
index 059204681..1d7a1459b 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQAdminWrapper.java
@@ -21,7 +21,7 @@ package org.apache.eventmesh.runtime.core.plugin;
import org.apache.eventmesh.api.admin.Admin;
import org.apache.eventmesh.api.admin.TopicProperties;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import java.util.List;
import java.util.Properties;
@@ -37,7 +37,7 @@ public class MQAdminWrapper extends MQWrapper {
protected Admin meshMQAdmin;
public MQAdminWrapper(String connectorPluginType) {
- this.meshMQAdmin = StoragePluginFactory.getMeshMQAdmin(connectorPluginType);
+ this.meshMQAdmin = ConnectorPluginFactory.getMeshMQAdmin(connectorPluginType);
if (meshMQAdmin == null) {
log.error("can't load the meshMQAdmin plugin, please check.");
throw new RuntimeException("doesn't load the meshMQAdmin plugin, please check.");
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
index 362c47776..27bb56bd7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQConsumerWrapper.java
@@ -20,7 +20,7 @@ package org.apache.eventmesh.runtime.core.plugin;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import java.util.List;
import java.util.Properties;
@@ -36,7 +36,7 @@ public class MQConsumerWrapper extends MQWrapper {
protected Consumer meshMQPushConsumer;
public MQConsumerWrapper(String connectorPluginType) {
- this.meshMQPushConsumer = StoragePluginFactory.getMeshMQPushConsumer(connectorPluginType);
+ this.meshMQPushConsumer = ConnectorPluginFactory.getMeshMQPushConsumer(connectorPluginType);
if (meshMQPushConsumer == null) {
log.error("can't load the meshMQPushConsumer plugin, please check.");
throw new RuntimeException("doesn't load the meshMQPushConsumer plugin, please check.");
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
index ad8c31197..210af96ec 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java
@@ -19,7 +19,7 @@ package org.apache.eventmesh.runtime.core.plugin;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import org.apache.eventmesh.api.producer.Producer;
import java.util.Properties;
@@ -35,7 +35,7 @@ public class MQProducerWrapper extends MQWrapper {
protected Producer meshMQProducer;
public MQProducerWrapper(String connectorPluginType) {
- this.meshMQProducer = StoragePluginFactory.getMeshMQProducer(connectorPluginType);
+ this.meshMQProducer = ConnectorPluginFactory.getMeshMQProducer(connectorPluginType);
if (meshMQProducer == null) {
log.error("can't load the meshMQProducer plugin, please check.");
throw new RuntimeException("doesn't load the meshMQProducer plugin, please check.");
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/EventMeshConsumer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/EventMeshConsumer.java
index f5e7b0037..1a1f81e7e 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/EventMeshConsumer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/consumer/EventMeshConsumer.java
@@ -88,8 +88,8 @@ public class EventMeshConsumer {
this.eventMeshGrpcConfiguration = eventMeshGrpcServer.getEventMeshGrpcConfiguration();
this.consumerGroup = consumerGroup;
this.messageHandler = new MessageHandler(consumerGroup, eventMeshGrpcServer.getPushMsgExecutor());
- this.persistentMqConsumer = new MQConsumerWrapper(eventMeshGrpcConfiguration.getEventMeshStoragePluginType());
- this.broadcastMqConsumer = new MQConsumerWrapper(eventMeshGrpcConfiguration.getEventMeshStoragePluginType());
+ this.persistentMqConsumer = new MQConsumerWrapper(eventMeshGrpcConfiguration.getEventMeshConnectorPluginType());
+ this.broadcastMqConsumer = new MQConsumerWrapper(eventMeshGrpcConfiguration.getEventMeshConnectorPluginType());
}
/**
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
index 3d980568a..12bc3844d 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/producer/EventMeshProducer.java
@@ -64,7 +64,8 @@ public class EventMeshProducer {
//TODO for defibus
keyValue.put(EventMeshConstants.EVENT_MESH_IDC, eventMeshGrpcConfiguration.getEventMeshIDC());
- mqProducerWrapper = new MQProducerWrapper(eventMeshGrpcConfiguration.getEventMeshStoragePluginType());
+ mqProducerWrapper = new MQProducerWrapper(
+ eventMeshGrpcConfiguration.getEventMeshConnectorPluginType());
mqProducerWrapper.init(keyValue);
serviceState = ServiceState.INITED;
log.info("EventMeshProducer [{}] inited...........", producerGroupConfig.getGroupName());
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
index cb81a1d89..ec6a61384 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/EventMeshConsumer.java
@@ -86,8 +86,10 @@ public class EventMeshConsumer {
public EventMeshConsumer(EventMeshHTTPServer eventMeshHTTPServer, ConsumerGroupConf consumerGroupConf) {
this.eventMeshHTTPServer = eventMeshHTTPServer;
this.consumerGroupConf = consumerGroupConf;
- this.persistentMqConsumer = new MQConsumerWrapper(eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshStoragePluginType());
- this.broadcastMqConsumer = new MQConsumerWrapper(eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshStoragePluginType());
+ this.persistentMqConsumer = new MQConsumerWrapper(
+ eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshConnectorPluginType());
+ this.broadcastMqConsumer = new MQConsumerWrapper(
+ eventMeshHTTPServer.getEventMeshHttpConfiguration().getEventMeshConnectorPluginType());
}
private MessageHandler httpMessageHandler;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
index 268ff4565..6dfc4cdbe 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/EventMeshProducer.java
@@ -84,7 +84,7 @@ public class EventMeshProducer {
//TODO for defibus
keyValue.put("eventMeshIDC", eventMeshHttpConfiguration.getEventMeshIDC());
- mqProducerWrapper = new MQProducerWrapper(eventMeshHttpConfiguration.getEventMeshStoragePluginType());
+ mqProducerWrapper = new MQProducerWrapper(eventMeshHttpConfiguration.getEventMeshConnectorPluginType());
mqProducerWrapper.init(keyValue);
log.info("EventMeshProducer [{}] inited.............", producerGroupConfig.getGroupName());
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
index 0860ba9c7..b7c511352 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientGroupWrapper.java
@@ -124,9 +124,12 @@ public class ClientGroupWrapper {
this.eventMeshTcpMonitor =
Preconditions.checkNotNull(eventMeshTCPServer.getEventMeshTcpMonitor());
this.downstreamDispatchStrategy = downstreamDispatchStrategy;
- this.persistentMsgConsumer = new MQConsumerWrapper(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType());
- this.broadCastMsgConsumer = new MQConsumerWrapper(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType());
- this.mqProducerWrapper = new MQProducerWrapper(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType());
+ this.persistentMsgConsumer = new MQConsumerWrapper(
+ eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType());
+ this.broadCastMsgConsumer = new MQConsumerWrapper(
+ eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType());
+ this.mqProducerWrapper = new MQProducerWrapper(
+ eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType());
}
public ConcurrentHashMap<String, Set<Session>> getTopic2sessionInGroupMapping() {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/storage/StorageResource.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/storage/StorageResource.java
deleted file mode 100644
index 750152f6e..000000000
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/storage/StorageResource.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.apache.eventmesh.runtime.storage;
-
-import org.apache.eventmesh.api.storage.StorageResourceService;
-import org.apache.eventmesh.spi.EventMeshExtensionFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class StorageResource {
-
- private static final Map<String, StorageResource> CONNECTOR_RESOURCE_CACHE = new HashMap<>(16);
-
- private StorageResourceService storageResourceService;
-
- private final AtomicBoolean inited = new AtomicBoolean(false);
-
- private final AtomicBoolean released = new AtomicBoolean(false);
-
- private StorageResource() {
-
- }
-
- public static StorageResource getInstance(String connectorResourcePluginType) {
- return CONNECTOR_RESOURCE_CACHE.computeIfAbsent(
- connectorResourcePluginType,
- StorageResource::connectorResourceBuilder
- );
- }
-
- private static StorageResource connectorResourceBuilder(String connectorResourcePluginType) {
- StorageResourceService storageResourceServiceExt = EventMeshExtensionFactory.getExtension(StorageResourceService.class,
- connectorResourcePluginType);
- if (storageResourceServiceExt == null) {
- String errorMsg = "can't load the connectorResourceService plugin, please check.";
- log.error(errorMsg);
- throw new RuntimeException(errorMsg);
- }
- StorageResource connectorResource = new StorageResource();
- connectorResource.storageResourceService = storageResourceServiceExt;
- return connectorResource;
- }
-
- public void init() throws Exception {
- if (!inited.compareAndSet(false, true)) {
- return;
- }
- storageResourceService.init();
- }
-
- public void release() throws Exception {
- if (!released.compareAndSet(false, true)) {
- return;
- }
- inited.compareAndSet(true, false);
- storageResourceService.release();
- }
-}
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/admin/controller/ClientManageControllerTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/admin/controller/ClientManageControllerTest.java
index 882e719b6..beb1a92e2 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/admin/controller/ClientManageControllerTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/admin/controller/ClientManageControllerTest.java
@@ -83,7 +83,6 @@ public class ClientManageControllerTest {
controller.setAdminWebHookConfigOperationManage(adminWebHookConfigOperationManage);
eventMeshTCPServer.getEventMeshTCPConfiguration().setEventMeshConnectorPluginType("standalone");
- eventMeshTCPServer.getEventMeshTCPConfiguration().setEventMeshStoragePluginType("standalone");
try (MockedStatic<HttpServer> dummyStatic = Mockito.mockStatic(HttpServer.class)) {
HttpServer server = mock(HttpServer.class);
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/boot/EventMeshServerTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/boot/EventMeshServerTest.java
index 5f6b57b1a..fb35c499c 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/boot/EventMeshServerTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/boot/EventMeshServerTest.java
@@ -94,7 +94,6 @@ public class EventMeshServerTest {
Assert.assertEquals("name-succeed!!!", config.getEventMeshName());
Assert.assertEquals("816", config.getSysID());
Assert.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
Assert.assertEquals("registry-succeed!!!", config.getEventMeshRegistryPluginType());
Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshGrpcConfigurationTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshGrpcConfigurationTest.java
index 75afe7d2e..5f107ab3b 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshGrpcConfigurationTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshGrpcConfigurationTest.java
@@ -73,7 +73,6 @@ public class EventMeshGrpcConfigurationTest {
Assert.assertEquals("name-succeed!!!", config.getEventMeshName());
Assert.assertEquals("816", config.getSysID());
Assert.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
Assert.assertEquals("registry-succeed!!!", config.getEventMeshRegistryPluginType());
Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
@@ -91,4 +90,4 @@ public class EventMeshGrpcConfigurationTest {
Assert.assertEquals("eventmesh.idc-succeed!!!", config.getEventMeshWebhookOrigin());
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfigurationTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfigurationTest.java
index 8faa4f1a1..72c0b5e14 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfigurationTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfigurationTest.java
@@ -88,7 +88,6 @@ public class EventMeshHTTPConfigurationTest {
Assert.assertEquals("name-succeed!!!", config.getEventMeshName());
Assert.assertEquals("816", config.getSysID());
Assert.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
Assert.assertEquals("registry-succeed!!!", config.getEventMeshRegistryPluginType());
Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
@@ -106,4 +105,4 @@ public class EventMeshHTTPConfigurationTest {
Assert.assertEquals("eventmesh.idc-succeed!!!", config.getEventMeshWebhookOrigin());
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshTCPConfigurationTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshTCPConfigurationTest.java
index 4d473a857..1f3163221 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshTCPConfigurationTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/configuration/EventMeshTCPConfigurationTest.java
@@ -75,8 +75,6 @@ public class EventMeshTCPConfigurationTest {
Assert.assertEquals("name-succeed!!!", config.getEventMeshName());
Assert.assertEquals("816", config.getSysID());
Assert.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
- Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
Assert.assertEquals("registry-succeed!!!", config.getEventMeshRegistryPluginType());
Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
@@ -94,4 +92,4 @@ public class EventMeshTCPConfigurationTest {
Assert.assertEquals("eventmesh.idc-succeed!!!", config.getEventMeshWebhookOrigin());
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/EventMeshUtilTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/EventMeshUtilTest.java
index 782ec9204..93ab82fe4 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/EventMeshUtilTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/EventMeshUtilTest.java
@@ -22,8 +22,8 @@ import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.exception.EventMeshException;
import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage;
import org.apache.eventmesh.common.protocol.tcp.UserAgent;
+import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
-import org.apache.eventmesh.storage.standalone.broker.model.TopicMetadata;
import org.apache.http.client.utils.URIBuilder;
diff --git a/eventmesh-runtime/src/test/resources/configuration.properties b/eventmesh-runtime/src/test/resources/configuration.properties
index ef3fe9266..190fd2fc5 100644
--- a/eventmesh-runtime/src/test/resources/configuration.properties
+++ b/eventmesh-runtime/src/test/resources/configuration.properties
@@ -23,7 +23,6 @@ eventMesh.server.cluster=cluster-succeed!!!
eventMesh.server.name=name-succeed!!!
eventMesh.server.hostIp=hostIp-succeed!!!
eventMesh.connector.plugin.type=connector-succeed!!!
-eventMesh.storage.plugin.type=storage-succeed!!!
eventMesh.security.plugin.type=security-succeed!!!
eventMesh.registry.plugin.type=registry-succeed!!!
eventMesh.trace.plugin=trace-succeed!!!
diff --git a/eventmesh-starter/build.gradle b/eventmesh-starter/build.gradle
index f3f63876d..ec87abfd8 100644
--- a/eventmesh-starter/build.gradle
+++ b/eventmesh-starter/build.gradle
@@ -17,5 +17,5 @@
dependencies {
implementation project(":eventmesh-runtime")
- implementation project(":eventmesh-storage:eventmesh-storage-kafka")
-}
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-kafka")
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-api/build.gradle b/eventmesh-storage/eventmesh-connector-api/build.gradle
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/build.gradle
rename to eventmesh-storage/eventmesh-connector-api/build.gradle
diff --git a/eventmesh-storage/eventmesh-storage-api/gradle.properties b/eventmesh-storage/eventmesh-connector-api/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/gradle.properties
rename to eventmesh-storage/eventmesh-connector-api/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/AsyncConsumeContext.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AsyncConsumeContext.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/AsyncConsumeContext.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AsyncConsumeContext.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventListener.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventListener.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventListener.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventListener.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventMeshAction.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventMeshAction.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventMeshAction.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventMeshAction.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventMeshAsyncConsumeContext.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventMeshAsyncConsumeContext.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/EventMeshAsyncConsumeContext.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/EventMeshAsyncConsumeContext.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/LifeCycle.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/LifeCycle.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/LifeCycle.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/LifeCycle.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/SendCallback.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/SendCallback.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/SendCallback.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/SendCallback.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/SendResult.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/SendResult.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/SendResult.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/SendResult.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/TopicProperties.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/admin/TopicProperties.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/TopicProperties.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/admin/TopicProperties.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/storage/StorageResourceService.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/storage/StorageResourceService.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
index 63df24f4d..edb61653f 100644
--- a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/storage/StorageResourceService.java
+++ b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.api.storage;
+package org.apache.eventmesh.api.connector;
import org.apache.eventmesh.spi.EventMeshExtensionType;
import org.apache.eventmesh.spi.EventMeshSPI;
@@ -24,7 +24,7 @@ import org.apache.eventmesh.spi.EventMeshSPI;
* ConnectorResourceService
*/
@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
-public interface StorageResourceService {
+public interface ConnectorResourceService {
/**
* Resource initialization in connector,such as,some public thread pool if exist
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/consumer/Consumer.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/Consumer.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/consumer/Consumer.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/Consumer.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/exception/ConnectorRuntimeException.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/exception/ConnectorRuntimeException.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/exception/ConnectorRuntimeException.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/exception/ConnectorRuntimeException.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/exception/OnExceptionContext.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/exception/OnExceptionContext.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/exception/OnExceptionContext.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/exception/OnExceptionContext.java
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/factory/StoragePluginFactory.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/factory/ConnectorPluginFactory.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/factory/StoragePluginFactory.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/factory/ConnectorPluginFactory.java
index e974e6a90..62258a34e 100644
--- a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/factory/StoragePluginFactory.java
+++ b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/factory/ConnectorPluginFactory.java
@@ -25,9 +25,9 @@ import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.spi.EventMeshExtensionFactory;
/**
- * The factory to get Storage {@link Admin}, {@link Producer} and {@link Consumer}
+ * The factory to get connector {@link Admin}, {@link Producer} and {@link Consumer}
*/
-public class StoragePluginFactory {
+public class ConnectorPluginFactory {
/**
* Get MeshMQAdmin instance by plugin name
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/producer/Producer.java b/eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/Producer.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/producer/Producer.java
rename to eventmesh-storage/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/Producer.java
diff --git a/eventmesh-storage/eventmesh-storage-kafka/build.gradle b/eventmesh-storage/eventmesh-connector-kafka/build.gradle
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-kafka/build.gradle
rename to eventmesh-storage/eventmesh-connector-kafka/build.gradle
index 9f100e129..a8ced3203 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-kafka/build.gradle
@@ -20,7 +20,7 @@ configurations {
}
dependencies {
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation project(":eventmesh-common")
// https://mavenlibs.com/maven/dependency/io.cloudevents/cloudevents-kafka
implementation group: 'io.cloudevents', name: 'cloudevents-kafka', version: '2.2.1'
@@ -31,7 +31,7 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
testImplementation project(":eventmesh-common")
testImplementation "org.mockito:mockito-core"
diff --git a/eventmesh-storage/eventmesh-storage-kafka/gradle.properties b/eventmesh-storage/eventmesh-connector-kafka/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-kafka/gradle.properties
rename to eventmesh-storage/eventmesh-connector-kafka/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/Constants.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/Constants.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/Constants.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/Constants.java
index 3e6e4c800..32ba705a7 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/Constants.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/Constants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.common;
+package org.apache.eventmesh.connector.kafka.common;
public class Constants {
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/EventMeshConstants.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/EventMeshConstants.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/EventMeshConstants.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/EventMeshConstants.java
index 2bc2f3c04..c41fedf6d 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/common/EventMeshConstants.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/common/EventMeshConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.common;
+package org.apache.eventmesh.connector.kafka.common;
public class EventMeshConstants {
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/config/ClientConfiguration.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/config/ClientConfiguration.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/config/ClientConfiguration.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/config/ClientConfiguration.java
index 3749e8157..83ed62fc1 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/config/ClientConfiguration.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/config/ClientConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.config;
+package org.apache.eventmesh.connector.kafka.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/connector/ConnectorResourceServiceKafkaImpl.java
similarity index 81%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java
copy to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/connector/ConnectorResourceServiceKafkaImpl.java
index 5ee4b8eb8..069f3f372 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/connector/ConnectorResourceServiceKafkaImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.storage;
+package org.apache.eventmesh.connector.kafka.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class StorageResourceServiceKafkaImpl implements StorageResourceService {
+public class ConnectorResourceServiceKafkaImpl implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/ConsumerImpl.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/ConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
index a81169ea0..490e40f03 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/ConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/ConsumerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.consumer;
+package org.apache.eventmesh.connector.kafka.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
@@ -56,7 +56,7 @@ public class ConsumerImpl {
// Setting the ClassLoader to null is necessary for Kafka consumer configuration
final ClassLoader original = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(null);
-
+
Properties props = new Properties();
props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getProperty(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG));
props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerImpl.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerImpl.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerImpl.java
index 0c88ec934..9e5d87c31 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerImpl.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.consumer;
+package org.apache.eventmesh.connector.kafka.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.kafka.config.ClientConfiguration;
+import org.apache.eventmesh.connector.kafka.config.ClientConfiguration;
import org.apache.kafka.clients.consumer.ConsumerConfig;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerRunner.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerRunner.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
index 767a4d172..381d1f206 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/consumer/KafkaConsumerRunner.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/consumer/KafkaConsumerRunner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.consumer;
+package org.apache.eventmesh.connector.kafka.consumer;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.EventMeshAction;
@@ -116,4 +116,4 @@ public class KafkaConsumerRunner implements Runnable {
closed.set(true);
consumer.wakeup();
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/KafkaProducerImpl.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/KafkaProducerImpl.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/KafkaProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/KafkaProducerImpl.java
index fbc9352a8..c126c2880 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/KafkaProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/KafkaProducerImpl.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.producer;
+package org.apache.eventmesh.connector.kafka.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.kafka.config.ClientConfiguration;
+import org.apache.eventmesh.connector.kafka.config.ClientConfiguration;
import org.apache.kafka.clients.producer.ProducerConfig;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/ProducerImpl.java b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/ProducerImpl.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/ProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/ProducerImpl.java
index c13fdc0f7..e4fe0060f 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/producer/ProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/java/org/apache/eventmesh/connector/kafka/producer/ProducerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.producer;
+package org.apache.eventmesh.connector.kafka.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 90%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..63ebd47c3 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+kafka=org.apache.eventmesh.connector.kafka.connector.ConnectorResourceServiceKafkaImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 91%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 194fc2bba..09ed6cf20 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+kafka=org.apache.eventmesh.connector.kafka.consumer.KafkaConsumerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 2df80005f..8e7f48a16 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.producer.KafkaProducerImpl
+kafka=org.apache.eventmesh.connector.kafka.producer.KafkaProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/kafka-client.properties b/eventmesh-storage/eventmesh-connector-kafka/src/main/resources/kafka-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/kafka-client.properties
rename to eventmesh-storage/eventmesh-connector-kafka/src/main/resources/kafka-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/test/java/org/apache/eventmesh/storage/kafka/config/ClientConfigurationTest.java b/eventmesh-storage/eventmesh-connector-kafka/src/test/java/org/apache/eventmesh/connector/kafka/config/ClientConfigurationTest.java
similarity index 85%
rename from eventmesh-storage/eventmesh-storage-kafka/src/test/java/org/apache/eventmesh/storage/kafka/config/ClientConfigurationTest.java
rename to eventmesh-storage/eventmesh-connector-kafka/src/test/java/org/apache/eventmesh/connector/kafka/config/ClientConfigurationTest.java
index 9b5e494ce..ec594a51c 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/test/java/org/apache/eventmesh/storage/kafka/config/ClientConfigurationTest.java
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/test/java/org/apache/eventmesh/connector/kafka/config/ClientConfigurationTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.config;
+package org.apache.eventmesh.connector.kafka.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl;
-import org.apache.eventmesh.storage.kafka.producer.KafkaProducerImpl;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.kafka.consumer.KafkaConsumerImpl;
+import org.apache.eventmesh.connector.kafka.producer.KafkaProducerImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +34,7 @@ public class ClientConfigurationTest {
*/
@Test
public void getConfigWhenKafkaConsumerImplInit() {
- KafkaConsumerImpl consumer = (KafkaConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("kafka");
+ KafkaConsumerImpl consumer = (KafkaConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("kafka");
ClientConfiguration config = consumer.getClientConfiguration();
assertConfig(config);
}
@@ -44,7 +44,7 @@ public class ClientConfigurationTest {
*/
@Test
public void getConfigWhenKafkaProducerImplInit() {
- KafkaProducerImpl producer = (KafkaProducerImpl) StoragePluginFactory.getMeshMQProducer("kafka");
+ KafkaProducerImpl producer = (KafkaProducerImpl) ConnectorPluginFactory.getMeshMQProducer("kafka");
ClientConfiguration config = producer.getClientConfiguration();
assertConfig(config);
}
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer b/eventmesh-storage/eventmesh-connector-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
rename to eventmesh-storage/eventmesh-connector-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
index c1326ed88..358b84da4 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-kafka/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
@@ -17,4 +17,4 @@
# under the License.
#
-org.apache.eventmesh.storage.kafka.producer.ProducerImpl
+org.apache.eventmesh.connector.kafka.producer.ProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/test/resources/kafka-client.properties b/eventmesh-storage/eventmesh-connector-kafka/src/test/resources/kafka-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-kafka/src/test/resources/kafka-client.properties
rename to eventmesh-storage/eventmesh-connector-kafka/src/test/resources/kafka-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-knative/build.gradle b/eventmesh-storage/eventmesh-connector-knative/build.gradle
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-knative/build.gradle
rename to eventmesh-storage/eventmesh-connector-knative/build.gradle
index 92fe09914..f83243809 100644
--- a/eventmesh-storage/eventmesh-storage-knative/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-knative/build.gradle
@@ -27,8 +27,8 @@ dependencies {
implementation project(":eventmesh-common")
testImplementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
testImplementation "org.powermock:powermock-module-junit4"
diff --git a/eventmesh-storage/eventmesh-storage-knative/gradle.properties b/eventmesh-storage/eventmesh-connector-knative/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-knative/gradle.properties
rename to eventmesh-storage/eventmesh-connector-knative/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/KnativeMessageFactory.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/KnativeMessageFactory.java
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/KnativeMessageFactory.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/KnativeMessageFactory.java
index 91ed60778..a072f426e 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/KnativeMessageFactory.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/KnativeMessageFactory.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.cloudevent;
+package org.apache.eventmesh.connector.knative.cloudevent;
-import org.apache.eventmesh.storage.knative.cloudevent.impl.KnativeMessageWriter;
+import org.apache.eventmesh.connector.knative.cloudevent.impl.KnativeMessageWriter;
import java.nio.charset.StandardCharsets;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeBinaryMessageReader.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeBinaryMessageReader.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeBinaryMessageReader.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeBinaryMessageReader.java
index 8a3060cab..fb7db5b7a 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeBinaryMessageReader.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeBinaryMessageReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.cloudevent.impl;
+package org.apache.eventmesh.connector.knative.cloudevent.impl;
import java.util.Locale;
import java.util.function.BiConsumer;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeHeaders.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeHeaders.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeHeaders.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeHeaders.java
index 1f998a4b2..f7b0180c0 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeHeaders.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeHeaders.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.cloudevent.impl;
+package org.apache.eventmesh.connector.knative.cloudevent.impl;
public class KnativeHeaders {
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeMessageWriter.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeMessageWriter.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeMessageWriter.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeMessageWriter.java
index 88ccc02bf..dd751b9f4 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/cloudevent/impl/KnativeMessageWriter.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/cloudevent/impl/KnativeMessageWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.cloudevent.impl;
+package org.apache.eventmesh.connector.knative.cloudevent.impl;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/config/ClientConfiguration.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/config/ClientConfiguration.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
index 5c0630470..6e741cf95 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/config/ClientConfiguration.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.config;
+package org.apache.eventmesh.connector.knative.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/storage/StorageResourceServiceKnativeImpl.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/connector/ConnectorResourceServiceKnativeImpl.java
similarity index 81%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/storage/StorageResourceServiceKnativeImpl.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/connector/ConnectorResourceServiceKnativeImpl.java
index 7f61ce8aa..bc21954a9 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/storage/StorageResourceServiceKnativeImpl.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/connector/ConnectorResourceServiceKnativeImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.storage;
+package org.apache.eventmesh.connector.knative.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class StorageResourceServiceKnativeImpl implements StorageResourceService {
+public class ConnectorResourceServiceKnativeImpl implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/DefaultConsumer.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/DefaultConsumer.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
index 1c0cb273c..afd542c36 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/DefaultConsumer.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/DefaultConsumer.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.consumer;
+package org.apache.eventmesh.connector.knative.consumer;
import static org.asynchttpclient.Dsl.asyncHttpClient;
-import org.apache.eventmesh.storage.knative.patch.EventMeshMessageListenerConcurrently;
+import org.apache.eventmesh.connector.knative.patch.EventMeshMessageListenerConcurrently;
import java.util.concurrent.TimeUnit;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImpl.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
index 3bad5a85b..891f9b47f 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.consumer;
+package org.apache.eventmesh.connector.knative.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.knative.config.ClientConfiguration;
+import org.apache.eventmesh.connector.knative.config.ClientConfiguration;
import java.util.List;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/PullConsumerImpl.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/PullConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
index e5e26ea0f..12627fbed 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/consumer/PullConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/PullConsumerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.consumer;
+package org.apache.eventmesh.connector.knative.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
@@ -24,10 +24,10 @@ import org.apache.eventmesh.api.EventMeshAsyncConsumeContext;
import org.apache.eventmesh.common.protocol.SubscriptionItem;
import org.apache.eventmesh.common.protocol.SubscriptionMode;
import org.apache.eventmesh.common.protocol.SubscriptionType;
-import org.apache.eventmesh.storage.knative.domain.NonStandardKeys;
-import org.apache.eventmesh.storage.knative.patch.EventMeshConsumeConcurrentlyContext;
-import org.apache.eventmesh.storage.knative.patch.EventMeshConsumeConcurrentlyStatus;
-import org.apache.eventmesh.storage.knative.patch.EventMeshMessageListenerConcurrently;
+import org.apache.eventmesh.connector.knative.domain.NonStandardKeys;
+import org.apache.eventmesh.connector.knative.patch.EventMeshConsumeConcurrentlyContext;
+import org.apache.eventmesh.connector.knative.patch.EventMeshConsumeConcurrentlyStatus;
+import org.apache.eventmesh.connector.knative.patch.EventMeshMessageListenerConcurrently;
import java.util.List;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/domain/NonStandardKeys.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/domain/NonStandardKeys.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/domain/NonStandardKeys.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/domain/NonStandardKeys.java
index 42bfe8d35..f8a092f60 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/domain/NonStandardKeys.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/domain/NonStandardKeys.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.domain;
+package org.apache.eventmesh.connector.knative.domain;
/**
* NonStandardKeys
@@ -24,4 +24,4 @@ public class NonStandardKeys {
public static final String MESSAGE_CONSUME_STATUS = "em.message.consume.status";
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyContext.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyContext.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyContext.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyContext.java
index e521e9b4d..f1a720d5a 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyContext.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.patch;
+package org.apache.eventmesh.connector.knative.patch;
public class EventMeshConsumeConcurrentlyContext {
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyStatus.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyStatus.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyStatus.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyStatus.java
index 3a2e2f30e..a5426e321 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshConsumeConcurrentlyStatus.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshConsumeConcurrentlyStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.patch;
+package org.apache.eventmesh.connector.knative.patch;
public enum EventMeshConsumeConcurrentlyStatus {
/**
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshMessageListenerConcurrently.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshMessageListenerConcurrently.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshMessageListenerConcurrently.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshMessageListenerConcurrently.java
index a99d59b12..458e3fe8b 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/patch/EventMeshMessageListenerConcurrently.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/patch/EventMeshMessageListenerConcurrently.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.patch;
+package org.apache.eventmesh.connector.knative.patch;
import io.cloudevents.CloudEvent;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/AbstractProducer.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/AbstractProducer.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
index 4227cd735..02eba59c6 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/AbstractProducer.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/AbstractProducer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.producer;
+package org.apache.eventmesh.connector.knative.producer;
import static org.asynchttpclient.Dsl.asyncHttpClient;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImpl.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
index 80394f806..3e3c5f076 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.producer;
+package org.apache.eventmesh.connector.knative.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.knative.config.ClientConfiguration;
+import org.apache.eventmesh.connector.knative.config.ClientConfiguration;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/ProducerImpl.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/ProducerImpl.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/ProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/ProducerImpl.java
index 93b65d342..f97d8c752 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/producer/ProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/ProducerImpl.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.producer;
+package org.apache.eventmesh.connector.knative.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
-import org.apache.eventmesh.storage.knative.cloudevent.KnativeMessageFactory;
-import org.apache.eventmesh.storage.knative.cloudevent.impl.KnativeHeaders;
-import org.apache.eventmesh.storage.knative.utils.CloudEventUtils;
+import org.apache.eventmesh.connector.knative.cloudevent.KnativeMessageFactory;
+import org.apache.eventmesh.connector.knative.cloudevent.impl.KnativeHeaders;
+import org.apache.eventmesh.connector.knative.utils.CloudEventUtils;
import java.io.IOException;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/utils/CloudEventUtils.java b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/utils/CloudEventUtils.java
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/utils/CloudEventUtils.java
rename to eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/utils/CloudEventUtils.java
index 9b2b4c96a..c742c4d76 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/java/org/apache/eventmesh/storage/knative/utils/CloudEventUtils.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/utils/CloudEventUtils.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.utils;
+package org.apache.eventmesh.connector.knative.utils;
import org.apache.eventmesh.api.SendResult;
-import org.apache.eventmesh.storage.knative.cloudevent.KnativeMessageFactory;
+import org.apache.eventmesh.connector.knative.cloudevent.KnativeMessageFactory;
import io.cloudevents.CloudEvent;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 89%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..9e1ac4a57 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+knative=org.apache.eventmesh.connector.knative.connector.ConnectorResourceServiceKnativeImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 91%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 194fc2bba..f5ac600fa 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+knative=org.apache.eventmesh.connector.knative.consumer.KnativeConsumerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 91%
copy from eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
copy to eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 436898948..ee49fc4e1 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-knative=org.apache.eventmesh.storage.knative.producer.KnativeProducerImpl
+knative=org.apache.eventmesh.connector.knative.producer.KnativeProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/knative-client.properties b/eventmesh-storage/eventmesh-connector-knative/src/main/resources/knative-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/resources/knative-client.properties
rename to eventmesh-storage/eventmesh-connector-knative/src/main/resources/knative-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/config/ClientConfigurationTest.java b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java
similarity index 77%
rename from eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/config/ClientConfigurationTest.java
rename to eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java
index 612be4e1d..72aaae665 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/config/ClientConfigurationTest.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.config;
+package org.apache.eventmesh.connector.knative.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.knative.consumer.KnativeConsumerImpl;
-import org.apache.eventmesh.storage.knative.producer.KnativeProducerImpl;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.knative.consumer.KnativeConsumerImpl;
+import org.apache.eventmesh.connector.knative.producer.KnativeProducerImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -29,7 +29,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenKnativeConsumerInit() {
KnativeConsumerImpl consumer =
- (KnativeConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("knative");
+ (KnativeConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("knative");
ClientConfiguration config = consumer.getClientConfiguration();
assertConfig(config);
@@ -38,7 +38,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenKnativeProducerInit() {
KnativeProducerImpl producer =
- (KnativeProducerImpl) StoragePluginFactory.getMeshMQProducer("knative");
+ (KnativeProducerImpl) ConnectorPluginFactory.getMeshMQProducer("knative");
ClientConfiguration config = producer.getClientConfiguration();
assertConfig(config);
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImplTest.java b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
similarity index 87%
rename from eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImplTest.java
rename to eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
index cb0177315..1204ced9b 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/consumer/KnativeConsumerImplTest.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.consumer;
+package org.apache.eventmesh.connector.knative.consumer;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import java.util.Properties;
@@ -34,7 +34,7 @@ public class KnativeConsumerImplTest {
// Create a Knative consumer:
KnativeConsumerImpl knativeConsumer =
- (KnativeConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("knative");
+ (KnativeConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("knative");
try {
knativeConsumer.init(properties);
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImplTest.java b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
similarity index 85%
rename from eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImplTest.java
rename to eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
index f0f1d05f6..99eabd329 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/test/java/org/apache/eventmesh/storage/knative/producer/KnativeProducerImplTest.java
+++ b/eventmesh-storage/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.knative.producer;
+package org.apache.eventmesh.connector.knative.producer;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.knative.cloudevent.KnativeMessageFactory;
-import org.apache.eventmesh.storage.knative.cloudevent.impl.KnativeHeaders;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.knative.cloudevent.KnativeMessageFactory;
+import org.apache.eventmesh.connector.knative.cloudevent.impl.KnativeHeaders;
import java.util.Properties;
@@ -44,7 +44,7 @@ public class KnativeProducerImplTest {
// Create a Knative producer:
KnativeProducerImpl knativehProducer =
- (KnativeProducerImpl) StoragePluginFactory.getMeshMQProducer("knative");
+ (KnativeProducerImpl) ConnectorPluginFactory.getMeshMQProducer("knative");
try {
knativehProducer.init(properties);
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/test/resources/knative-client.properties b/eventmesh-storage/eventmesh-connector-knative/src/test/resources/knative-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-knative/src/test/resources/knative-client.properties
rename to eventmesh-storage/eventmesh-connector-knative/src/test/resources/knative-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-pravega/README.md b/eventmesh-storage/eventmesh-connector-pravega/README.md
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pravega/README.md
rename to eventmesh-storage/eventmesh-connector-pravega/README.md
diff --git a/eventmesh-storage/eventmesh-storage-pravega/build.gradle b/eventmesh-storage/eventmesh-connector-pravega/build.gradle
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-pravega/build.gradle
rename to eventmesh-storage/eventmesh-connector-pravega/build.gradle
index f894a1120..faf6abe12 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-pravega/build.gradle
@@ -22,7 +22,7 @@ configurations {
dependencies {
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation("io.pravega:pravega-client:$pravega_version") {
exclude group: 'io.netty', module: 'netty-codec-http2:4.1.30.Final'
}
diff --git a/eventmesh-storage/eventmesh-storage-pravega/gradle.properties b/eventmesh-storage/eventmesh-connector-pravega/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pravega/gradle.properties
rename to eventmesh-storage/eventmesh-connector-pravega/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-pravega/pravega-connector.jpg b/eventmesh-storage/eventmesh-connector-pravega/pravega-connector.jpg
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pravega/pravega-connector.jpg
rename to eventmesh-storage/eventmesh-connector-pravega/pravega-connector.jpg
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaStorageResourceServiceImpl.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConnectorResourceServiceImpl.java
similarity index 79%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaStorageResourceServiceImpl.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConnectorResourceServiceImpl.java
index ab8225c91..1b03ddcca 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaStorageResourceServiceImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConnectorResourceServiceImpl.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega;
+package org.apache.eventmesh.connector.pravega;
-import org.apache.eventmesh.api.storage.StorageResourceService;
-import org.apache.eventmesh.storage.pravega.client.PravegaClient;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
+import org.apache.eventmesh.connector.pravega.client.PravegaClient;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class PravegaStorageResourceServiceImpl implements StorageResourceService {
+public class PravegaConnectorResourceServiceImpl implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaConsumerImpl.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConsumerImpl.java
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConsumerImpl.java
index fd33fd0a0..8d8c4330f 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaConsumerImpl.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega;
+package org.apache.eventmesh.connector.pravega;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.pravega.client.PravegaClient;
-import org.apache.eventmesh.storage.pravega.config.PravegaConnectorConfig;
-import org.apache.eventmesh.storage.pravega.exception.PravegaConnectorException;
+import org.apache.eventmesh.connector.pravega.client.PravegaClient;
+import org.apache.eventmesh.connector.pravega.config.PravegaConnectorConfig;
+import org.apache.eventmesh.connector.pravega.exception.PravegaConnectorException;
import java.util.List;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaProducerImpl.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaProducerImpl.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaProducerImpl.java
index dffbd5cda..4ebe722c7 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/PravegaProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/PravegaProducerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega;
+package org.apache.eventmesh.connector.pravega;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
@@ -24,9 +24,9 @@ import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.pravega.client.PravegaClient;
-import org.apache.eventmesh.storage.pravega.config.PravegaConnectorConfig;
-import org.apache.eventmesh.storage.pravega.exception.PravegaConnectorException;
+import org.apache.eventmesh.connector.pravega.client.PravegaClient;
+import org.apache.eventmesh.connector.pravega.config.PravegaConnectorConfig;
+import org.apache.eventmesh.connector.pravega.exception.PravegaConnectorException;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaClient.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaClient.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaClient.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaClient.java
index f71a9d42e..e5b03c6ae 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaClient.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaClient.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.client;
+package org.apache.eventmesh.connector.pravega.client;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.SendResult;
-import org.apache.eventmesh.storage.pravega.config.PravegaConnectorConfig;
-import org.apache.eventmesh.storage.pravega.exception.PravegaConnectorException;
+import org.apache.eventmesh.connector.pravega.config.PravegaConnectorConfig;
+import org.apache.eventmesh.connector.pravega.exception.PravegaConnectorException;
import java.util.Map;
import java.util.UUID;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaCloudEventWriter.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaCloudEventWriter.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaCloudEventWriter.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaCloudEventWriter.java
index ebc2c70e3..347ea3054 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaCloudEventWriter.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaCloudEventWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.client;
+package org.apache.eventmesh.connector.pravega.client;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaEvent.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaEvent.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaEvent.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaEvent.java
index 10ac33f95..cf5dcc842 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/PravegaEvent.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/PravegaEvent.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.client;
+package org.apache.eventmesh.connector.pravega.client;
import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.storage.pravega.exception.PravegaConnectorException;
+import org.apache.eventmesh.connector.pravega.exception.PravegaConnectorException;
import java.io.Serializable;
import java.net.URI;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/SubscribeTask.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/SubscribeTask.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/SubscribeTask.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/SubscribeTask.java
index 34ea6661b..3e55a4d6a 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/client/SubscribeTask.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/client/SubscribeTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.client;
+package org.apache.eventmesh.connector.pravega.client;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.EventMeshAction;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfig.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfig.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfig.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfig.java
index 63422cd72..b7c5ffbac 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfig.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.config;
+package org.apache.eventmesh.connector.pravega.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/exception/PravegaConnectorException.java b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/exception/PravegaConnectorException.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/exception/PravegaConnectorException.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/exception/PravegaConnectorException.java
index 8e8487b4c..7bafc938d 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/java/org/apache/eventmesh/storage/pravega/exception/PravegaConnectorException.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/java/org/apache/eventmesh/connector/pravega/exception/PravegaConnectorException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.exception;
+package org.apache.eventmesh.connector.pravega.exception;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 90%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 32de25d34..4ccc7d70c 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.storage.StorageResourceServiceKafkaImpl
+pravega=org.apache.eventmesh.connector.pravega.PravegaConnectorResourceServiceImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index a151460ac..816011506 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-pravega=org.apache.eventmesh.storage.pravega.PravegaConsumerImpl
+pravega=org.apache.eventmesh.connector.pravega.PravegaConsumerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index db19d254d..6b1262820 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-pravega=org.apache.eventmesh.storage.pravega.PravegaProducerImpl
+pravega=org.apache.eventmesh.connector.pravega.PravegaProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/pravega-connector.properties b/eventmesh-storage/eventmesh-connector-pravega/src/main/resources/pravega-connector.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pravega/src/main/resources/pravega-connector.properties
rename to eventmesh-storage/eventmesh-connector-pravega/src/main/resources/pravega-connector.properties
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/client/PravegaClientTest.java b/eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/client/PravegaClientTest.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/client/PravegaClientTest.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/client/PravegaClientTest.java
index 3132243c2..b2ddf1b5b 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/client/PravegaClientTest.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/client/PravegaClientTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.client;
+package org.apache.eventmesh.connector.pravega.client;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
import org.apache.eventmesh.api.AsyncConsumeContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.common.config.ConfigService;
-import org.apache.eventmesh.storage.pravega.config.PravegaConnectorConfig;
+import org.apache.eventmesh.connector.pravega.config.PravegaConnectorConfig;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfigTest.java b/eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfigTest.java
similarity index 82%
rename from eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfigTest.java
rename to eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfigTest.java
index 7124c5555..74992d4a8 100644
--- a/eventmesh-storage/eventmesh-storage-pravega/src/test/java/org/apache/eventmesh/storage/pravega/config/PravegaConnectorConfigTest.java
+++ b/eventmesh-storage/eventmesh-connector-pravega/src/test/java/org/apache/eventmesh/connector/pravega/config/PravegaConnectorConfigTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pravega.config;
+package org.apache.eventmesh.connector.pravega.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.pravega.PravegaConsumerImpl;
-import org.apache.eventmesh.storage.pravega.PravegaProducerImpl;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.pravega.PravegaConsumerImpl;
+import org.apache.eventmesh.connector.pravega.PravegaProducerImpl;
import java.net.URI;
@@ -31,7 +31,7 @@ public class PravegaConnectorConfigTest {
@Test
public void getConfigWhenPravegaConsumerInit() {
PravegaConsumerImpl consumer =
- (PravegaConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("pravega");
+ (PravegaConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("pravega");
PravegaConnectorConfig config = consumer.getClientConfiguration();
assertConfig(config);
@@ -40,7 +40,7 @@ public class PravegaConnectorConfigTest {
@Test
public void getConfigWhenPravegaProducerInit() {
PravegaProducerImpl producer =
- (PravegaProducerImpl) StoragePluginFactory.getMeshMQProducer("pravega");
+ (PravegaProducerImpl) ConnectorPluginFactory.getMeshMQProducer("pravega");
PravegaConnectorConfig config = producer.getClientConfiguration();
assertConfig(config);
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/test/resources/pravega-connector.properties b/eventmesh-storage/eventmesh-connector-pravega/src/test/resources/pravega-connector.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pravega/src/test/resources/pravega-connector.properties
rename to eventmesh-storage/eventmesh-connector-pravega/src/test/resources/pravega-connector.properties
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/build.gradle b/eventmesh-storage/eventmesh-connector-pulsar/build.gradle
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-pulsar/build.gradle
rename to eventmesh-storage/eventmesh-connector-pulsar/build.gradle
index eb4da5c65..2f9c7efd0 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-pulsar/build.gradle
@@ -22,10 +22,10 @@ configurations {
dependencies {
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation 'org.apache.pulsar:pulsar-client:2.10.1'
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
testImplementation project(":eventmesh-common")
testImplementation 'org.apache.pulsar:pulsar-client:2.10.1'
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/gradle.properties b/eventmesh-storage/eventmesh-connector-pulsar/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pulsar/gradle.properties
rename to eventmesh-storage/eventmesh-connector-pulsar/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/client/PulsarClientWrapper.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/client/PulsarClientWrapper.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/client/PulsarClientWrapper.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/client/PulsarClientWrapper.java
index 5cc3b5311..fa775e445 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/client/PulsarClientWrapper.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/client/PulsarClientWrapper.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.client;
+package org.apache.eventmesh.connector.pulsar.client;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
-import org.apache.eventmesh.storage.pulsar.config.ClientConfiguration;
-import org.apache.eventmesh.storage.pulsar.utils.CloudEventUtils;
+import org.apache.eventmesh.connector.pulsar.config.ClientConfiguration;
+import org.apache.eventmesh.connector.pulsar.utils.CloudEventUtils;
import org.apache.pulsar.client.api.ClientBuilder;
import org.apache.pulsar.client.api.Producer;
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/config/ClientConfiguration.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/config/ClientConfiguration.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/config/ClientConfiguration.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/config/ClientConfiguration.java
index 02ff344a0..9410debf5 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/config/ClientConfiguration.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/config/ClientConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.config;
+package org.apache.eventmesh.connector.pulsar.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
@@ -36,4 +36,4 @@ public class ClientConfiguration {
@ConfigFiled(field = "authParams")
private String authParams;
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/storage/StorageResourceServiceRocketmqImpl.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/connector/ConnectorResourceServicePulsarImpl.java
similarity index 81%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/storage/StorageResourceServiceRocketmqImpl.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/connector/ConnectorResourceServicePulsarImpl.java
index 8a280357a..c5b0687ec 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/storage/StorageResourceServiceRocketmqImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/connector/ConnectorResourceServicePulsarImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.storage;
+package org.apache.eventmesh.connector.pulsar.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class StorageResourceServiceRocketmqImpl implements StorageResourceService {
+public class ConnectorResourceServicePulsarImpl implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/consumer/PulsarConsumerImpl.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/consumer/PulsarConsumerImpl.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/consumer/PulsarConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/consumer/PulsarConsumerImpl.java
index 497b5eac2..d7ea3fa47 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/consumer/PulsarConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/consumer/PulsarConsumerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.consumer;
+package org.apache.eventmesh.connector.pulsar.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
@@ -25,7 +25,7 @@ import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.pulsar.config.ClientConfiguration;
+import org.apache.eventmesh.connector.pulsar.config.ClientConfiguration;
import org.apache.pulsar.client.api.ClientBuilder;
import org.apache.pulsar.client.api.MessageListener;
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/AbstractProducer.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/AbstractProducer.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/AbstractProducer.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/AbstractProducer.java
index b3465cddb..f0e4858e8 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/AbstractProducer.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/AbstractProducer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.producer;
+package org.apache.eventmesh.connector.pulsar.producer;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/ProducerImpl.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/ProducerImpl.java
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/ProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/ProducerImpl.java
index 6a1afd290..2d90ebaa8 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/ProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/ProducerImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.producer;
+package org.apache.eventmesh.connector.pulsar.producer;
import org.apache.eventmesh.api.SendCallback;
-import org.apache.eventmesh.storage.pulsar.client.PulsarClientWrapper;
-import org.apache.eventmesh.storage.pulsar.config.ClientConfiguration;
+import org.apache.eventmesh.connector.pulsar.client.PulsarClientWrapper;
+import org.apache.eventmesh.connector.pulsar.config.ClientConfiguration;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -80,4 +80,4 @@ public class ProducerImpl extends AbstractProducer {
public void setConfig(ClientConfiguration config) {
this.config = config;
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/PulsarProducerImpl.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/PulsarProducerImpl.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/PulsarProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/PulsarProducerImpl.java
index 056a2eefe..063c1439e 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/producer/PulsarProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/producer/PulsarProducerImpl.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.producer;
+package org.apache.eventmesh.connector.pulsar.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.pulsar.config.ClientConfiguration;
+import org.apache.eventmesh.connector.pulsar.config.ClientConfiguration;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/utils/CloudEventUtils.java b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/utils/CloudEventUtils.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/utils/CloudEventUtils.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/utils/CloudEventUtils.java
index 71d40d29c..1ba605e69 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/utils/CloudEventUtils.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/utils/CloudEventUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.utils;
+package org.apache.eventmesh.connector.pulsar.utils;
import org.apache.eventmesh.api.SendResult;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 89%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..f4a99342e 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+pulsar=org.apache.eventmesh.connector.pulsar.connector.ConnectorResourceServicePulsarImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 149e1975d..e835bc3cb 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-pulsar=org.apache.eventmesh.storage.pulsar.consumer.PulsarConsumerImpl
+pulsar=org.apache.eventmesh.connector.pulsar.consumer.PulsarConsumerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 5f6304dc7..f8a5373ed 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-pulsar=org.apache.eventmesh.storage.pulsar.producer.PulsarProducerImpl
+pulsar=org.apache.eventmesh.connector.pulsar.producer.PulsarProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/pulsar-client.properties b/eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/pulsar-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/pulsar-client.properties
rename to eventmesh-storage/eventmesh-connector-pulsar/src/main/resources/pulsar-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/test/java/org/apache/eventmesh/storage/pulsar/config/ClientConfigurationTest.java b/eventmesh-storage/eventmesh-connector-pulsar/src/test/java/org/apache/eventmesh/connector/pulsar/config/ClientConfigurationTest.java
similarity index 75%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/test/java/org/apache/eventmesh/storage/pulsar/config/ClientConfigurationTest.java
rename to eventmesh-storage/eventmesh-connector-pulsar/src/test/java/org/apache/eventmesh/connector/pulsar/config/ClientConfigurationTest.java
index 40ffb3fdc..f70fd269c 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/test/java/org/apache/eventmesh/storage/pulsar/config/ClientConfigurationTest.java
+++ b/eventmesh-storage/eventmesh-connector-pulsar/src/test/java/org/apache/eventmesh/connector/pulsar/config/ClientConfigurationTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.config;
+package org.apache.eventmesh.connector.pulsar.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.pulsar.consumer.PulsarConsumerImpl;
-import org.apache.eventmesh.storage.pulsar.producer.PulsarProducerImpl;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.pulsar.consumer.PulsarConsumerImpl;
+import org.apache.eventmesh.connector.pulsar.producer.PulsarProducerImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -28,7 +28,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenPulsarConsumerInit() {
- PulsarConsumerImpl consumer = (PulsarConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("pulsar");
+ PulsarConsumerImpl consumer = (PulsarConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("pulsar");
ClientConfiguration config = consumer.getClientConfiguration();
assertConfig(config);
@@ -36,7 +36,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenPulsarProducerInit() {
- PulsarProducerImpl producer = (PulsarProducerImpl) StoragePluginFactory.getMeshMQProducer("pulsar");
+ PulsarProducerImpl producer = (PulsarProducerImpl) ConnectorPluginFactory.getMeshMQProducer("pulsar");
ClientConfiguration config = producer.getClientConfiguration();
assertConfig(config);
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/test/resources/pulsar-client.properties b/eventmesh-storage/eventmesh-connector-pulsar/src/test/resources/pulsar-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/test/resources/pulsar-client.properties
rename to eventmesh-storage/eventmesh-connector-pulsar/src/test/resources/pulsar-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/build.gradle b/eventmesh-storage/eventmesh-connector-rabbitmq/build.gradle
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/build.gradle
rename to eventmesh-storage/eventmesh-connector-rabbitmq/build.gradle
index 65b67c063..9cd121372 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/build.gradle
@@ -21,12 +21,12 @@ configurations {
}
dependencies {
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation project(":eventmesh-common")
// rabbitmq
implementation 'com.rabbitmq:amqp-client:5.16.0'
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
testImplementation project(":eventmesh-common")
// rabbitmq
testImplementation 'com.rabbitmq:amqp-client:5.16.0'
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/gradle.properties b/eventmesh-storage/eventmesh-connector-rabbitmq/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/gradle.properties
rename to eventmesh-storage/eventmesh-connector-rabbitmq/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqClient.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqClient.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
index b9b0690ce..0e0ea425e 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqClient.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.client;
+package org.apache.eventmesh.connector.rabbitmq.client;
import org.apache.commons.lang3.StringUtils;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqConnectionFactory.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqConnectionFactory.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqConnectionFactory.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqConnectionFactory.java
index f3866a628..2ff41f4f9 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/client/RabbitmqConnectionFactory.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqConnectionFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.client;
+package org.apache.eventmesh.connector.rabbitmq.client;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEvent.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEvent.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEvent.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEvent.java
index 1deccfb3f..a942e6f71 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEvent.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEvent.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.cloudevent;
+package org.apache.eventmesh.connector.rabbitmq.cloudevent;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.storage.rabbitmq.exception.RabbitmqaConnectorException;
-import org.apache.eventmesh.storage.rabbitmq.utils.ByteArrayUtils;
+import org.apache.eventmesh.connector.rabbitmq.exception.RabbitmqaConnectorException;
+import org.apache.eventmesh.connector.rabbitmq.utils.ByteArrayUtils;
import java.io.Serializable;
import java.net.URI;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java
index fef86736e..b2705101d 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.cloudevent;
+package org.apache.eventmesh.connector.rabbitmq.cloudevent;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolder.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolder.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolder.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolder.java
index 21e2efd7b..2f46c5642 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolder.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.config;
+package org.apache.eventmesh.connector.rabbitmq.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/storage/RedisStorageResourceService.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/connector/RabbitmqConnectorResourceService.java
similarity index 81%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/storage/RedisStorageResourceService.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/connector/RabbitmqConnectorResourceService.java
index 1846a194d..e413ce965 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/storage/RedisStorageResourceService.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/connector/RabbitmqConnectorResourceService.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.storage;
+package org.apache.eventmesh.connector.rabbitmq.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class RedisStorageResourceService implements StorageResourceService {
+public class RabbitmqConnectorResourceService implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumer.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumer.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
index 58b500657..a2c96f40e 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumer.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumer.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.consumer;
+package org.apache.eventmesh.connector.rabbitmq.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.rabbitmq.client.RabbitmqClient;
-import org.apache.eventmesh.storage.rabbitmq.client.RabbitmqConnectionFactory;
-import org.apache.eventmesh.storage.rabbitmq.config.ConfigurationHolder;
+import org.apache.eventmesh.connector.rabbitmq.client.RabbitmqClient;
+import org.apache.eventmesh.connector.rabbitmq.client.RabbitmqConnectionFactory;
+import org.apache.eventmesh.connector.rabbitmq.config.ConfigurationHolder;
import java.util.List;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerHandler.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerHandler.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
index c52b859a2..c22624be2 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerHandler.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerHandler.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.consumer;
+package org.apache.eventmesh.connector.rabbitmq.consumer;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.EventMeshAsyncConsumeContext;
-import org.apache.eventmesh.storage.rabbitmq.cloudevent.RabbitmqCloudEvent;
-import org.apache.eventmesh.storage.rabbitmq.config.ConfigurationHolder;
+import org.apache.eventmesh.connector.rabbitmq.cloudevent.RabbitmqCloudEvent;
+import org.apache.eventmesh.connector.rabbitmq.config.ConfigurationHolder;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/exception/RabbitmqaConnectorException.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/exception/RabbitmqaConnectorException.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/exception/RabbitmqaConnectorException.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/exception/RabbitmqaConnectorException.java
index 7d1a39849..ba0699980 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/exception/RabbitmqaConnectorException.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/exception/RabbitmqaConnectorException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.exception;
+package org.apache.eventmesh.connector.rabbitmq.exception;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducer.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducer.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
index 852913217..737e009ed 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducer.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.producer;
+package org.apache.eventmesh.connector.rabbitmq.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
@@ -24,12 +24,12 @@ import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.rabbitmq.client.RabbitmqClient;
-import org.apache.eventmesh.storage.rabbitmq.client.RabbitmqConnectionFactory;
-import org.apache.eventmesh.storage.rabbitmq.cloudevent.RabbitmqCloudEvent;
-import org.apache.eventmesh.storage.rabbitmq.cloudevent.RabbitmqCloudEventWriter;
-import org.apache.eventmesh.storage.rabbitmq.config.ConfigurationHolder;
-import org.apache.eventmesh.storage.rabbitmq.utils.ByteArrayUtils;
+import org.apache.eventmesh.connector.rabbitmq.client.RabbitmqClient;
+import org.apache.eventmesh.connector.rabbitmq.client.RabbitmqConnectionFactory;
+import org.apache.eventmesh.connector.rabbitmq.cloudevent.RabbitmqCloudEvent;
+import org.apache.eventmesh.connector.rabbitmq.cloudevent.RabbitmqCloudEventWriter;
+import org.apache.eventmesh.connector.rabbitmq.config.ConfigurationHolder;
+import org.apache.eventmesh.connector.rabbitmq.utils.ByteArrayUtils;
import java.util.Optional;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/utils/ByteArrayUtils.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/utils/ByteArrayUtils.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/utils/ByteArrayUtils.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/utils/ByteArrayUtils.java
index 33db09c57..d6848db9c 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/utils/ByteArrayUtils.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/utils/ByteArrayUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.utils;
+package org.apache.eventmesh.connector.rabbitmq.utils;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.utils.JsonUtils;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 89%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..1b7228c7c 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+rabbitmq=org.apache.eventmesh.connector.rabbitmq.connector.RabbitmqConnectorResourceService
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 00a16bf7a..1d9791e92 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-knative=org.apache.eventmesh.storage.knative.consumer.KnativeConsumerImpl
+rabbitmq=org.apache.eventmesh.connector.rabbitmq.consumer.RabbitmqConsumer
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 91%
copy from eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
copy to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 436898948..d60ea94bb 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-knative=org.apache.eventmesh.storage.knative.producer.KnativeProducerImpl
+rabbitmq=org.apache.eventmesh.connector.rabbitmq.producer.RabbitmqProducer
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/rabbitmq-client.properties b/eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/rabbitmq-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/rabbitmq-client.properties
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/main/resources/rabbitmq-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqMockConnectionFactory.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqMockConnectionFactory.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqMockConnectionFactory.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqMockConnectionFactory.java
index ffda7ca44..912e825bf 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqMockConnectionFactory.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqMockConnectionFactory.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq;
+package org.apache.eventmesh.connector.rabbitmq;
-import org.apache.eventmesh.storage.rabbitmq.client.RabbitmqConnectionFactory;
+import org.apache.eventmesh.connector.rabbitmq.client.RabbitmqConnectionFactory;
import com.github.fridujo.rabbitmq.mock.MockConnectionFactory;
import com.rabbitmq.client.Channel;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqServer.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqServer.java
similarity index 78%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqServer.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqServer.java
index 175f56bc6..b21f6da6f 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/RabbitmqServer.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/RabbitmqServer.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq;
+package org.apache.eventmesh.connector.rabbitmq;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.rabbitmq.consumer.RabbitmqConsumer;
-import org.apache.eventmesh.storage.rabbitmq.producer.RabbitmqProducer;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.rabbitmq.consumer.RabbitmqConsumer;
+import org.apache.eventmesh.connector.rabbitmq.producer.RabbitmqProducer;
import java.util.Properties;
@@ -36,12 +36,12 @@ public class RabbitmqServer {
RabbitmqMockConnectionFactory rabbitmqMockConnectionFactory = new RabbitmqMockConnectionFactory();
rabbitmqConsumer =
- (RabbitmqConsumer) StoragePluginFactory.getMeshMQPushConsumer("rabbitmq");
+ (RabbitmqConsumer) ConnectorPluginFactory.getMeshMQPushConsumer("rabbitmq");
rabbitmqConsumer.setRabbitmqConnectionFactory(rabbitmqMockConnectionFactory);
rabbitmqConsumer.init(new Properties());
rabbitmqConsumer.start();
- rabbitmqProducer = (RabbitmqProducer) StoragePluginFactory.getMeshMQProducer("rabbitmq");
+ rabbitmqProducer = (RabbitmqProducer) ConnectorPluginFactory.getMeshMQProducer("rabbitmq");
rabbitmqProducer.setRabbitmqConnectionFactory(rabbitmqMockConnectionFactory);
rabbitmqProducer.init(new Properties());
rabbitmqProducer.start();
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventTest.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventTest.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventTest.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventTest.java
index e6cbcaae5..0a55709ec 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/cloudevent/RabbitmqCloudEventTest.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/cloudevent/RabbitmqCloudEventTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.cloudevent;
+package org.apache.eventmesh.connector.rabbitmq.cloudevent;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolderTest.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolderTest.java
similarity index 82%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolderTest.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolderTest.java
index 6d98e4d1b..f04d4a668 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/config/ConfigurationHolderTest.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/config/ConfigurationHolderTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.config;
+package org.apache.eventmesh.connector.rabbitmq.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.rabbitmq.consumer.RabbitmqConsumer;
-import org.apache.eventmesh.storage.rabbitmq.producer.RabbitmqProducer;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.rabbitmq.consumer.RabbitmqConsumer;
+import org.apache.eventmesh.connector.rabbitmq.producer.RabbitmqProducer;
import org.junit.Assert;
import org.junit.Test;
@@ -31,7 +31,7 @@ public class ConfigurationHolderTest {
@Test
public void getConfigWhenRabbitmqConsumerInit() {
RabbitmqConsumer consumer =
- (RabbitmqConsumer) StoragePluginFactory.getMeshMQPushConsumer("rabbitmq");
+ (RabbitmqConsumer) ConnectorPluginFactory.getMeshMQPushConsumer("rabbitmq");
ConfigurationHolder config = consumer.getClientConfiguration();
assertConfig(config);
@@ -40,7 +40,7 @@ public class ConfigurationHolderTest {
@Test
public void getConfigWhenRabbitmqProducerInit() {
RabbitmqProducer producer =
- (RabbitmqProducer) StoragePluginFactory.getMeshMQProducer("rabbitmq");
+ (RabbitmqProducer) ConnectorPluginFactory.getMeshMQProducer("rabbitmq");
ConfigurationHolder config = producer.getClientConfiguration();
assertConfig(config);
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerTest.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerTest.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerTest.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerTest.java
index f6a933634..566efd7a4 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/consumer/RabbitmqConsumerTest.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/consumer/RabbitmqConsumerTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.consumer;
+package org.apache.eventmesh.connector.rabbitmq.consumer;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.storage.rabbitmq.RabbitmqServer;
+import org.apache.eventmesh.connector.rabbitmq.RabbitmqServer;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducerTest.java b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducerTest.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducerTest.java
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducerTest.java
index 313669bda..49699ea7c 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/java/org/apache/eventmesh/storage/rabbitmq/producer/RabbitmqProducerTest.java
+++ b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/java/org/apache/eventmesh/connector/rabbitmq/producer/RabbitmqProducerTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.producer;
+package org.apache.eventmesh.connector.rabbitmq.producer;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.storage.rabbitmq.RabbitmqServer;
+import org.apache.eventmesh.connector.rabbitmq.RabbitmqServer;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/test/resources/rabbitmq-client.properties b/eventmesh-storage/eventmesh-connector-rabbitmq/src/test/resources/rabbitmq-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/test/resources/rabbitmq-client.properties
rename to eventmesh-storage/eventmesh-connector-rabbitmq/src/test/resources/rabbitmq-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-redis/build.gradle b/eventmesh-storage/eventmesh-connector-redis/build.gradle
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-redis/build.gradle
rename to eventmesh-storage/eventmesh-connector-redis/build.gradle
index b681d7cff..a28bee81d 100644
--- a/eventmesh-storage/eventmesh-storage-redis/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-redis/build.gradle
@@ -21,7 +21,7 @@ configurations {
dependencies {
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
// redisson
implementation('org.redisson:redisson:3.17.3') {
diff --git a/eventmesh-storage/eventmesh-storage-redis/gradle.properties b/eventmesh-storage/eventmesh-connector-redis/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-redis/gradle.properties
rename to eventmesh-storage/eventmesh-connector-redis/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/client/RedissonClient.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/client/RedissonClient.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/client/RedissonClient.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/client/RedissonClient.java
index 648758183..64252f5c2 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/client/RedissonClient.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/client/RedissonClient.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.client;
+package org.apache.eventmesh.connector.redis.client;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.config.ConfigService;
-import org.apache.eventmesh.storage.redis.cloudevent.CloudEventCodec;
-import org.apache.eventmesh.storage.redis.config.RedisProperties;
+import org.apache.eventmesh.connector.redis.cloudevent.CloudEventCodec;
+import org.apache.eventmesh.connector.redis.config.RedisProperties;
import java.util.Arrays;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/cloudevent/CloudEventCodec.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/cloudevent/CloudEventCodec.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/cloudevent/CloudEventCodec.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/cloudevent/CloudEventCodec.java
index 932488d8c..7d1585506 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/cloudevent/CloudEventCodec.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/cloudevent/CloudEventCodec.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.cloudevent;
+package org.apache.eventmesh.connector.redis.cloudevent;
import org.redisson.client.codec.BaseCodec;
import org.redisson.client.protocol.Decoder;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/config/RedisProperties.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/config/RedisProperties.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/config/RedisProperties.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/config/RedisProperties.java
index 9ac97b1db..a07a3de81 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/config/RedisProperties.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/config/RedisProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.config;
+package org.apache.eventmesh.connector.redis.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/storage/RabbitmqStorageResourceService.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/connector/RedisConnectorResourceService.java
similarity index 82%
rename from eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/storage/RabbitmqStorageResourceService.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/connector/RedisConnectorResourceService.java
index 260abf4b2..13653b173 100644
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/java/org/apache/eventmesh/storage/rabbitmq/storage/RabbitmqStorageResourceService.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/connector/RedisConnectorResourceService.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rabbitmq.storage;
+package org.apache.eventmesh.connector.redis.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class RabbitmqStorageResourceService implements StorageResourceService {
+public class RedisConnectorResourceService implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumer.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumer.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
index 5d689fe96..2abd68e52 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumer.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumer.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.consumer;
+package org.apache.eventmesh.connector.redis.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.EventMeshAsyncConsumeContext;
import org.apache.eventmesh.api.consumer.Consumer;
-import org.apache.eventmesh.storage.redis.client.RedissonClient;
+import org.apache.eventmesh.connector.redis.client.RedissonClient;
import java.util.List;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/producer/RedisProducer.java b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/producer/RedisProducer.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/producer/RedisProducer.java
rename to eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/producer/RedisProducer.java
index 4f4d8efa3..5fb7d13c8 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/java/org/apache/eventmesh/storage/redis/producer/RedisProducer.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/java/org/apache/eventmesh/connector/redis/producer/RedisProducer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.producer;
+package org.apache.eventmesh.connector.redis.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
@@ -23,7 +23,7 @@ import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.api.producer.Producer;
-import org.apache.eventmesh.storage.redis.client.RedissonClient;
+import org.apache.eventmesh.connector.redis.client.RedissonClient;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 90%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..24d10e39b 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+redis=org.apache.eventmesh.connector.redis.connector.RedisConnectorResourceService
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
rename to eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 05cf5bb65..e91051e77 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-redis=org.apache.eventmesh.storage.redis.consumer.RedisConsumer
+redis=org.apache.eventmesh.connector.redis.consumer.RedisConsumer
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
rename to eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 604693145..f6e6c8b76 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-redis=org.apache.eventmesh.storage.redis.producer.RedisProducer
+redis=org.apache.eventmesh.connector.redis.producer.RedisProducer
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/redis-client.properties b/eventmesh-storage/eventmesh-connector-redis/src/main/resources/redis-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-redis/src/main/resources/redis-client.properties
rename to eventmesh-storage/eventmesh-connector-redis/src/main/resources/redis-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/AbstractRedisServer.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/AbstractRedisServer.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/AbstractRedisServer.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/AbstractRedisServer.java
index a71eeb6f9..93914ca71 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/AbstractRedisServer.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/AbstractRedisServer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis;
+package org.apache.eventmesh.connector.redis;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/client/RedissonClientTest.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/client/RedissonClientTest.java
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/client/RedissonClientTest.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/client/RedissonClientTest.java
index 8310fa366..44e5c1ba3 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/client/RedissonClientTest.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/client/RedissonClientTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.client;
+package org.apache.eventmesh.connector.redis.client;
-import org.apache.eventmesh.storage.redis.AbstractRedisServer;
+import org.apache.eventmesh.connector.redis.AbstractRedisServer;
import org.junit.Assert;
import org.junit.Test;
@@ -28,4 +28,4 @@ public class RedissonClientTest extends AbstractRedisServer {
public void testInstance() {
Assert.assertNotNull(RedissonClient.INSTANCE);
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/config/RedisPropertiesTest.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/config/RedisPropertiesTest.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/config/RedisPropertiesTest.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/config/RedisPropertiesTest.java
index 70072bc54..9321f5370 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/config/RedisPropertiesTest.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/config/RedisPropertiesTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.config;
+package org.apache.eventmesh.connector.redis.config;
import org.apache.eventmesh.common.config.ConfigService;
@@ -44,4 +44,4 @@ public class RedisPropertiesTest {
Properties redissonProperties = config.getRedissonProperties();
Assert.assertEquals(redissonProperties, properties);
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/storage/UnitTest.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/connector/UnitTest.java
similarity index 90%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/storage/UnitTest.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/connector/UnitTest.java
index 7ba45aca5..1b9072914 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/storage/UnitTest.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/connector/UnitTest.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.storage;
+package org.apache.eventmesh.connector.redis.connector;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
-import org.apache.eventmesh.storage.redis.AbstractRedisServer;
-import org.apache.eventmesh.storage.redis.consumer.RedisConsumer;
-import org.apache.eventmesh.storage.redis.consumer.RedisConsumerTest;
-import org.apache.eventmesh.storage.redis.producer.RedisProducer;
+import org.apache.eventmesh.connector.redis.AbstractRedisServer;
+import org.apache.eventmesh.connector.redis.consumer.RedisConsumer;
+import org.apache.eventmesh.connector.redis.consumer.RedisConsumerTest;
+import org.apache.eventmesh.connector.redis.producer.RedisProducer;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumerTest.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumerTest.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumerTest.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumerTest.java
index b29e034c0..9609672cb 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/consumer/RedisConsumerTest.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/consumer/RedisConsumerTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.consumer;
+package org.apache.eventmesh.connector.redis.consumer;
import org.apache.eventmesh.api.EventMeshAction;
-import org.apache.eventmesh.storage.redis.AbstractRedisServer;
-import org.apache.eventmesh.storage.redis.client.RedissonClient;
+import org.apache.eventmesh.connector.redis.AbstractRedisServer;
+import org.apache.eventmesh.connector.redis.client.RedissonClient;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/producer/RedisProducerTest.java b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/producer/RedisProducerTest.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/producer/RedisProducerTest.java
rename to eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/producer/RedisProducerTest.java
index 946dcc830..15dd65ff0 100644
--- a/eventmesh-storage/eventmesh-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/producer/RedisProducerTest.java
+++ b/eventmesh-storage/eventmesh-connector-redis/src/test/java/org/apache/eventmesh/connector/redis/producer/RedisProducerTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.redis.producer;
+package org.apache.eventmesh.connector.redis.producer;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
-import org.apache.eventmesh.storage.redis.AbstractRedisServer;
+import org.apache.eventmesh.connector.redis.AbstractRedisServer;
import java.net.URI;
import java.nio.charset.StandardCharsets;
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/test/resources/redis-client.properties b/eventmesh-storage/eventmesh-connector-redis/src/test/resources/redis-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-redis/src/test/resources/redis-client.properties
rename to eventmesh-storage/eventmesh-connector-redis/src/test/resources/redis-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/build.gradle b/eventmesh-storage/eventmesh-connector-rocketmq/build.gradle
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-rocketmq/build.gradle
rename to eventmesh-storage/eventmesh-connector-rocketmq/build.gradle
index a586131ed..7bfcd70c4 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/build.gradle
@@ -39,10 +39,10 @@ List rocketmq = [
dependencies {
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
implementation rocketmq
- testImplementation project(":eventmesh-storage:eventmesh-storage-api")
+ testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
testImplementation project(":eventmesh-common")
testImplementation "org.mockito:mockito-core"
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/gradle.properties b/eventmesh-storage/eventmesh-connector-rocketmq/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rocketmq/gradle.properties
rename to eventmesh-storage/eventmesh-connector-rocketmq/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdmin.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdmin.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdmin.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdmin.java
index d044a7f41..c50ed358d 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdmin.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdmin.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.admin;
+package org.apache.eventmesh.connector.rocketmq.admin;
import org.apache.eventmesh.api.admin.Admin;
import org.apache.eventmesh.api.admin.TopicProperties;
import org.apache.eventmesh.common.config.ConfigService;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfiguration;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.acl.common.AclClientRPCHook;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdminAdaptor.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdminAdaptor.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdminAdaptor.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdminAdaptor.java
index d4d4124de..30134e8c5 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdminAdaptor.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/RocketMQAdminAdaptor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.admin;
+package org.apache.eventmesh.connector.rocketmq.admin;
import org.apache.eventmesh.api.admin.Admin;
import org.apache.eventmesh.api.admin.TopicProperties;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/command/Command.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/command/Command.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/command/Command.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/command/Command.java
index 3a9971be0..25c4d0d31 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/command/Command.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/admin/command/Command.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.admin.command;
+package org.apache.eventmesh.connector.rocketmq.admin.command;
import org.apache.eventmesh.common.config.ConfigService;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfiguration;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration;
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/RocketMQMessageFactory.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/RocketMQMessageFactory.java
similarity index 88%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/RocketMQMessageFactory.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/RocketMQMessageFactory.java
index 16d4fae5d..73454e407 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/RocketMQMessageFactory.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/RocketMQMessageFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.cloudevent;
+package org.apache.eventmesh.connector.rocketmq.cloudevent;
-import org.apache.eventmesh.storage.rocketmq.cloudevent.impl.RocketMQBinaryMessageReader;
-import org.apache.eventmesh.storage.rocketmq.cloudevent.impl.RocketMQHeaders;
-import org.apache.eventmesh.storage.rocketmq.cloudevent.impl.RocketMQMessageWriter;
+import org.apache.eventmesh.connector.rocketmq.cloudevent.impl.RocketMQBinaryMessageReader;
+import org.apache.eventmesh.connector.rocketmq.cloudevent.impl.RocketMQHeaders;
+import org.apache.eventmesh.connector.rocketmq.cloudevent.impl.RocketMQMessageWriter;
import org.apache.rocketmq.common.message.Message;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java
index 8ae2de739..e9ae3b696 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQBinaryMessageReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.cloudevent.impl;
+package org.apache.eventmesh.connector.rocketmq.cloudevent.impl;
import java.util.Map;
import java.util.Objects;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQHeaders.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQHeaders.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQHeaders.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQHeaders.java
index 97da5dbce..64600ae0a 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQHeaders.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQHeaders.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.cloudevent.impl;
+package org.apache.eventmesh.connector.rocketmq.cloudevent.impl;
import java.util.Map;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
index 47c4b1a78..4985130ba 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.cloudevent.impl;
+package org.apache.eventmesh.connector.rocketmq.cloudevent.impl;
import org.apache.rocketmq.common.message.Message;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/common/EventMeshConstants.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/common/EventMeshConstants.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java
index 925d0b28a..1206ef9f3 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/common/EventMeshConstants.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.common;
+package org.apache.eventmesh.connector.rocketmq.common;
public class EventMeshConstants {
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfig.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfig.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java
index 983edf4ae..232ac2f96 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfig.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.config;
+package org.apache.eventmesh.connector.rocketmq.config;
-import org.apache.eventmesh.storage.rocketmq.domain.NonStandardKeys;
+import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys;
public class ClientConfig implements NonStandardKeys {
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfiguration.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfiguration.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java
index 04654a6b3..6b2d2534d 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfiguration.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.config;
+package org.apache.eventmesh.connector.rocketmq.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/connector/ConnectorResourceServiceRocketmqImpl.java
similarity index 81%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/connector/ConnectorResourceServiceRocketmqImpl.java
index 5ee4b8eb8..6e2bb7e57 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/java/org/apache/eventmesh/storage/kafka/storage/StorageResourceServiceKafkaImpl.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/connector/ConnectorResourceServiceRocketmqImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.kafka.storage;
+package org.apache.eventmesh.connector.rocketmq.connector;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class StorageResourceServiceKafkaImpl implements StorageResourceService {
+public class ConnectorResourceServiceRocketmqImpl implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java
index 5e8def3c1..2908fc74f 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.consumer;
+package org.apache.eventmesh.connector.rocketmq.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
@@ -23,16 +23,16 @@ import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.EventMeshAsyncConsumeContext;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.storage.rocketmq.cloudevent.RocketMQMessageFactory;
-import org.apache.eventmesh.storage.rocketmq.common.EventMeshConstants;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfig;
-import org.apache.eventmesh.storage.rocketmq.domain.NonStandardKeys;
-import org.apache.eventmesh.storage.rocketmq.patch.EventMeshConsumeConcurrentlyContext;
-import org.apache.eventmesh.storage.rocketmq.patch.EventMeshConsumeConcurrentlyStatus;
-import org.apache.eventmesh.storage.rocketmq.patch.EventMeshMessageListenerConcurrently;
-import org.apache.eventmesh.storage.rocketmq.utils.BeanUtils;
-import org.apache.eventmesh.storage.rocketmq.utils.CloudEventUtils;
-import org.apache.eventmesh.storage.rocketmq.utils.OMSUtil;
+import org.apache.eventmesh.connector.rocketmq.cloudevent.RocketMQMessageFactory;
+import org.apache.eventmesh.connector.rocketmq.common.EventMeshConstants;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfig;
+import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys;
+import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext;
+import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyStatus;
+import org.apache.eventmesh.connector.rocketmq.patch.EventMeshMessageListenerConcurrently;
+import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils;
+import org.apache.eventmesh.connector.rocketmq.utils.CloudEventUtils;
+import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/RocketMQConsumerImpl.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/RocketMQConsumerImpl.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
index aa2e18584..c92eb0246 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/RocketMQConsumerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.consumer;
+package org.apache.eventmesh.connector.rocketmq.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfiguration;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration;
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/domain/NonStandardKeys.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/domain/NonStandardKeys.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java
index 2323f6cfd..a592f0b35 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/domain/NonStandardKeys.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.domain;
+package org.apache.eventmesh.connector.rocketmq.domain;
/**
* NonStandardKeys
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQMessageFormatException.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQMessageFormatException.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQMessageFormatException.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQMessageFormatException.java
index d79800146..703b7ea2b 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQMessageFormatException.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQMessageFormatException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.exception;
+package org.apache.eventmesh.connector.rocketmq.exception;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQTimeoutException.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQTimeoutException.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQTimeoutException.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQTimeoutException.java
index 8ce507997..c2a6b0341 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/exception/RMQTimeoutException.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/exception/RMQTimeoutException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.exception;
+package org.apache.eventmesh.connector.rocketmq.exception;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java
index 03fd51629..d26588500 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.patch;
+package org.apache.eventmesh.connector.rocketmq.patch;
import org.apache.eventmesh.api.AbstractContext;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java
index 9ba6d396d..468b14f56 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.patch;
+package org.apache.eventmesh.connector.rocketmq.patch;
public enum EventMeshConsumeConcurrentlyStatus {
/**
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshMessageListenerConcurrently.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
similarity index 98%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshMessageListenerConcurrently.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
index af8b47796..499a465f9 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/patch/EventMeshMessageListenerConcurrently.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.patch;
+package org.apache.eventmesh.connector.rocketmq.patch;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/AbstractProducer.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractProducer.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/AbstractProducer.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractProducer.java
index 31f2821e0..6335d49d0 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/AbstractProducer.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractProducer.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.producer;
+package org.apache.eventmesh.connector.rocketmq.producer;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfig;
-import org.apache.eventmesh.storage.rocketmq.exception.RMQMessageFormatException;
-import org.apache.eventmesh.storage.rocketmq.exception.RMQTimeoutException;
-import org.apache.eventmesh.storage.rocketmq.utils.BeanUtils;
-import org.apache.eventmesh.storage.rocketmq.utils.OMSUtil;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfig;
+import org.apache.eventmesh.connector.rocketmq.exception.RMQMessageFormatException;
+import org.apache.eventmesh.connector.rocketmq.exception.RMQTimeoutException;
+import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils;
+import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/ProducerImpl.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/ProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java
index 171c180c7..874282bfb 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/ProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.producer;
+package org.apache.eventmesh.connector.rocketmq.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
@@ -23,8 +23,8 @@ import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.storage.rocketmq.cloudevent.RocketMQMessageFactory;
-import org.apache.eventmesh.storage.rocketmq.utils.CloudEventUtils;
+import org.apache.eventmesh.connector.rocketmq.cloudevent.RocketMQMessageFactory;
+import org.apache.eventmesh.connector.rocketmq.utils.CloudEventUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.exception.MQBrokerException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/RocketMQProducerImpl.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/RocketMQProducerImpl.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java
index 2027a85db..ff11aa897 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/producer/RocketMQProducerImpl.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.producer;
+package org.apache.eventmesh.connector.rocketmq.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.producer.Producer;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.config.Config;
-import org.apache.eventmesh.storage.rocketmq.common.EventMeshConstants;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfiguration;
+import org.apache.eventmesh.connector.rocketmq.common.EventMeshConstants;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/BeanUtils.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java
similarity index 99%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/BeanUtils.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java
index fd57f7f55..0876c0bcf 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/BeanUtils.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.utils;
+package org.apache.eventmesh.connector.rocketmq.utils;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.log.ClientLogger;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/CloudEventUtils.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
similarity index 99%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/CloudEventUtils.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
index e3a58b29b..9a0d12005 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/CloudEventUtils.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/CloudEventUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.utils;
+package org.apache.eventmesh.connector.rocketmq.utils;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.common.Constants;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/OMSUtil.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/OMSUtil.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java
index 73dce7f7f..f42e64032 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/utils/OMSUtil.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.utils;
+package org.apache.eventmesh.connector.rocketmq.utils;
import org.apache.rocketmq.common.UtilAll;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
similarity index 99%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
index 78b1257ef..8bb8a1bb0 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
@@ -19,7 +19,7 @@ package org.apache.rocketmq.client.impl.consumer;
import org.apache.eventmesh.common.EventMeshThreadFactory;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.storage.rocketmq.patch.EventMeshConsumeConcurrentlyContext;
+import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext;
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
similarity index 91%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
index 208e6f87b..c76b69252 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-rocketmq=org.apache.eventmesh.storage.rocketmq.admin.RocketMQAdminAdaptor
+rocketmq=org.apache.eventmesh.connector.rocketmq.admin.RocketMQAdminAdaptor
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 89%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..fadf0de34 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+rocketmq=org.apache.eventmesh.connector.rocketmq.connector.ConnectorResourceServiceRocketmqImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 90%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 194fc2bba..0df2e286d 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+rocketmq=org.apache.eventmesh.connector.rocketmq.consumer.RocketMQConsumerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 90%
copy from eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
copy to eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 436898948..ef4959d99 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-knative=org.apache.eventmesh.storage.knative.producer.KnativeProducerImpl
+rocketmq=org.apache.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/rocketmq-client.properties b/eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/rocketmq-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/rocketmq-client.properties
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/main/resources/rocketmq-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfigurationTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfigurationTest.java
similarity index 83%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfigurationTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfigurationTest.java
index c8b3dbe2a..97309c2ef 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/eventmesh/storage/rocketmq/config/ClientConfigurationTest.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfigurationTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.rocketmq.config;
+package org.apache.eventmesh.connector.rocketmq.config;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
-import org.apache.eventmesh.storage.rocketmq.consumer.RocketMQConsumerImpl;
-import org.apache.eventmesh.storage.rocketmq.producer.RocketMQProducerImpl;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.rocketmq.consumer.RocketMQConsumerImpl;
+import org.apache.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -28,7 +28,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenRocketMQConsumerInit() {
- RocketMQConsumerImpl consumer = (RocketMQConsumerImpl) StoragePluginFactory.getMeshMQPushConsumer("rocketmq");
+ RocketMQConsumerImpl consumer = (RocketMQConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("rocketmq");
ClientConfiguration config = consumer.getClientConfiguration();
assertConfig(config);
@@ -36,7 +36,7 @@ public class ClientConfigurationTest {
@Test
public void getConfigWhenRocketMQProducerInit() {
- RocketMQProducerImpl producer = (RocketMQProducerImpl) StoragePluginFactory.getMeshMQProducer("rocketmq");
+ RocketMQProducerImpl producer = (RocketMQProducerImpl) ConnectorPluginFactory.getMeshMQProducer("rocketmq");
ClientConfiguration config = producer.getClientConfiguration();
assertConfig(config);
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/eventmesh/producer/DefaultProducerImplTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/eventmesh/producer/DefaultProducerImplTest.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/eventmesh/producer/DefaultProducerImplTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/eventmesh/producer/DefaultProducerImplTest.java
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java
index ade1ddbd1..941279f31 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java
@@ -17,8 +17,8 @@
package org.apache.rocketmq.consumer;
-import org.apache.eventmesh.storage.rocketmq.consumer.PushConsumerImpl;
-import org.apache.eventmesh.storage.rocketmq.domain.NonStandardKeys;
+import org.apache.eventmesh.connector.rocketmq.consumer.PushConsumerImpl;
+import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys;
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
index ad04d2ef0..f2f1dcf2c 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
@@ -23,8 +23,8 @@ import static org.mockito.ArgumentMatchers.any;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.storage.rocketmq.producer.AbstractProducer;
-import org.apache.eventmesh.storage.rocketmq.producer.ProducerImpl;
+import org.apache.eventmesh.connector.rocketmq.producer.AbstractProducer;
+import org.apache.eventmesh.connector.rocketmq.producer.ProducerImpl;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java
index 5e48dde40..e1ad1db26 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java
@@ -17,9 +17,9 @@
package org.apache.rocketmq.utils;
-import org.apache.eventmesh.storage.rocketmq.config.ClientConfig;
-import org.apache.eventmesh.storage.rocketmq.domain.NonStandardKeys;
-import org.apache.eventmesh.storage.rocketmq.utils.BeanUtils;
+import org.apache.eventmesh.connector.rocketmq.config.ClientConfig;
+import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys;
+import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils;
import java.util.Properties;
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
index aa0f018b1..bf0a8ddc2 100644
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer
@@ -17,4 +17,4 @@
# under the License.
#
-org.apache.eventmesh.storage.rocketmq.producer.ProducerImpl
+org.apache.eventmesh.connector.rocketmq.producer.ProducerImpl
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/test/resources/rocketmq-client.properties b/eventmesh-storage/eventmesh-connector-rocketmq/src/test/resources/rocketmq-client.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-rocketmq/src/test/resources/rocketmq-client.properties
rename to eventmesh-storage/eventmesh-connector-rocketmq/src/test/resources/rocketmq-client.properties
diff --git a/eventmesh-storage/eventmesh-storage-standalone/build.gradle b/eventmesh-storage/eventmesh-connector-standalone/build.gradle
similarity index 92%
rename from eventmesh-storage/eventmesh-storage-standalone/build.gradle
rename to eventmesh-storage/eventmesh-connector-standalone/build.gradle
index 081f1c237..952192579 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/build.gradle
+++ b/eventmesh-storage/eventmesh-connector-standalone/build.gradle
@@ -17,7 +17,7 @@
dependencies {
implementation project(":eventmesh-common")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
diff --git a/eventmesh-storage/eventmesh-storage-standalone/gradle.properties b/eventmesh-storage/eventmesh-connector-standalone/gradle.properties
similarity index 100%
rename from eventmesh-storage/eventmesh-storage-standalone/gradle.properties
rename to eventmesh-storage/eventmesh-connector-standalone/gradle.properties
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdmin.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdmin.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdmin.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdmin.java
index e8ac75cd6..13e7346af 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdmin.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdmin.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.eventmesh.storage.standalone.admin;
+package org.apache.eventmesh.connector.standalone.admin;
import org.apache.eventmesh.api.admin.Admin;
import org.apache.eventmesh.api.admin.TopicProperties;
-import org.apache.eventmesh.storage.standalone.broker.MessageQueue;
-import org.apache.eventmesh.storage.standalone.broker.StandaloneBroker;
-import org.apache.eventmesh.storage.standalone.broker.model.TopicMetadata;
+import org.apache.eventmesh.connector.standalone.broker.MessageQueue;
+import org.apache.eventmesh.connector.standalone.broker.StandaloneBroker;
+import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminAdaptor.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdminAdaptor.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminAdaptor.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdminAdaptor.java
index 86f5171ce..f3dfdd4f8 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminAdaptor.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/admin/StandaloneAdminAdaptor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.eventmesh.storage.standalone.admin;
+package org.apache.eventmesh.connector.standalone.admin;
import org.apache.eventmesh.api.admin.Admin;
import org.apache.eventmesh.api.admin.TopicProperties;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/MessageQueue.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/MessageQueue.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/MessageQueue.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/MessageQueue.java
index dfa60f29d..39e58e295 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/MessageQueue.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/MessageQueue.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker;
+package org.apache.eventmesh.connector.standalone.broker;
-import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
+import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBroker.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBroker.java
index a1e2cf4f3..5fba325c5 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBroker.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker;
+package org.apache.eventmesh.connector.standalone.broker;
-import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
-import org.apache.eventmesh.storage.standalone.broker.model.TopicMetadata;
-import org.apache.eventmesh.storage.standalone.broker.task.HistoryMessageClearTask;
+import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
+import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
+import org.apache.eventmesh.connector.standalone.broker.task.HistoryMessageClearTask;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/MessageEntity.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/MessageEntity.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/MessageEntity.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/MessageEntity.java
index 27fc59df9..0225874b7 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/MessageEntity.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/MessageEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker.model;
+package org.apache.eventmesh.connector.standalone.broker.model;
import java.io.Serializable;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/TopicMetadata.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/TopicMetadata.java
similarity index 96%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/TopicMetadata.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/TopicMetadata.java
index 591ac9c3b..bf4a249a0 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/model/TopicMetadata.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/model/TopicMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker.model;
+package org.apache.eventmesh.connector.standalone.broker.model;
import java.io.Serializable;
import java.util.Objects;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/HistoryMessageClearTask.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/HistoryMessageClearTask.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
index 156966a18..9b1b33df5 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/HistoryMessageClearTask.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/HistoryMessageClearTask.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker.task;
+package org.apache.eventmesh.connector.standalone.broker.task;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.storage.standalone.broker.MessageQueue;
-import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
-import org.apache.eventmesh.storage.standalone.broker.model.TopicMetadata;
+import org.apache.eventmesh.connector.standalone.broker.MessageQueue;
+import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
+import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/SubScribeTask.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/SubScribeTask.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
index 1f6f32222..00e311476 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/task/SubScribeTask.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/broker/task/SubScribeTask.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker.task;
+package org.apache.eventmesh.connector.standalone.broker.task;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.EventMeshAction;
import org.apache.eventmesh.api.EventMeshAsyncConsumeContext;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.storage.standalone.broker.StandaloneBroker;
+import org.apache.eventmesh.connector.standalone.broker.StandaloneBroker;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumer.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumer.java
similarity index 93%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumer.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumer.java
index eb019494e..7fc989b8b 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumer.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumer.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.consumer;
+package org.apache.eventmesh.connector.standalone.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
import org.apache.eventmesh.common.ThreadPoolFactory;
-import org.apache.eventmesh.storage.standalone.broker.StandaloneBroker;
-import org.apache.eventmesh.storage.standalone.broker.model.TopicMetadata;
-import org.apache.eventmesh.storage.standalone.broker.task.SubScribeTask;
+import org.apache.eventmesh.connector.standalone.broker.StandaloneBroker;
+import org.apache.eventmesh.connector.standalone.broker.model.TopicMetadata;
+import org.apache.eventmesh.connector.standalone.broker.task.SubScribeTask;
import java.util.List;
import java.util.Objects;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumerAdaptor.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumerAdaptor.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumerAdaptor.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumerAdaptor.java
index fcd631fa3..1fe3eb19b 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/consumer/StandaloneConsumerAdaptor.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/consumer/StandaloneConsumerAdaptor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.consumer;
+package org.apache.eventmesh.connector.standalone.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducer.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
similarity index 95%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducer.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
index adfb1e30f..b09c8ba24 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducer.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducer.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.producer;
+package org.apache.eventmesh.connector.standalone.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.exception.OnExceptionContext;
-import org.apache.eventmesh.storage.standalone.broker.StandaloneBroker;
-import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
+import org.apache.eventmesh.connector.standalone.broker.StandaloneBroker;
+import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducerAdaptor.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducerAdaptor.java
similarity index 97%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducerAdaptor.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducerAdaptor.java
index 7236155e2..d85161a54 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/producer/StandaloneProducerAdaptor.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/producer/StandaloneProducerAdaptor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.producer;
+package org.apache.eventmesh.connector.standalone.producer;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/storage/StorageResourceServicePulsarImpl.java b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/resource/StandaloneConnectorResourceService.java
similarity index 81%
rename from eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/storage/StorageResourceServicePulsarImpl.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/resource/StandaloneConnectorResourceService.java
index 7b09cc685..877d12f3b 100644
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/java/org/apache/eventmesh/storage/pulsar/storage/StorageResourceServicePulsarImpl.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/java/org/apache/eventmesh/connector/standalone/resource/StandaloneConnectorResourceService.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.pulsar.storage;
+package org.apache.eventmesh.connector.standalone.resource;
-import org.apache.eventmesh.api.storage.StorageResourceService;
+import org.apache.eventmesh.api.connector.ConnectorResourceService;
-public class StorageResourceServicePulsarImpl implements StorageResourceService {
+public class StandaloneConnectorResourceService implements ConnectorResourceService {
@Override
public void init() throws Exception {
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
similarity index 90%
rename from eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
index 25ac1b73a..2cfd20933 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.admin.Admin
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-standalone=org.apache.eventmesh.storage.standalone.admin.StandaloneAdminAdaptor
+standalone=org.apache.eventmesh.connector.standalone.admin.StandaloneAdminAdaptor
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
similarity index 89%
copy from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
copy to eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
index 194fc2bba..7b8e94811 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.connector.ConnectorResourceService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+standalone=org.apache.eventmesh.connector.standalone.resource.StandaloneConnectorResourceService
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
index 194fc2bba..5ceb0eda9 100644
--- a/eventmesh-storage/eventmesh-storage-kafka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-kafka=org.apache.eventmesh.storage.kafka.consumer.KafkaConsumerImpl
+standalone=org.apache.eventmesh.connector.standalone.consumer.StandaloneConsumerAdaptor
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
similarity index 89%
rename from eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
rename to eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
index 436898948..1b30d9837 100644
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-knative=org.apache.eventmesh.storage.knative.producer.KnativeProducerImpl
+standalone=org.apache.eventmesh.connector.standalone.producer.StandaloneProducerAdaptor
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/test/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBrokerTest.java b/eventmesh-storage/eventmesh-connector-standalone/src/test/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBrokerTest.java
similarity index 94%
rename from eventmesh-storage/eventmesh-storage-standalone/src/test/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBrokerTest.java
rename to eventmesh-storage/eventmesh-connector-standalone/src/test/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBrokerTest.java
index 106b7dd14..651b18d74 100644
--- a/eventmesh-storage/eventmesh-storage-standalone/src/test/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBrokerTest.java
+++ b/eventmesh-storage/eventmesh-connector-standalone/src/test/java/org/apache/eventmesh/connector/standalone/broker/StandaloneBrokerTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.storage.standalone.broker;
+package org.apache.eventmesh.connector.standalone.broker;
-import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
+import org.apache.eventmesh.connector.standalone.broker.model.MessageEntity;
import java.net.URI;
@@ -70,4 +70,4 @@ public class StandaloneBrokerTest {
@Test
public void checkTopicExist() {
}
-}
+}
\ No newline at end of file
diff --git a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index 0ed770c02..000000000
--- a/eventmesh-storage/eventmesh-storage-knative/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-knative=org.apache.eventmesh.storage.knative.storage.StorageResourceServiceKnativeImpl
diff --git a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index 86dc55f71..000000000
--- a/eventmesh-storage/eventmesh-storage-pravega/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-pravega=org.apache.eventmesh.storage.pravega.PravegaStorageResourceServiceImpl
diff --git a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index 420be220a..000000000
--- a/eventmesh-storage/eventmesh-storage-pulsar/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-pulsar=org.apache.eventmesh.storage.pulsar.storage.StorageResourceServicePulsarImpl
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
deleted file mode 100644
index ca6409d51..000000000
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rabbitmq=org.apache.eventmesh.storage.rabbitmq.consumer.RabbitmqConsumer
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
deleted file mode 100644
index 68043690b..000000000
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rabbitmq=org.apache.eventmesh.storage.rabbitmq.producer.RabbitmqProducer
diff --git a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index 31a4aecfc..000000000
--- a/eventmesh-storage/eventmesh-storage-rabbitmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rabbitmq=org.apache.eventmesh.storage.rabbitmq.storage.RabbitmqStorageResourceService
diff --git a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index c0aad212e..000000000
--- a/eventmesh-storage/eventmesh-storage-redis/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-redis=org.apache.eventmesh.storage.redis.storage.RedisStorageResourceService
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
deleted file mode 100644
index 06b79503b..000000000
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rocketmq=org.apache.eventmesh.storage.rocketmq.consumer.RocketMQConsumerImpl
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
deleted file mode 100644
index 22659fc32..000000000
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rocketmq=org.apache.eventmesh.storage.rocketmq.producer.RocketMQProducerImpl
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index f643ef6ee..000000000
--- a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-rocketmq=org.apache.eventmesh.storage.rocketmq.storage.StorageResourceServiceRocketmqImpl
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/resource/StandaloneStorageResourceService.java b/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/resource/StandaloneStorageResourceService.java
deleted file mode 100644
index db13d8b38..000000000
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/resource/StandaloneStorageResourceService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.apache.eventmesh.storage.standalone.resource;
-
-import org.apache.eventmesh.api.storage.StorageResourceService;
-
-public class StandaloneStorageResourceService implements StorageResourceService {
-
- @Override
- public void init() throws Exception {
-
- }
-
- @Override
- public void release() throws Exception {
-
- }
-}
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer b/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
deleted file mode 100644
index b3d2eb0ea..000000000
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.Consumer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-standalone=org.apache.eventmesh.storage.standalone.consumer.StandaloneConsumerAdaptor
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer b/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
deleted file mode 100644
index 629b9ba20..000000000
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.Producer
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-standalone=org.apache.eventmesh.storage.standalone.producer.StandaloneProducerAdaptor
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService b/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
deleted file mode 100644
index 6613c7b87..000000000
--- a/eventmesh-storage/eventmesh-storage-standalone/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.storage.StorageResourceService
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-standalone=org.apache.eventmesh.storage.standalone.resource.StandaloneStorageResourceService
diff --git a/eventmesh-webhook/eventmesh-webhook-receive/build.gradle b/eventmesh-webhook/eventmesh-webhook-receive/build.gradle
index 46858f5bd..8ed5266c7 100644
--- a/eventmesh-webhook/eventmesh-webhook-receive/build.gradle
+++ b/eventmesh-webhook/eventmesh-webhook-receive/build.gradle
@@ -20,7 +20,7 @@ dependencies {
compileOnly project(":eventmesh-common")
implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-api")
implementation project(":eventmesh-webhook:eventmesh-webhook-api")
- implementation project(":eventmesh-storage:eventmesh-storage-api")
+ implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
diff --git a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookMQProducer.java b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookMQProducer.java
index 4b02e85a9..f822175c5 100644
--- a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookMQProducer.java
+++ b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookMQProducer.java
@@ -19,7 +19,7 @@ package org.apache.eventmesh.webhook.receive;
import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
-import org.apache.eventmesh.api.factory.StoragePluginFactory;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import org.apache.eventmesh.api.producer.Producer;
import java.util.Objects;
@@ -32,7 +32,7 @@ public class WebHookMQProducer {
private transient Producer hookMQProducer;
public WebHookMQProducer(final Properties properties, String connectorPluginType) throws Exception {
- this.hookMQProducer = StoragePluginFactory.getMeshMQProducer(connectorPluginType);
+ this.hookMQProducer = ConnectorPluginFactory.getMeshMQProducer(connectorPluginType);
Objects.requireNonNull(hookMQProducer, "doesn't load the hookMQProducer plugin, please check.");
this.hookMQProducer.init(properties);
diff --git a/settings.gradle b/settings.gradle
index 2275fdd99..b5ff92e8f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,15 +23,15 @@ include 'eventmesh-common'
include 'eventmesh-starter'
include 'eventmesh-examples'
include 'eventmesh-spi'
-include 'eventmesh-storage:eventmesh-storage-api'
-include 'eventmesh-storage:eventmesh-storage-knative'
-include 'eventmesh-storage:eventmesh-storage-pravega'
-include 'eventmesh-storage:eventmesh-storage-rocketmq'
-include 'eventmesh-storage:eventmesh-storage-rabbitmq'
-include 'eventmesh-storage:eventmesh-storage-standalone'
-include 'eventmesh-storage:eventmesh-storage-kafka'
-include 'eventmesh-storage:eventmesh-storage-pulsar'
-include 'eventmesh-storage:eventmesh-storage-redis'
+include 'eventmesh-connector-plugin:eventmesh-connector-api'
+include 'eventmesh-connector-plugin:eventmesh-connector-knative'
+include 'eventmesh-connector-plugin:eventmesh-connector-pravega'
+include 'eventmesh-connector-plugin:eventmesh-connector-rocketmq'
+include 'eventmesh-connector-plugin:eventmesh-connector-rabbitmq'
+include 'eventmesh-connector-plugin:eventmesh-connector-standalone'
+include 'eventmesh-connector-plugin:eventmesh-connector-kafka'
+include 'eventmesh-connector-plugin:eventmesh-connector-pulsar'
+include 'eventmesh-connector-plugin:eventmesh-connector-redis'
include 'eventmesh-security-plugin:eventmesh-security-api'
include 'eventmesh-security-plugin:eventmesh-security-acl'
include 'eventmesh-registry-plugin:eventmesh-registry-api'
@@ -66,4 +66,4 @@ include 'eventmesh-trace-plugin:eventmesh-trace-jaeger'
include 'eventmesh-webhook'
include 'eventmesh-webhook:eventmesh-webhook-api'
include 'eventmesh-webhook:eventmesh-webhook-admin'
-include 'eventmesh-webhook:eventmesh-webhook-receive'
+include 'eventmesh-webhook:eventmesh-webhook-receive'
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org