refactor package name

zutherb · Sep 19, 2014 · 470038f · 470038f
1 parent 69ed88c
commit 470038f
Show file tree

Hide file tree

Showing 86 changed files with 327 additions and 332 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Create buildlight.properties in <buildlight directory>/bin - folder.
 build.server=Jenkins
 jenkins.server.url=http://localhost:8080/build-server
 jenkins.build.name=Build-Light-Test-Build
-buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.ClewareDriverFactoryBean
+buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.ClewareDriverFactoryBean
 ```
 
 [![Build Light](picture/Build-Light.jpg)](http://youtu.be/ArT32kL_j9g)
@@ -70,7 +70,7 @@ bamboo.server.url=http://localhost:8080/build-server
 bamboo.build.key=BUILDLIGHT_JOB
 bamboo.username=zutherb
 bamboo.password=t0ps3cr3t
-buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.BlinkStickDriverFactoryBean
+buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.BlinkStickDriverFactoryBean
 ```
 
 [![Build Light](picture/Build-Light.jpg)](http://youtu.be/IfQtBqZTjnQ)
@@ -105,7 +105,7 @@ Step 3: Create buildlight.properties in <buildlight-pi directory>/bin - folder.
 build.server=Jenkins
 jenkins.server.url=http://localhost:8080/build-server
 jenkins.build.name=Build-Light-Test-Build
-buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.ArduinoDriverFactoryBean
+buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.ArduinoDriverFactoryBean
 #buildlight.arduino.port=/dev/ttyACM0 [Default]
 #buildlight.arduino.switch.on.level=HIGH [Default - Choose LOW ,e.g. when relays switch on low pegal]
 
@@ -121,14 +121,14 @@ Cleware Traffic Java Driver
 #### Maven ####
 ```java
 <dependency>
-  <groupId>com.comsysto.buildlight</groupId>
+  <groupId>com.github.zutherb.buildlight</groupId>
   <artifactId>cleware-driver</artifactId>
   <version>1.0</version>
 </dependency>
 ```
 #### Gradle ####
 ```groovy
-compile "com.comsysto.buildlight:cleware-driver:1.0"
+compile "com.github.zutherb.buildlight.:cleware-driver:1.0"
 ```
 #### Java ####
 ```java

diff --git a/app/buildlight-pi/build.gradle b/app/buildlight-pi/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'application'
 
-mainClassName = "com.comsysto.buildlight.application.Runner"
+mainClassName = "com.github.zutherb.buildlight.application.Runner"
 
-group = 'com.comsysto.buildlight'
+group = 'com.github.zutherb.buildlight'
 
 repositories {
     mavenCentral()

diff --git a/app/buildlight/build.gradle b/app/buildlight/build.gradle
@@ -1,9 +1,9 @@
+apply plugin: 'groovy'
 apply plugin: 'application'
 apply plugin: 'macAppBundle'
+apply plugin: 'spring-boot'
 
-
-
-def runnerClassName = "com.comsysto.buildlight.application.Runner"
+def runnerClassName = "com.github.zutherb.buildlight.application.Runner"
 
 mainClassName = runnerClassName
 
@@ -18,15 +18,17 @@ buildscript {
     }
     dependencies {
         classpath 'com.github.zutherb.gradle:gradle-macappbundle:0.1'
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:1.1.3.RELEASE"
     }
 }
 
-group = 'com.comsysto.buildlight'
+group = 'com.github.zutherb.buildlight.'
 
 sourceSets {
     main {
         resources {
             srcDir 'src/main/java'
+            srcDir 'src/main/groovy'
             srcDir 'src/main/resources'
         }
     }
@@ -67,7 +69,7 @@ jar {
         attributes(
                 "Implementation-Title": "Build Light Application",
                 "Implementation-Version": "${version}",
-                "Author": "Bernd Zuther <bernd.zuther@comsysto.com>",
+                "Author": "Bernd Zuther <bernd.zuther@codecentric.de>",
                 "Main-Class": "${runnerClassName}"
         )
     }

diff --git a/...ildlight/application/BuildServerType.java → ...ildlight/application/BuildServerType.java b/...ildlight/application/BuildServerType.java → ...ildlight/application/BuildServerType.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.application;
+package com.github.zutherb.buildlight.application;
 
 /**
  * @author zutherb

diff --git a/...dlight/application/ConfigurationFile.java → ...dlight/application/ConfigurationFile.java b/...dlight/application/ConfigurationFile.java → ...dlight/application/ConfigurationFile.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.application;
+package com.github.zutherb.buildlight.application;
 
 import org.apache.commons.lang.NotImplementedException;
 

diff --git a/...msysto/buildlight/application/Runner.java → ...utherb/buildlight/application/Runner.java b/...msysto/buildlight/application/Runner.java → ...utherb/buildlight/application/Runner.java
@@ -1,6 +1,6 @@
-package com.comsysto.buildlight.application;
+package com.github.zutherb.buildlight.application;
 
-import com.comsysto.buildlight.arduino.driver.core.Arduino;
+import com.github.zutherb.buildlight.arduino.driver.core.Arduino;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,7 +10,7 @@
 import java.util.Properties;
 import java.util.Scanner;
 
-import static com.comsysto.buildlight.application.ConfigurationFile.*;
+import static com.github.zutherb.buildlight.application.ConfigurationFile.*;
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
 
@@ -40,7 +40,7 @@ private static void lunchApplication() throws IOException {
         System.setProperty("spring.profiles.active", builderServer.toLowerCase());
         System.setProperty("buildlight.property.file", CONFIGURATION_FILE.getAbsolutePath());
 
-        stayAliveTillKeyboardInteractionIsProcessed(new ClassPathXmlApplicationContext("classpath:/com/comsysto/buildlight/application/spring-context.xml"));
+        stayAliveTillKeyboardInteractionIsProcessed(new ClassPathXmlApplicationContext("classpath:/com.github.zutherb.buildlight.application/spring-context.xml"));
     }
 
     private static String getBuildServerName(Properties properties) {
@@ -82,10 +82,10 @@ private static void printHelpMessage() {
         LOGGER.error("Bamboo example:\n");
         LOGGER.error(BAMBOO_DEFAULT_CONFIGURATION);
         LOGGER.error("Driver Factory Beans:\n");
-        LOGGER.error("buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.ArduinoDriverFactoryBean\n");
-        LOGGER.error("buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.BlinkStickDriverFactoryBean\n");
-        LOGGER.error("buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.ClewareDriverFactoryBean\n");
-        LOGGER.error("buildlight.driver.factorybean=com.comsysto.buildlight.application.driver.ConsoleTrafficLightFactoryBean [Default]\n");
+        LOGGER.error("buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.ArduinoDriverFactoryBean\n");
+        LOGGER.error("buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.BlinkStickDriverFactoryBean\n");
+        LOGGER.error("buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.ClewareDriverFactoryBean\n");
+        LOGGER.error("buildlight.driver.factorybean=com.github.zutherb.buildlight.application.driver.ConsoleTrafficLightFactoryBean [Default]\n");
         LOGGER.error("");
         LOGGER.error("Available Serial Port:\n");
         String[] portList = Arduino.list();

diff --git a/...ht/application/adapter/BambooAdapter.java → ...ht/application/adapter/BambooAdapter.java b/...ht/application/adapter/BambooAdapter.java → ...ht/application/adapter/BambooAdapter.java
@@ -1,9 +1,9 @@
-package com.comsysto.buildlight.application.adapter;
+package com.github.zutherb.buildlight.application.adapter;
 
-import com.comsysto.buildlight.respository.bamboo.api.BambooRepository;
-import com.comsysto.buildlight.respository.bamboo.model.BambooPlanResponse;
-import com.comsysto.buildlight.respository.bamboo.model.BambooResultResponse;
-import com.comsysto.buildlight.respository.bamboo.model.Result;
+import com.github.zutherb.buildlight.respository.bamboo.api.BambooRepository;
+import com.github.zutherb.buildlight.respository.bamboo.model.BambooPlanResponse;
+import com.github.zutherb.buildlight.respository.bamboo.model.BambooResultResponse;
+import com.github.zutherb.buildlight.respository.bamboo.model.Result;
 
 import java.util.List;
 

diff --git a/...plication/adapter/BuildServerAdapter.java → ...plication/adapter/BuildServerAdapter.java b/...plication/adapter/BuildServerAdapter.java → ...plication/adapter/BuildServerAdapter.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.application.adapter;
+package com.github.zutherb.buildlight.application.adapter;
 
 /**
  * @author zutherb

diff --git a/...on/adapter/BuildServerAdapterFactory.java → ...on/adapter/BuildServerAdapterFactory.java b/...on/adapter/BuildServerAdapterFactory.java → ...on/adapter/BuildServerAdapterFactory.java
@@ -1,6 +1,6 @@
-package com.comsysto.buildlight.application.adapter;
+package com.github.zutherb.buildlight.application.adapter;
 
-import com.comsysto.buildlight.respository.common.BuildServerRepository;
+import com.github.zutherb.buildlight.respository.common.BuildServerRepository;
 import org.reflections.Reflections;
 
 import java.lang.reflect.Constructor;
@@ -11,7 +11,7 @@
  */
 public class BuildServerAdapterFactory {
 
-    private final static Reflections reflections = new Reflections("com.comsysto.buildlight.application.adapter");
+    private final static Reflections reflections = new Reflections("com.github.zutherb.buildlight.application.adapter");
 
     public static BuildServerAdapter create(BuildServerRepository repository) {
         Set<Class<? extends BuildServerAdapter>> classes = reflections.getSubTypesOf(BuildServerAdapter.class);

diff --git a/...light/application/adapter/BuildState.java → ...light/application/adapter/BuildState.java b/...light/application/adapter/BuildState.java → ...light/application/adapter/BuildState.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.application.adapter;
+package com.github.zutherb.buildlight.application.adapter;
 
 
-import com.comsysto.buildlight.common.driver.core.Color;
+import com.github.zutherb.buildlight.common.driver.core.Color;
 
 /**
  * @author zutherb

diff --git a/...t/application/adapter/JenkinsAdapter.java → ...t/application/adapter/JenkinsAdapter.java b/...t/application/adapter/JenkinsAdapter.java → ...t/application/adapter/JenkinsAdapter.java
@@ -1,8 +1,8 @@
-package com.comsysto.buildlight.application.adapter;
+package com.github.zutherb.buildlight.application.adapter;
 
-import com.comsysto.buildlight.respository.jenkins.api.JenkinsRepository;
-import com.comsysto.buildlight.respository.jenkins.model.Build;
-import com.comsysto.buildlight.respository.jenkins.model.JenkinsBuildResponse;
+import com.github.zutherb.buildlight.respository.jenkins.api.JenkinsRepository;
+import com.github.zutherb.buildlight.respository.jenkins.model.Build;
+import com.github.zutherb.buildlight.respository.jenkins.model.JenkinsBuildResponse;
 
 import java.util.List;
 

diff --git a/...iver/AbstractTrafficLightFactoryBean.java → ...iver/AbstractTrafficLightFactoryBean.java b/...iver/AbstractTrafficLightFactoryBean.java → ...iver/AbstractTrafficLightFactoryBean.java
@@ -1,6 +1,6 @@
-package com.comsysto.buildlight.application.driver;
+package com.github.zutherb.buildlight.application.driver;
 
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 import org.springframework.beans.factory.FactoryBean;
 
 /**

diff --git a/...tion/driver/ArduinoDriverFactoryBean.java → ...tion/driver/ArduinoDriverFactoryBean.java b/...tion/driver/ArduinoDriverFactoryBean.java → ...tion/driver/ArduinoDriverFactoryBean.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.application.driver;
+package com.github.zutherb.buildlight.application.driver;
 
-import com.comsysto.buildlight.arduino.driver.trafficlight.ArduinoTrafficLightFactory;
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.arduino.driver.trafficlight.ArduinoTrafficLightFactory;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 import org.springframework.beans.factory.annotation.Value;
 
 /**

diff --git a/...n/driver/BlinkStickDriverFactoryBean.java → ...n/driver/BlinkStickDriverFactoryBean.java b/...n/driver/BlinkStickDriverFactoryBean.java → ...n/driver/BlinkStickDriverFactoryBean.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.application.driver;
+package com.github.zutherb.buildlight.application.driver;
 
-import com.comsysto.buildlight.blinkstick.driver.trafficlight.BlinkStickLightFactory;
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.blinkstick.driver.trafficlight.BlinkStickLightFactory;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 
 /**
  * @author zutherb

diff --git a/...tion/driver/ClewareDriverFactoryBean.java → ...tion/driver/ClewareDriverFactoryBean.java b/...tion/driver/ClewareDriverFactoryBean.java → ...tion/driver/ClewareDriverFactoryBean.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.application.driver;
+package com.github.zutherb.buildlight.application.driver;
 
-import com.comsysto.buildlight.blinkstick.driver.trafficlight.ClewareLightFactory;
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.blinkstick.driver.trafficlight.ClewareLightFactory;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 
 /**
  * @author zutherb

diff --git a/...river/ConsoleTrafficLightFactoryBean.java → ...river/ConsoleTrafficLightFactoryBean.java b/...river/ConsoleTrafficLightFactoryBean.java → ...river/ConsoleTrafficLightFactoryBean.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.application.driver;
+package com.github.zutherb.buildlight.application.driver;
 
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
-import com.comsysto.buildlight.common.driver.trafficlight.ConsoleTrafficLight;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.common.driver.trafficlight.ConsoleTrafficLight;
 
 /**
  * @author zutherb

diff --git a/...dlight/application/job/ColorSwitcher.java → ...dlight/application/job/ColorSwitcher.java b/...dlight/application/job/ColorSwitcher.java → ...dlight/application/job/ColorSwitcher.java
@@ -1,10 +1,10 @@
-package com.comsysto.buildlight.application.job;
+package com.github.zutherb.buildlight.application.job;
 
-import com.comsysto.buildlight.application.adapter.BuildServerAdapter;
-import com.comsysto.buildlight.application.adapter.BuildServerAdapterFactory;
-import com.comsysto.buildlight.application.adapter.BuildState;
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
-import com.comsysto.buildlight.respository.common.BuildServerRepository;
+import com.github.zutherb.buildlight.application.adapter.BuildServerAdapter;
+import com.github.zutherb.buildlight.application.adapter.BuildServerAdapterFactory;
+import com.github.zutherb.buildlight.application.adapter.BuildState;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.respository.common.BuildServerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/...buildlight/application/spring-context.xml → ...buildlight/application/spring-context.xml b/...buildlight/application/spring-context.xml → ...buildlight/application/spring-context.xml
@@ -10,13 +10,13 @@
             http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
             http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <context:component-scan base-package="com.comsysto.buildlight.application"/>
+    <context:component-scan base-package="com.github.zutherb.buildlight.application"/>
 
     <task:annotation-driven scheduler="taskScheduler"/>
     <task:scheduler id="taskScheduler" pool-size="1"/>
 
-    <import resource="classpath:/com/buildlight/respository/bamboo/spring-context.xml"/>
-    <import resource="classpath:/com/buildlight/respository/jenkins/spring-context.xml"/>
+    <import resource="classpath:/com.github.zutherb.buildlight.respository.bamboo/spring-context.xml"/>
+    <import resource="classpath:/om.github.zutherb.buildlight.respository.jenkins/spring-context.xml"/>
 
     <context:property-placeholder system-properties-mode="OVERRIDE"
                                   location="file:${buildlight.property.file}"
@@ -26,7 +26,7 @@
         <prop key="buildlight.read.timeout">1000</prop>
         <prop key="buildlight.connection.timeout">1000</prop>
         <prop key="buildlight.driver.factorybean">
-            com.comsysto.buildlight.application.driver.ConsoleTrafficLightFactoryBean
+            com.github.zutherb.buildlight.application.driver.ConsoleTrafficLightFactoryBean
         </prop>
         <prop key="buildlight.arduino.port">/dev/ttyACM0</prop>
         <prop key="buildlight.arduino.baudrate">57600</prop>

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ tasks.withType(JavaCompile) {
     options.compilerArgs << "-Xlint:unchecked -Xlint:deprecation"
 }
 
-group = 'com.comsysto.buildlight'
+group = 'com.github.zutherb.buildlight.'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -68,7 +68,7 @@ subprojects {
 
         javaFxDeps = [
             files("$javaHome/lib/jfxrt.jar"),
-            files("$javaHome/../lib/ant-javafx.jar")
+            files("$javaHome/./lib/ant-javafx.jar")
         ]
 
         springDeps = [

diff --git a/driver/arduino-driver/build.gradle b/driver/arduino-driver/build.gradle
@@ -1,4 +1,4 @@
-group = 'com.comsysto.buildlight'
+group = 'com.github.zutherb.buildlight.'
 
 sourceSets {
     main {

diff --git a/...ildlight/arduino/driver/core/Arduino.java → ...ildlight/arduino/driver/core/Arduino.java b/...ildlight/arduino/driver/core/Arduino.java → ...ildlight/arduino/driver/core/Arduino.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.arduino.driver.core;
+package com.github.zutherb.buildlight.arduino.driver.core;
 
 public class Arduino {
 

diff --git a/...uildlight/arduino/driver/core/Serial.java → ...uildlight/arduino/driver/core/Serial.java b/...uildlight/arduino/driver/core/Serial.java → ...uildlight/arduino/driver/core/Serial.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.arduino.driver.core;
+package com.github.zutherb.buildlight.arduino.driver.core;
 
 import gnu.io.*;
 

diff --git a/...fficlight/ArduinoTrafficLightFactory.java → ...fficlight/ArduinoTrafficLightFactory.java b/...fficlight/ArduinoTrafficLightFactory.java → ...fficlight/ArduinoTrafficLightFactory.java
@@ -1,7 +1,7 @@
-package com.comsysto.buildlight.arduino.driver.trafficlight;
+package com.github.zutherb.buildlight.arduino.driver.trafficlight;
 
-import com.comsysto.buildlight.arduino.driver.core.Arduino;
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.arduino.driver.core.Arduino;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 
 /**
  * @author zutherb

diff --git a/...trafficlight/ArduinoTrafficLightImpl.java → ...trafficlight/ArduinoTrafficLightImpl.java b/...trafficlight/ArduinoTrafficLightImpl.java → ...trafficlight/ArduinoTrafficLightImpl.java
@@ -1,15 +1,15 @@
-package com.comsysto.buildlight.arduino.driver.trafficlight;
+package com.github.zutherb.buildlight.arduino.driver.trafficlight;
 
-import com.comsysto.buildlight.arduino.driver.core.Arduino;
-import com.comsysto.buildlight.common.driver.core.AbstractTrafficLight;
-import com.comsysto.buildlight.common.driver.core.Color;
+import com.github.zutherb.buildlight.arduino.driver.core.Arduino;
+import com.github.zutherb.buildlight.common.driver.core.AbstractTrafficLight;
+import com.github.zutherb.buildlight.common.driver.core.Color;
 import com.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
-import static com.comsysto.buildlight.arduino.driver.core.Arduino.*;
+import static com.github.zutherb.buildlight.arduino.driver.core.Arduino.*;
 
 /**
  * @author zutherb

diff --git a/...no/driver/trafficlight/SwitchOnLevel.java → ...no/driver/trafficlight/SwitchOnLevel.java b/...no/driver/trafficlight/SwitchOnLevel.java → ...no/driver/trafficlight/SwitchOnLevel.java
@@ -1,6 +1,6 @@
-package com.comsysto.buildlight.arduino.driver.trafficlight;
+package com.github.zutherb.buildlight.arduino.driver.trafficlight;
 
-import com.comsysto.buildlight.arduino.driver.core.Arduino;
+import com.github.zutherb.buildlight.arduino.driver.core.Arduino;
 
 import static java.lang.String.format;
 

diff --git a/...rduino/driver/core/ArduinoOutputTest.java → ...rduino/driver/core/ArduinoOutputTest.java b/...rduino/driver/core/ArduinoOutputTest.java → ...rduino/driver/core/ArduinoOutputTest.java
@@ -1,4 +1,4 @@
-package com.comsysto.buildlight.arduino.driver.core;
+package com.github.zutherb.buildlight.arduino.driver.core;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/...light/ArduinoTrafficLightFactoryTest.java → ...light/ArduinoTrafficLightFactoryTest.java b/...light/ArduinoTrafficLightFactoryTest.java → ...light/ArduinoTrafficLightFactoryTest.java
@@ -1,6 +1,6 @@
-package com.comsysto.buildlight.arduino.driver.trafficlight;
+package com.github.zutherb.buildlight.arduino.driver.trafficlight;
 
-import com.comsysto.buildlight.common.driver.core.TrafficLight;
+import com.github.zutherb.buildlight.common.driver.core.TrafficLight;
 
 /**
  * @author zutherb