completed migration

src/main/java/experiment/Experiment1.java

@@ -24,12 +24,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import javax.security.auth.login.Configuration;
-
 import kieker.analysis.AnalysisController;
 import kieker.analysis.IAnalysisController;
 import kieker.analysis.stage.EmptyPassOnFilter;
 import kieker.analysis.stage.ObjectProducer;
+import kieker.common.configuration.Configuration;
 import teetime.framework.concurrent.StageTerminationPolicy;
 import teetime.framework.concurrent.WorkerThread;
 import teetime.framework.core.Analysis;
@@ -41,7 +40,7 @@ import teetime.util.StatisticsUtil;
 
 /**
  * @author Nils Christian Ehmke
- * 
+ *
  * @since 1.10
  */
 public class Experiment1 {

src/main/java/experiment/Experiment2.java

@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import javax.security.auth.login.Configuration;
-
 import kieker.analysis.AnalysisController;
 import kieker.analysis.IAnalysisController;
 import kieker.analysis.stage.CollectorSink;
@@ -33,6 +31,7 @@ import kieker.analysis.stage.EmptyPassOnFilter;
 import kieker.analysis.stage.ObjectProducer;
 import kieker.analysis.stage.StartTimestampFilter;
 import kieker.analysis.stage.StopTimestampFilter;
+import kieker.common.configuration.Configuration;
 import teetime.examples.throughput.TimestampObject;
 import teetime.framework.concurrent.WorkerThread;
 import teetime.framework.core.Analysis;
@@ -45,7 +44,7 @@ import teetime.util.StatisticsUtil;
 
 /**
  * @author Nils Christian Ehmke
- * 
+ *
  * @since 1.10
  */
 public class Experiment2 {

src/main/java/kieker/analysis/stage/RecordFromTextLineCreator.java

@@ -17,7 +17,9 @@ package kieker.analysis.stage;
 
 import java.io.File;
 
+import kieker.common.exception.IllegalRecordFormatException;
 import kieker.common.exception.MonitoringRecordException;
+import kieker.common.exception.UnknownRecordTypeException;
 import kieker.common.record.AbstractMonitoringRecord;
 import kieker.common.record.IMonitoringRecord;
 import kieker.common.record.controlflow.OperationExecutionRecord;
@@ -27,7 +29,7 @@ import teetime.stage.kieker.className.ClassNameRegistryRepository;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class RecordFromTextLineCreator {

src/main/java/kieker/common/exception/IllegalRecordFormatException.java

+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed 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 kieker.common.exception;
+
+/**
+ * @author Christian Wulf
+ * 
+ * @since 1.10
+ */
+public class IllegalRecordFormatException extends Exception {
+
+	private static final long serialVersionUID = -6747714448544097075L;
+
+	public IllegalRecordFormatException() {
+		// No code necessary
+	}
+
+}

src/main/java/kieker/common/exception/MonitoringRecordException.java

+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed 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 kieker.common.exception;
+
+/**
+ * This exception can be used to show that something in context with a monitoring record failed.
+ * 
+ * @author Jan Waller
+ * 
+ * @since 1.0
+ */
+public class MonitoringRecordException extends Exception {
+
+	private static final long serialVersionUID = -619093518689867366L;
+
+	/**
+	 * Creates a new instance of this class using the given parameters.
+	 * 
+	 * @param messString
+	 *            The message of this exception.
+	 */
+	public MonitoringRecordException(final String messString) {
+		super(messString);
+	}
+
+	/**
+	 * Creates a new instance of this class using the given parameters.
+	 * 
+	 * @param messString
+	 *            The message of this exception.
+	 * @param cause
+	 *            The cause of this exception.
+	 */
+	public MonitoringRecordException(final String messString, final Throwable cause) {
+		super(messString, cause);
+	}
+}

src/main/java/kieker/common/exception/UnknownRecordTypeException.java

+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed 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 kieker.common.exception;
+
+/**
+ * @author Christian Wulf
+ * 
+ * @since 1.10
+ */
+public class UnknownRecordTypeException extends Exception {
+
+	private static final long serialVersionUID = 3967732396720668295L;
+	private final String classname;
+
+	public UnknownRecordTypeException(final String message, final String classname, final Throwable cause) {
+		super(message, cause);
+		this.classname = classname;
+	}
+
+	public String getClassName() {
+		return this.classname;
+	}
+}

src/main/java/teetime/framework/core/AbstractFilter.java

@@ -23,7 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import teetime.util.StopWatch;
-import teetime.util.concurrent.workstealing.DequePopException;
+import teetime.util.concurrent.workstealing.exception.DequePopException;
 
 /**
  * 

src/main/java/teetime/framework/core/IPipe.java

@@ -18,7 +18,7 @@ package teetime.framework.core;
 
 import java.util.List;
 
-import teetime.util.concurrent.workstealing.DequePopException;
+import teetime.util.concurrent.workstealing.exception.DequePopException;
 
 /**
  * 

src/main/java/teetime/stage/io/DbReader.java

@@ -22,9 +22,9 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import teetime.common.exception.MonitoringRecordException;
-import teetime.common.record.AbstractMonitoringRecord;
-import teetime.common.record.IMonitoringRecord;
+import kieker.common.exception.MonitoringRecordException;
+import kieker.common.record.AbstractMonitoringRecord;
+import kieker.common.record.IMonitoringRecord;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.Description;
@@ -32,9 +32,9 @@ import teetime.framework.core.IOutputPort;
 
 /**
  * A very simple database reader that probably only works for small data sets.
- * 
+ *
  * @author Jan Waller, Nils Christian Ehmke
- * 
+ *
  * @since 1.10
  */
 @Description("A reader which reads records from a database")
@@ -141,7 +141,7 @@ public class DbReader extends AbstractFilter<DbReader> {
 
 	/**
 	 * This method uses the given table to read records and sends them to the output port.
-	 * 
+	 *
 	 * @param connection
 	 *            The connection to the database which will be used.
 	 * @param tablename

src/main/java/teetime/stage/io/TCPReader.java

@@ -22,23 +22,23 @@ import java.nio.ByteBuffer;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
-import teetime.common.exception.MonitoringRecordException;
-import teetime.common.logging.Log;
-import teetime.common.logging.LogFactory;
-import teetime.common.record.AbstractMonitoringRecord;
-import teetime.common.record.IMonitoringRecord;
-import teetime.common.record.misc.RegistryRecord;
-import teetime.common.util.registry.ILookup;
-import teetime.common.util.registry.Lookup;
+import kieker.common.exception.MonitoringRecordException;
+import kieker.common.logging.Log;
+import kieker.common.logging.LogFactory;
+import kieker.common.record.AbstractMonitoringRecord;
+import kieker.common.record.IMonitoringRecord;
+import kieker.common.record.misc.RegistryRecord;
+import kieker.common.util.registry.ILookup;
+import kieker.common.util.registry.Lookup;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IOutputPort;
 
 /**
  * This is a reader which reads the records from a TCP port.
- * 
+ *
  * @author Jan Waller, Nils Christian Ehmke
- * 
+ *
  * @since 1.10
  */
 public class TCPReader extends AbstractFilter<TCPReader> {
@@ -143,9 +143,9 @@ public class TCPReader extends AbstractFilter<TCPReader> {
 }
 
 /**
- * 
+ *
  * @author Jan Waller
- * 
+ *
  * @since 1.8
  */
 class TCPStringReader extends Thread {

src/main/java/teetime/stage/kieker/File2RecordFilter.java

@@ -17,9 +17,9 @@ package teetime.stage.kieker;
 
 import java.io.File;
 
-import teetime.common.record.IMonitoringRecord;
-import teetime.common.util.filesystem.BinaryCompressionMethod;
-import teetime.common.util.filesystem.FSUtil;
+import kieker.common.record.IMonitoringRecord;
+import kieker.common.util.filesystem.BinaryCompressionMethod;
+import kieker.common.util.filesystem.FSUtil;
 import teetime.framework.concurrent.ConcurrentWorkStealingPipe;
 import teetime.framework.concurrent.ConcurrentWorkStealingPipeFactory;
 import teetime.framework.core.CompositeFilter;
@@ -38,7 +38,7 @@ import teetime.stage.predicate.PredicateFilter;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class File2RecordFilter extends CompositeFilter {

src/main/java/teetime/stage/kieker/MonitoringLogDirectory2Files.java

@@ -19,15 +19,15 @@ import java.io.File;
 import java.io.FileFilter;
 import java.util.Comparator;
 
-import teetime.common.util.filesystem.BinaryCompressionMethod;
-import teetime.common.util.filesystem.FSUtil;
+import kieker.common.util.filesystem.BinaryCompressionMethod;
+import kieker.common.util.filesystem.FSUtil;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
 import teetime.stage.io.Directory2FilesFilter;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class MonitoringLogDirectory2Files extends Directory2FilesFilter {
@@ -36,12 +36,13 @@ public class MonitoringLogDirectory2Files extends Directory2FilesFilter {
 
 	/**
 	 * @author Christian Wulf
-	 * 
+	 *
 	 * @since 1.10
 	 */
 	static class MonitoringLogFileFilter implements FileFilter {
 		private String filePrefix;
 
+		@Override
 		public boolean accept(final File pathname) {
 			final String name = pathname.getName();
 			return pathname.isFile()
@@ -59,6 +60,7 @@ public class MonitoringLogDirectory2Files extends Directory2FilesFilter {
 	}
 
 	private static final Comparator<File> FILE_COMPARATOR = new Comparator<File>() {
+		@Override
 		public final int compare(final File f1, final File f2) {
 			return f1.compareTo(f2); // simplified (we expect no dirs!)
 		}

src/main/java/teetime/stage/kieker/fileToRecord/BinaryFile2RecordFilter.java

@@ -20,9 +20,9 @@ import java.io.File;
 import java.io.IOException;
 
 import kieker.analysis.stage.RecordFromBinaryFileCreator;
-import teetime.common.exception.MonitoringRecordException;
-import teetime.common.record.IMonitoringRecord;
-import teetime.common.util.filesystem.BinaryCompressionMethod;
+import kieker.common.exception.MonitoringRecordException;
+import kieker.common.record.IMonitoringRecord;
+import kieker.common.util.filesystem.BinaryCompressionMethod;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
@@ -31,7 +31,7 @@ import teetime.stage.kieker.className.ClassNameRegistryRepository;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class BinaryFile2RecordFilter extends AbstractFilter<BinaryFile2RecordFilter> {

src/main/java/teetime/stage/kieker/fileToRecord/DatFile2RecordFilter.java

@@ -17,7 +17,7 @@ package teetime.stage.kieker.fileToRecord;
 
 import java.io.File;
 
-import teetime.common.record.IMonitoringRecord;
+import kieker.common.record.IMonitoringRecord;
 import teetime.framework.concurrent.ConcurrentWorkStealingPipe;
 import teetime.framework.concurrent.ConcurrentWorkStealingPipeFactory;
 import teetime.framework.core.CompositeFilter;
@@ -30,7 +30,7 @@ import teetime.stage.util.TextLine;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class DatFile2RecordFilter extends CompositeFilter {

src/main/java/teetime/stage/kieker/fileToRecord/ZipFile2RecordFilter.java

@@ -29,8 +29,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import kieker.analysis.stage.MappingFileParser;
-import teetime.common.record.IMonitoringRecord;
-import teetime.common.util.filesystem.FSUtil;
+import kieker.common.record.IMonitoringRecord;
+import kieker.common.util.filesystem.FSUtil;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
@@ -39,7 +39,7 @@ import teetime.stage.kieker.className.ClassNameRegistry;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class ZipFile2RecordFilter extends AbstractFilter<ZipFile2RecordFilter> {

src/main/java/teetime/stage/kieker/fileToRecord/textLine/TextLine2MappingRegistryFilter.java

@@ -18,14 +18,14 @@ package teetime.stage.kieker.fileToRecord.textLine;
 
 import java.util.Map;
 
-import teetime.common.util.filesystem.FSUtil;
+import kieker.common.util.filesystem.FSUtil;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class TextLine2MappingRegistryFilter extends AbstractFilter<TextLine2MappingRegistryFilter> {

src/main/java/teetime/stage/kieker/fileToRecord/textLine/TextLine2RecordFilter.java

@@ -20,10 +20,10 @@ import java.util.HashSet;
 import java.util.Set;
 
 import kieker.analysis.stage.RecordFromTextLineCreator;
-import teetime.common.exception.IllegalRecordFormatException;
-import teetime.common.exception.MonitoringRecordException;
-import teetime.common.exception.UnknownRecordTypeException;
-import teetime.common.record.IMonitoringRecord;
+import kieker.common.exception.IllegalRecordFormatException;
+import kieker.common.exception.MonitoringRecordException;
+import kieker.common.exception.UnknownRecordTypeException;
+import kieker.common.record.IMonitoringRecord;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
@@ -34,7 +34,7 @@ import teetime.stage.util.TextLine;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class TextLine2RecordFilter extends AbstractFilter<TextLine2RecordFilter> {

src/main/java/teetime/stage/kieker/traceReconstruction/TraceReconstructionFilter.java

@@ -20,20 +20,20 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
-import teetime.analysis.plugin.filter.flow.TraceEventRecords;
-import teetime.analysis.plugin.filter.flow.reconstruction.TraceBuffer;
-import teetime.common.record.flow.IFlowRecord;
-import teetime.common.record.flow.trace.AbstractTraceEvent;
-import teetime.common.record.flow.trace.TraceMetadata;
+import kieker.analysis.plugin.filter.flow.TraceEventRecords;
+import kieker.common.record.flow.IFlowRecord;
+import kieker.common.record.flow.trace.AbstractTraceEvent;
+import kieker.common.record.flow.trace.TraceMetadata;
 import teetime.framework.core.AbstractFilter;
 import teetime.framework.core.Context;
 import teetime.framework.core.IInputPort;
 import teetime.framework.core.IOutputPort;
 import teetime.util.concurrent.hashmap.ConcurrentHashMapWithDefault;
+import teetime.util.concurrent.hashmap.TraceBuffer;
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class TraceReconstructionFilter extends AbstractFilter<TraceReconstructionFilter> {

src/main/java/teetime/stage/predicate/IsIMonitoringRecordInRange.java

@@ -15,11 +15,12 @@
  ***************************************************************************/
 package teetime.stage.predicate;
 
-import teetime.common.record.IMonitoringRecord;
+import kieker.common.record.IMonitoringRecord;
+
 
 /**
  * @author Christian Wulf
- * 
+ *
  * @since 1.10
  */
 public class IsIMonitoringRecordInRange extends IsTimestampInRange<IMonitoringRecord> {