Removed "koc" from package names

Former-commit-id: 93e426a87e8a82a83783d68cf7a814c88df375aa

build.xml

@@ -26,7 +26,7 @@
 	
 
 	<target name="run-local-sensor" depends="">
-		<java fork="true" failonerror="true" classname="se.koc.hal.plugin.localsensor.ImpulseTracker">
+		<java fork="true" failonerror="true" classname="se.hal.plugin.localsensor.ImpulseTracker">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
 				<pathelement path="${libDir}/*"/>	<!--wildcard may not be platform independent, ok?-->
@@ -35,7 +35,7 @@
 	</target>
 	
 	<target name="run-remote-sensor" depends="">
-		<java fork="true" failonerror="true" classname="se.koc.hal.plugin.tellstick.TelstickSerialCommTest">
+		<java fork="true" failonerror="true" classname="se.hal.plugin.tellstick.TelstickSerialCommTest">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
 				<pathelement path="${libDir}/*"/>	<!--wildcard may not be platform independent, ok?-->
@@ -44,7 +44,7 @@
 	</target>
 	
 	<target name="run-main-server" depends="">
-		<java fork="true" failonerror="true" classname="se.koc.hal.PowerChallenge">
+		<java fork="true" failonerror="true" classname="se.hal.PowerChallenge">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
 				<pathelement path="${libDir}/*"/>	<!--wildcard may not be platform independent, ok?-->
@@ -70,12 +70,12 @@
 		<mkdir dir="${buildDir}" />
 		<javac srcdir="${srcDir}" destdir="${buildDir}" fork="yes">
 			<include name="**/*.java" />
-			<exclude name="se/koc/hal/tts/GoogleTTSClient.java" />
+			<exclude name="se/hal/tts/GoogleTTSClient.java" />
 			<classpath refid="classpath.build" />
 		</javac>
 		<javac srcdir="${testDir}" destdir="${buildDir}" fork="yes">
 			<include name="**/*.java" />
-			<exclude name="se/koc/hal/test/JarvisSyntersizerTest.java" />
+			<exclude name="se/hal/test/JarvisSyntersizerTest.java" />
 			<classpath refid="classpath.build" />
 		</javac>
 		<jar destfile="${buildDir}/hal.jar" basedir="${buildDir}" excludes="hal.jar" />

run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #screen -S hal -L -d -m \
-#	 java -cp sqlite-jdbc-3.7.2.jar:jSerialComm-1.3.4.jar:hal.jar:. se.koc.hal.plugin.tellstick.TelstickSerialCommTest
+#	 java -cp sqlite-jdbc-3.7.2.jar:jSerialComm-1.3.4.jar:hal.jar:. se.hal.plugin.tellstick.TelstickSerialCommTest
 
 #ant clean
 ant build

src/se/hal/ControllerManager.java

@@ -1,9 +1,8 @@
-package se.koc.hal;
+package se.hal;
 
-import se.koc.hal.intf.*;
-import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D;
-import se.koc.hal.struct.Event;
-import se.koc.hal.struct.Sensor;
+import se.hal.intf.*;
+import se.hal.struct.Event;
+import se.hal.struct.Sensor;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginData;

src/se/hal/HalClient.java

@@ -1,12 +1,12 @@
-package se.koc.hal;
+package se.hal;
 
-import se.koc.hal.bot.AliceBot;
-import se.koc.hal.intf.HalBot;
-import se.koc.hal.intf.HalSpeachToText;
-import se.koc.hal.intf.HalTextToSpeach;
-import se.koc.hal.struct.SwitchEvent;
-import se.koc.hal.stt.ManualSTTClient;
-import se.koc.hal.tts.MaryRemoteTTSClient;
+import se.hal.bot.AliceBot;
+import se.hal.intf.HalBot;
+import se.hal.intf.HalSpeachToText;
+import se.hal.intf.HalTextToSpeach;
+import se.hal.struct.SwitchEvent;
+import se.hal.stt.ManualSTTClient;
+import se.hal.tts.MaryRemoteTTSClient;
 
 import java.util.HashMap;
 import java.util.regex.Matcher;

