remove cola-extensionwhich if for internal use

sunquanchao · Sep 1, 2019 · bff3be5 · bff3be5
1 parent 146f59d
commit bff3be5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 40 deletions.
diff --git a/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -15,10 +15,6 @@
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.alibaba.cola</groupId>
-			<artifactId>cola-extension</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

diff --git a/...sources/__rootArtifactId__-client/src/main/java/dto/domainevent/CustomerCreatedEvent.java b/...sources/__rootArtifactId__-client/src/main/java/dto/domainevent/CustomerCreatedEvent.java
@@ -3,7 +3,7 @@
 #set( $symbol_escape = '\' )
 package ${package}.dto.domainevent;
 
-import com.alibaba.cola.dto.DomainEvent;
+import com.alibaba.cola.event.DomainEventI;
 
 import static ${package}.dto.domainevent.DomainEventConstant.CUSTOMER_CREATED_TOPIC;
 
@@ -13,7 +13,7 @@
  * @author Frank Zhang
  * @date 2019-01-04 10:32 AM
  */
-public class CustomerCreatedEvent extends DomainEvent {
+public class CustomerCreatedEvent implements DomainEventI {
 
     private String customerId;
 
@@ -25,8 +25,4 @@ public void setCustomerId(String customerId) {
         this.customerId = customerId;
     }
 
-    @Override
-    public String getEventTopic() {
-        return CUSTOMER_CREATED_TOPIC;
-    }
 }
diff --git a/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -11,24 +11,24 @@
 	<version>${version}</version>
 	<name>${artifactId}</name>
 	<dependencies>
-		<dependency>
-			<groupId>${groupId}</groupId>
-			<artifactId>${rootArtifactId}-client</artifactId>
-		</dependency>
 		<!-- COLA Framework -->
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
-			<artifactId>cola-extension</artifactId>
+			<artifactId>cola-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-test</artifactId>
 		</dependency>
 		<!-- COLA Framework End-->
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>${rootArtifactId}-client</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
@@ -32,11 +32,6 @@
                 <artifactId>cola-core</artifactId>
                 <version>${cola.framework.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.alibaba.cola</groupId>
-                <artifactId>cola-extension</artifactId>
-                <version>${cola.framework.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.alibaba.cola</groupId>
                 <artifactId>cola-test</artifactId>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -15,10 +15,6 @@
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.alibaba.cola</groupId>
-			<artifactId>cola-extension</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

diff --git a/...sources/__rootArtifactId__-client/src/main/java/dto/domainevent/CustomerCreatedEvent.java b/...sources/__rootArtifactId__-client/src/main/java/dto/domainevent/CustomerCreatedEvent.java
@@ -3,7 +3,7 @@
 #set( $symbol_escape = '\' )
 package ${package}.dto.domainevent;
 
-import com.alibaba.cola.dto.DomainEvent;
+import com.alibaba.cola.event.DomainEventI;
 
 import static ${package}.dto.domainevent.DomainEventConstant.CUSTOMER_CREATED_TOPIC;
 
@@ -13,7 +13,7 @@
  * @author Frank Zhang
  * @date 2019-01-04 10:32 AM
  */
-public class CustomerCreatedEvent extends DomainEvent {
+public class CustomerCreatedEvent implements DomainEventI {
 
     private String customerId;
 
@@ -25,8 +25,4 @@ public void setCustomerId(String customerId) {
         this.customerId = customerId;
     }
 
-    @Override
-    public String getEventTopic() {
-        return CUSTOMER_CREATED_TOPIC;
-    }
 }
diff --git a/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -11,24 +11,24 @@
 	<version>${version}</version>
 	<name>${artifactId}</name>
 	<dependencies>
-		<dependency>
-			<groupId>${groupId}</groupId>
-			<artifactId>${rootArtifactId}-client</artifactId>
-		</dependency>
 		<!-- COLA Framework -->
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
-			<artifactId>cola-extension</artifactId>
+			<artifactId>cola-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>
 			<artifactId>cola-test</artifactId>
 		</dependency>
 		<!-- COLA Framework End-->
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>${rootArtifactId}-client</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -32,11 +32,6 @@
                 <artifactId>cola-core</artifactId>
                 <version>${cola.framework.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.alibaba.cola</groupId>
-                <artifactId>cola-extension</artifactId>
-                <version>${cola.framework.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.alibaba.cola</groupId>
                 <artifactId>cola-test</artifactId>