XD-22 refactored dirt to depend on module

Author: markfisher

build.gradle

@@ -82,14 +82,15 @@ project('spring-xd-analytics') {
 project('spring-xd-dirt') {
 	description = 'Spring XD DIRT'
 	dependencies {
+		compile project(":spring-xd-module")
 		compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
 		compile "org.springframework.integration:spring-integration-event:$springIntegrationVersion"
 		compile "org.springframework.integration:spring-integration-redis:$springIntegrationVersion"
 	}
 }
 
 project('spring-xd-module') {
-	description = 'Spring XD Anaytics'
+	description = 'Spring XD Module'
 	dependencies {
 		compile "org.springframework:spring-context:$springVersion"
 	}

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/core/Module.java

@@ -16,7 +16,7 @@
 
 package org.springframework.xd.dirt.event;
 
-import org.springframework.xd.dirt.core.Module;
+import org.springframework.xd.module.Module;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/core/Plugin.java

@@ -16,7 +16,7 @@
 
 package org.springframework.xd.dirt.event;
 
-import org.springframework.xd.dirt.core.Module;
+import org.springframework.xd.module.Module;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/event/AbstractModuleEvent.java

@@ -16,7 +16,7 @@
 
 package org.springframework.xd.dirt.event;
 
-import org.springframework.xd.dirt.core.Module;
+import org.springframework.xd.module.Module;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/event/ModuleDeployedEvent.java

@@ -25,10 +25,10 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.xd.dirt.core.Module;
 import org.springframework.xd.dirt.event.AbstractModuleEvent;
 import org.springframework.xd.dirt.event.ModuleDeployedEvent;
 import org.springframework.xd.dirt.event.ModuleUndeployedEvent;
+import org.springframework.xd.module.Module;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/event/ModuleUndeployedEvent.java

@@ -17,7 +17,8 @@
 package org.springframework.xd.dirt.module;
 
 import org.springframework.core.io.Resource;
-import org.springframework.xd.dirt.core.Module;
+import org.springframework.xd.module.Module;
+import org.springframework.xd.module.SimpleModule;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/listener/RedisModuleEventListener.java

@@ -34,10 +34,10 @@
 import org.springframework.integration.Message;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.util.Assert;
-import org.springframework.xd.dirt.core.Module;
-import org.springframework.xd.dirt.core.Plugin;
 import org.springframework.xd.dirt.event.ModuleDeployedEvent;
 import org.springframework.xd.dirt.event.ModuleUndeployedEvent;
+import org.springframework.xd.module.Module;
+import org.springframework.xd.module.Plugin;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/module/AbstractModule.java

@@ -16,7 +16,7 @@
 
 package org.springframework.xd.dirt.module;
 
-import org.springframework.xd.dirt.core.Module;
+import org.springframework.xd.module.Module;
 
 /**
  * @author Mark Fisher

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/module/AbstractModuleRegistry.java

@@ -16,8 +16,8 @@
 
 package tmp;
 
-import org.springframework.xd.dirt.core.Module;
-import org.springframework.xd.dirt.core.Plugin;
+import org.springframework.xd.module.Module;
+import org.springframework.xd.module.Plugin;
 
 public class SamplePlugin implements Plugin {
 

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/module/ModuleDeployer.java

@@ -1 +1,2 @@
 /*.iml
+/bin

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/module/ModuleRegistry.java

@@ -0,0 +1 @@
+/bin

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/module/SimpleModule.java

@@ -27,8 +27,8 @@ public abstract class AbstractModule implements Module {
 	private final String name;
 
 	private final String type;
-	
-	private String instanceId;
+
+	private volatile String instanceId;
 
 	public AbstractModule(String name, String type) {
 		Assert.notNull(name, "name must not be null");
@@ -47,18 +47,18 @@ public String getType() {
 		return this.type;
 	}
 
-	@Override
-	public String toString() {
-		return "Module [name=" + name + ", type=" + type + "]";
-	}
-	
 	@Override
 	public String getInstanceId() {
 		return this.instanceId;
 	}
-	
+
 	public void setInstanceId(String instanceId) {
 		this.instanceId = instanceId;
 	}
 
+	@Override
+	public String toString() {
+		return "Module [name=" + name + ", type=" + type + "]";
+	}
+
 }