src/se/hal/HalContext.java

@@ -1,4 +1,4 @@
-package se.koc.hal;
+package se.hal;
 
 import zutil.db.DBConnection;
 import zutil.db.DBUpgradeHandler;

src/se/hal/PowerChallenge.java

@@ -1,17 +1,17 @@
-package se.koc.hal;
+package se.hal;
 
 
-import se.koc.hal.deamon.DataAggregatorDaemon;
-import se.koc.hal.deamon.DataCleanupDaemon;
-import se.koc.hal.deamon.DataSynchronizationClient;
-import se.koc.hal.deamon.DataSynchronizationDaemon;
-import se.koc.hal.intf.HalDaemon;
-import se.koc.hal.intf.HalHttpPage;
-import se.koc.hal.page.PCConfigureHttpPage;
-import se.koc.hal.page.PCHeatMapHttpPage;
-import se.koc.hal.page.PCOverviewHttpPage;
-import se.koc.hal.struct.Event;
-import se.koc.hal.struct.Sensor;
+import se.hal.deamon.DataAggregatorDaemon;
+import se.hal.deamon.DataCleanupDaemon;
+import se.hal.deamon.DataSynchronizationClient;
+import se.hal.deamon.DataSynchronizationDaemon;
+import se.hal.intf.HalDaemon;
+import se.hal.intf.HalHttpPage;
+import se.hal.page.PCConfigureHttpPage;
+import se.hal.page.PCHeatMapHttpPage;
+import se.hal.page.PCOverviewHttpPage;
+import se.hal.struct.Event;
+import se.hal.struct.Sensor;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.CompactLogFormatter;
@@ -35,8 +35,8 @@ public class PowerChallenge {
     public static void main(String[] args) throws Exception {
         // init logging
         CompactLogFormatter formatter = new CompactLogFormatter();
-        LogUtil.setLevel("se.koc.hal", Level.FINEST);
-        LogUtil.setFormatter("se.koc.hal", formatter);
+        LogUtil.setLevel("se.hal", Level.FINEST);
+        LogUtil.setFormatter("se.hal", formatter);
         LogUtil.setLevel("zutil", Level.FINEST);
         LogUtil.setFormatter("zutil", formatter);
         LogUtil.setGlobalFormatter(formatter);

src/se/hal/bot/AliceBot.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.bot;
+package se.hal.bot;
 
 import org.alicebot.ab.Bot;
 import org.alicebot.ab.Chat;
 import org.alicebot.ab.MagicBooleans;
-import se.koc.hal.intf.HalBot;
+import se.hal.intf.HalBot;
 import zutil.io.file.FileUtil;
 
 import java.io.File;

src/se/hal/deamon/DataAggregatorDaemon.java

@@ -1,11 +1,11 @@
-package se.koc.hal.deamon;
+package se.hal.deamon;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalDaemon;
-import se.koc.hal.struct.Sensor;
-import se.koc.hal.intf.HalSensor.AggregationMethod;
-import se.koc.hal.struct.PowerConsumptionSensor;
-import se.koc.hal.util.TimeUtility;
+import se.hal.HalContext;
+import se.hal.intf.HalDaemon;
+import se.hal.struct.Sensor;
+import se.hal.intf.HalSensor.AggregationMethod;
+import se.hal.struct.PowerConsumptionSensor;
+import se.hal.util.TimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 import zutil.db.handler.SimpleSQLResult;

src/se/hal/deamon/DataCleanupDaemon.java

@@ -1,10 +1,10 @@
-package se.koc.hal.deamon;
+package se.hal.deamon;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalDaemon;
-import se.koc.hal.struct.Sensor;
-import se.koc.hal.struct.PowerConsumptionSensor;
-import se.koc.hal.util.TimeUtility;
+import se.hal.HalContext;
+import se.hal.intf.HalDaemon;
+import se.hal.struct.Sensor;
+import se.hal.struct.PowerConsumptionSensor;
+import se.hal.util.TimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 import zutil.db.handler.SimpleSQLResult;

src/se/hal/deamon/DataSynchronizationClient.java

@@ -1,10 +1,10 @@
-package se.koc.hal.deamon;
+package se.hal.deamon;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.deamon.DataSynchronizationDaemon.*;
-import se.koc.hal.intf.HalDaemon;
-import se.koc.hal.struct.Sensor;
-import se.koc.hal.struct.User;
+import se.hal.HalContext;
+import se.hal.deamon.DataSynchronizationDaemon.*;
+import se.hal.intf.HalDaemon;
+import se.hal.struct.Sensor;
+import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 

src/se/hal/deamon/DataSynchronizationDaemon.java

@@ -1,10 +1,10 @@
-package se.koc.hal.deamon;
+package se.hal.deamon;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.deamon.DataSynchronizationClient.*;
-import se.koc.hal.intf.HalDaemon;
-import se.koc.hal.struct.Sensor;
-import se.koc.hal.struct.User;
+import se.hal.HalContext;
+import se.hal.deamon.DataSynchronizationClient.*;
+import se.hal.intf.HalDaemon;
+import se.hal.struct.Sensor;
+import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 import zutil.log.LogUtil;
@@ -21,7 +21,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/se/hal/intf/HalBot.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.intf;
+package se.hal.intf;
 
 /**
  * Created by Ziver on 2015-05-07.

src/se/hal/intf/HalDaemon.java

@@ -1,4 +1,4 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
 import java.util.concurrent.ScheduledExecutorService;
 

src/se/hal/intf/HalEvent.java

@@ -1,6 +1,4 @@
-package se.koc.hal.intf;
-
-import zutil.parser.DataNode;
+package se.hal.intf;
 
 /**
  * Created by Ziver on 2015-12-23.

src/se/hal/intf/HalEventController.java

@@ -1,4 +1,4 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
 /**
  * Created by Ziver on 2015-12-15.

src/se/hal/intf/HalEventReportListener.java

@@ -1,4 +1,4 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
 public interface HalEventReportListener {
 

src/se/hal/intf/HalHttpPage.java

@@ -1,7 +1,7 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.struct.User;
+import se.hal.HalContext;
+import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.net.http.HttpHeaderParser;

src/se/hal/intf/HalSensor.java

@@ -1,6 +1,4 @@
-package se.koc.hal.intf;
-
-import zutil.parser.DataNode;
+package se.hal.intf;
 
 /**
  * Created by Ziver on 2015-12-23.

src/se/hal/intf/HalSensorController.java

@@ -1,4 +1,4 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
 /**
  * Created by Ziver on 2015-12-15.

src/se/hal/intf/HalSensorReportListener.java

@@ -1,4 +1,4 @@
-package se.koc.hal.intf;
+package se.hal.intf;
 
 public interface HalSensorReportListener {
 

src/se/hal/intf/HalSpeachToText.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.intf;
+package se.hal.intf;
 
 /**
  * Created with IntelliJ IDEA.

src/se/hal/intf/HalTextToSpeach.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.intf;
+package se.hal.intf;
 
 /**
  * Created with IntelliJ IDEA.

src/se/hal/page/PCConfigureHttpPage.java

@@ -1,10 +1,10 @@
-package se.koc.hal.page;
+package se.hal.page;
 
-import se.koc.hal.ControllerManager;
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalHttpPage;
-import se.koc.hal.struct.Sensor;
-import se.koc.hal.struct.User;
+import se.hal.ControllerManager;
+import se.hal.HalContext;
+import se.hal.intf.HalHttpPage;
+import se.hal.struct.Sensor;
+import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;

src/se/hal/page/PCHeatMapHttpPage.java

@@ -1,6 +1,6 @@
-package se.koc.hal.page;
+package se.hal.page;
 
-import se.koc.hal.intf.HalHttpPage;
+import se.hal.intf.HalHttpPage;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 

src/se/hal/page/PCOverviewHttpPage.java

@@ -1,8 +1,8 @@
-package se.koc.hal.page;
+package se.hal.page;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalHttpPage;
-import se.koc.hal.util.TimeUtility;
+import se.hal.HalContext;
+import se.hal.intf.HalHttpPage;
+import se.hal.util.TimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 import zutil.io.file.FileUtil;

src/se/hal/plugin/localsensor/RPiImpulseCountSensor.java

@@ -1,4 +1,4 @@
-package se.koc.hal.plugin.localsensor;
+package se.hal.plugin.localsensor;
 
 import com.pi4j.io.gpio.*;
 import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;

src/se/hal/plugin/tellstick/TellstickParser.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.plugin.tellstick;
+package se.hal.plugin.tellstick;
 
-import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
-import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D;
+import se.hal.plugin.tellstick.protocols.NexaSelfLearning;
+import se.hal.plugin.tellstick.protocols.Oregon0x1A2D;
 import zutil.converters.Converter;
 import zutil.log.LogUtil;
 

src/se/hal/plugin/tellstick/TellstickProtocol.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.plugin.tellstick;
+package se.hal.plugin.tellstick;
 
-import se.koc.hal.intf.HalEventController;
-import se.koc.hal.intf.HalSensorController;
+import se.hal.intf.HalEventController;
+import se.hal.intf.HalSensorController;
 
 /**
  * Created by Ziver on 2015-02-18.

src/se/hal/plugin/tellstick/TellstickSerialComm.java

@@ -20,19 +20,17 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.plugin.tellstick;
+package se.hal.plugin.tellstick;
 
 import com.fazecast.jSerialComm.SerialPort;
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.*;
-import zutil.io.file.FileUtil;
+import se.hal.HalContext;
+import se.hal.intf.*;
 import zutil.log.InputStreamLogger;
 import zutil.log.LogUtil;
 import zutil.log.OutputStreamLogger;
 import zutil.struct.TimedHashSet;
 
 import java.io.*;
-import java.util.Properties;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java

@@ -20,12 +20,10 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.plugin.tellstick.protocols;
+package se.hal.plugin.tellstick.protocols;
 
-import se.koc.hal.intf.HalEventController;
-import se.koc.hal.plugin.tellstick.TellstickProtocol;
-import se.koc.hal.struct.DimmerEvent;
-import se.koc.hal.struct.SwitchEvent;
+import se.hal.plugin.tellstick.TellstickProtocol;
+import se.hal.struct.SwitchEvent;
 import zutil.ui.Configurator;
 
 /**

src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java

@@ -1,11 +1,7 @@
-package se.koc.hal.plugin.tellstick.protocols;
+package se.hal.plugin.tellstick.protocols;
 
-import se.koc.hal.intf.HalSensor;
-import se.koc.hal.intf.HalSensorController;
-import se.koc.hal.plugin.tellstick.TellstickProtocol;
-import se.koc.hal.plugin.tellstick.TellstickSerialComm;
-import se.koc.hal.struct.PowerConsumptionSensor;
-import zutil.parser.DataNode;
+import se.hal.plugin.tellstick.TellstickProtocol;
+import se.hal.struct.PowerConsumptionSensor;
 import zutil.ui.Configurator;
 
 /**

src/se/hal/struct/DimmerEvent.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.intf.HalEvent;
+import se.hal.intf.HalEvent;
 
 /**
  * Created by Ziver on 2015-05-07.

src/se/hal/struct/Event.java

@@ -1,7 +1,7 @@
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.intf.HalEvent;
-import se.koc.hal.intf.HalEventController;
+import se.hal.intf.HalEvent;
+import se.hal.intf.HalEventController;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
@@ -10,8 +10,6 @@ import zutil.io.StringOutputStream;
 import zutil.log.LogUtil;
 import zutil.parser.json.JSONObjectInputStream;
 import zutil.parser.json.JSONObjectOutputStream;
-import zutil.parser.json.JSONParser;
-import zutil.parser.json.JSONWriter;
 
 import java.io.IOException;
 import java.sql.PreparedStatement;

src/se/hal/struct/PowerConsumptionSensor.java

@@ -1,6 +1,6 @@
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.intf.HalSensor;
+import se.hal.intf.HalSensor;
 
 /**
  * Created by Ziver on 2015-12-03.

src/se/hal/struct/Sensor.java

@@ -1,8 +1,8 @@
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalSensor;
-import se.koc.hal.intf.HalSensorController;
+import se.hal.HalContext;
+import se.hal.intf.HalSensor;
+import se.hal.intf.HalSensorController;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
@@ -10,13 +10,8 @@ import zutil.db.handler.SimpleSQLResult;
 import zutil.io.StringInputStream;
 import zutil.io.StringOutputStream;
 import zutil.log.LogUtil;
-import zutil.parser.DataNode;
 import zutil.parser.json.JSONObjectInputStream;
 import zutil.parser.json.JSONObjectOutputStream;
-import zutil.parser.json.JSONParser;
-import zutil.parser.json.JSONWriter;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.ConfigurationParam;
 
 import java.io.IOException;
 import java.sql.PreparedStatement;

src/se/hal/struct/SwitchEvent.java

@@ -20,11 +20,9 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.intf.HalEvent;
-import se.koc.hal.plugin.tellstick.TellstickSerialComm;
-import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
+import se.hal.intf.HalEvent;
 
 /**
  * Created by Ziver on 2015-05-07.

src/se/hal/struct/TemperatureSensor.java

@@ -1,6 +1,6 @@
-package se.koc.hal.struct;
+package se.hal.struct;
 
-import se.koc.hal.intf.HalSensor;
+import se.hal.intf.HalSensor;
 
 /**
  * Created by Ziver on 2015-12-03.

src/se/hal/struct/User.java

@@ -1,4 +1,4 @@
-package se.koc.hal.struct;
+package se.hal.struct;
 
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;

src/se/hal/stt/GoogleSTTClient.java

@@ -1,11 +1,11 @@
-package se.koc.hal.stt;
+package se.hal.stt;
 
 import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
 import com.darkprograms.speech.recognizer.FlacEncoder;
 import com.darkprograms.speech.recognizer.GSpeechDuplex;
 import com.darkprograms.speech.recognizer.GSpeechResponseListener;
 import com.darkprograms.speech.recognizer.GoogleResponse;
-import se.koc.hal.intf.HalSpeachToText;
+import se.hal.intf.HalSpeachToText;
 import zutil.io.file.FileUtil;
 
 import javax.sound.sampled.AudioFileFormat;

src/se/hal/stt/ManualSTTClient.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.stt;
+package se.hal.stt;
 
-import se.koc.hal.intf.HalSpeachToText;
+import se.hal.intf.HalSpeachToText;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/se/hal/stt/Sphinx4STTClient.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.stt;
+package se.hal.stt;
 
 import edu.cmu.sphinx.api.Configuration;
 import edu.cmu.sphinx.api.LiveSpeechRecognizer;
 import edu.cmu.sphinx.api.SpeechResult;
-import se.koc.hal.intf.HalSpeachToText;
+import se.hal.intf.HalSpeachToText;
 
 import java.io.IOException;
 

src/se/hal/tts/GoogleTTSClient.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.tts;
+package se.hal.tts;
 
 import com.darkprograms.speech.synthesiser.SynthesiserV2;
 import javafx.embed.swing.JFXPanel;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
-import se.koc.hal.intf.HalTextToSpeach;
+import se.hal.intf.HalTextToSpeach;
 
 import java.io.*;
 import java.net.URISyntaxException;

src/se/hal/tts/MaryLocalTTSClient.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.tts;
+package se.hal.tts;
 
 import marytts.LocalMaryInterface;
 import marytts.MaryInterface;
 import marytts.exceptions.MaryConfigurationException;
 import marytts.exceptions.SynthesisException;
 import marytts.util.data.audio.AudioPlayer;
-import se.koc.hal.intf.HalTextToSpeach;
+import se.hal.intf.HalTextToSpeach;
 
 import javax.sound.sampled.AudioInputStream;
 import java.util.Set;

src/se/hal/tts/MaryRemoteTTSClient.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.tts;
+package se.hal.tts;
 
 import marytts.MaryInterface;
 import marytts.client.RemoteMaryInterface;
 import marytts.exceptions.SynthesisException;
 import marytts.util.data.audio.AudioPlayer;
-import se.koc.hal.intf.HalTextToSpeach;
+import se.hal.intf.HalTextToSpeach;
 
 import javax.sound.sampled.AudioInputStream;
 import java.io.IOException;

src/se/hal/util/TimeUtility.java

@@ -1,4 +1,4 @@
-package se.koc.hal.util;
+package se.hal.util;
 
 import java.util.Calendar;
 

test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java

@@ -1,6 +1,6 @@
-package se.koc.hal.plugin.tellstick;
+package se.hal.plugin.tellstick;
 
-import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
+import se.hal.plugin.tellstick.protocols.NexaSelfLearning;
 
 /**
  * Created by Ziver on 2015-11-19.

test/se/hal/plugin/tellstick/TelstickSerialCommTest.java

@@ -1,10 +1,9 @@
-package se.koc.hal.plugin.tellstick;
+package se.hal.plugin.tellstick;
 
-import se.koc.hal.HalContext;
-import se.koc.hal.intf.HalSensor;
-import se.koc.hal.intf.HalSensorController;
-import se.koc.hal.intf.HalSensorReportListener;
-import se.koc.hal.plugin.tellstick.protocols.Oregon0x1A2D;
+import se.hal.HalContext;
+import se.hal.intf.HalSensor;
+import se.hal.intf.HalSensorReportListener;
+import se.hal.plugin.tellstick.protocols.Oregon0x1A2D;
 import zutil.db.DBConnection;
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;

test/se/hal/plugin/tellstick/protocols/NexaSelfLearningTest.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.plugin.tellstick.protocols;
+package se.hal.plugin.tellstick.protocols;
 
 import zutil.converters.Converter;
 

test/se/hal/test/GoogleTTSTest.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import zutil.io.DynamicByteArrayStream;
 

test/se/hal/test/JarvisRecognizerTest.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
 import com.darkprograms.speech.recognizer.FlacEncoder;

test/se/hal/test/JarvisSyntersizerTest.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import com.darkprograms.speech.synthesiser.Synthesiser;
 import javafx.application.Application;

test/se/hal/test/LiveSpeechRecognizerTest.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import edu.cmu.sphinx.api.Configuration;
 import edu.cmu.sphinx.api.LiveSpeechRecognizer;

test/se/hal/test/MaryTTS.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import marytts.MaryInterface;
 import marytts.client.RemoteMaryInterface;

test/se/hal/test/TranscriberDemo.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package se.koc.hal.test;
+package se.hal.test;
 
 import com.darkprograms.speech.microphone.MicrophoneAnalyzer;
 import edu.cmu.sphinx.api.Configuration;

test/se/hal/util/TimeUtilityTest.java

@@ -1,4 +1,4 @@
-package se.koc.hal.util;
+package se.hal.util;
 
 import org.junit.Before;
 import org.junit.Test;