Cleanups after merging.

.gitignore

@@ -3,9 +3,10 @@
 
 # Ignore Gradle build output directory
 build
+bin
 
 # Ignore Eclipse
-.classpath
-.project
-.settings/**
+**/.classpath
+**/.project
+**/.settings/**
 

tools/rewrite-log-entries/src/main/java/org/oceandsl/log/rewriter/RewriteBeforeAndAfterEventsStage.java → analysis/src/main/java/org/oceandsl/analysis/RewriteBeforeAndAfterEventsStage.java

 /**
  * 
  */
-package org.oceandsl.log.rewriter;
+package org.oceandsl.analysis;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -110,7 +110,7 @@ public class RewriteBeforeAndAfterEventsStage extends AbstractConsumerStage<IMon
 		}
 	}
 
-	public OutputPort getOutputPort() {
+	public OutputPort<IMonitoringRecord> getOutputPort() {
 		return this.outputPort;
 	}
 

analysis/src/main/java/org/oceandsl/analysis/package-info.java

+package org.oceandsl.analysis;
\ No newline at end of file

build.gradle

@@ -10,23 +10,26 @@ plugins {
 }
 
 repositories {
-    // Use jcenter for resolving dependencies.
-    // You can declare any Maven/Ivy/file repository here.
     jcenter()
     mavenCentral()
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-    maven {url "https://oss.sonatype.org/content/repositories/releases/" }
-}
-
-dependencies {
-    implementation 'net.kieker-monitoring:kieker:1.15-SNAPSHOT'
-    implementation 'net.sourceforge.teetime:teetime:3.0'
-    implementation 'com.beust:jcommander:1.78'
-
-    // Use JUnit test framework
-    testImplementation 'junit:junit:4.13'
 }
 
 subprojects {
+	apply plugin: 'java'
 
+	repositories {
+	    jcenter()
+	    mavenCentral()
+	    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+	    maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+	}
+	
+	dependencies {
+	    implementation 'net.kieker-monitoring:kieker:1.15-SNAPSHOT'
+	    implementation 'net.sourceforge.teetime:teetime:3.0'
+	    implementation 'com.beust:jcommander:1.78'
+	
+	    // Use JUnit test framework
+	    testImplementation 'junit:junit:4.13'
+	}
 }

tools/create-architecture-model/src/main/java/org/oceandsl/architecture/model/ArchitectureModelMain.java

 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package org.oceandsl.log.rewriter;
+package org.oceandsl.architecture.model;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,11 +12,11 @@ import kieker.common.configuration.Configuration;
 import kieker.common.exception.ConfigurationException;
 import kieker.tools.common.AbstractService;
 
-public class LogRewriterMain extends AbstractService<TeetimeConfiguration,LogRewriterSettings>{
+public class ArchitectureModelMain extends AbstractService<TeetimeConfiguration,ArchitectureModelSettings>{
    
     public static void main(String[] args) {
-    	 java.lang.System.exit(new LogRewriterMain().run("Kieker Log ELF Rewriter",
-    		        "log-rewriter", args, new LogRewriterSettings()));
+    	 java.lang.System.exit(new ArchitectureModelMain().run("Kieker Log ELF Rewriter",
+    		        "log-rewriter", args, new ArchitectureModelSettings()));
     }
 
 	@Override

tools/create-architecture-model/src/main/java/org/oceandsl/architecture/model/LogRewriterSettings.java → tools/create-architecture-model/src/main/java/org/oceandsl/architecture/model/ArchitectureModelSettings.java

 /**
  * 
  */
-package org.oceandsl.log.rewriter;
+package org.oceandsl.architecture.model;
 
 import java.io.File;
 
@@ -12,7 +12,7 @@ import com.beust.jcommander.converters.FileConverter;
  * @author reiner
  *
  */
-public class LogRewriterSettings {
+public class ArchitectureModelSettings {
 
 	@Parameter(names = { "-i", "--input" }, required = true, converter = FileConverter.class, description = "Input Kieker log directory")
 	private File inputFile;

tools/create-architecture-model/src/main/java/org/oceandsl/architecture/model/TeetimeConfiguration.java

 /**
  * 
  */
-package org.oceandsl.log.rewriter;
+package org.oceandsl.architecture.model;
 
 import java.io.IOException;
 
-import kieker.analysis.sink.DataSinkStage;
+import org.oceandsl.analysis.RewriteBeforeAndAfterEventsStage;
+
 import kieker.tools.source.LogsReaderCompositeStage;
 import teetime.framework.Configuration;
 
@@ -15,56 +16,17 @@ import teetime.framework.Configuration;
  */
 public class TeetimeConfiguration extends Configuration {
 
-	public TeetimeConfiguration(LogRewriterSettings parameterConfiguration) throws IOException {
+	public TeetimeConfiguration(ArchitectureModelSettings parameterConfiguration) throws IOException {
 				
 		kieker.common.configuration.Configuration configuration = new kieker.common.configuration.Configuration();
 		configuration.setProperty(LogsReaderCompositeStage.LOG_DIRECTORIES, 
 				parameterConfiguration.getInputFile().getCanonicalPath());
-		configuration.setProperty("kieker.monitoring.name", "KIEKER");
-		configuration.setProperty("kieker.monitoring.enabled","true");
-		configuration.setProperty("kieker.monitoring.initialExperimentId","transcoded");
-		configuration.setProperty("kieker.monitoring.metadata","true");
-		configuration.setProperty("kieker.monitoring.setLoggingTimestamp","true");
-		configuration.setProperty("kieker.monitoring.useShutdownHook","true");
-		configuration.setProperty("kieker.monitoring.jmx","false");
-		
-		configuration.setProperty("kieker.monitoring.timer",
-				kieker.monitoring.timer.SystemNanoTimer.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.timer.SystemMilliTimer.unit","0");
-		configuration.setProperty("kieker.monitoring.timer.SystemNanoTimer.unit","0");
-		configuration.setProperty("kieker.monitoring.writer",
-				kieker.monitoring.writer.filesystem.FileWriter.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.core.controller.WriterController.RecordQueueFQN",
-				org.jctools.queues.MpscArrayQueue.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.core.controller.WriterController.RecordQueueSize","10000");
-		configuration.setProperty("kieker.monitoring.core.controller.WriterController.RecordQueueInsertBehavior","1");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.customStoragePath",parameterConfiguration.getOutputFile().getCanonicalPath());
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.charsetName","UTF-8");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.maxEntriesInFile","25000");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.maxLogSize","-1");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.maxLogFiles","-1");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.mapFileHandler",
-				kieker.monitoring.writer.filesystem.TextMapFileHandler.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.writer.filesystem.TextMapFileHandler.flush","true");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.TextMapFileHandler.compression",
-				kieker.monitoring.writer.compression.NoneCompressionFilter.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.logFilePoolHandler",
-				kieker.monitoring.writer.filesystem.RotatingLogFilePoolHandler.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.logStreamHandler",
-				kieker.monitoring.writer.filesystem.TextLogStreamHandler.class.getCanonicalName());
-		configuration.setProperty("kieker.monitoring.writer.filesystem.FileWriter.flush","true");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.BinaryFileWriter.bufferSize","8192");
-		configuration.setProperty("kieker.monitoring.writer.filesystem.BinaryFileWriter.compression",
-				kieker.monitoring.writer.compression.NoneCompressionFilter.class.getCanonicalName());
 		
 		LogsReaderCompositeStage reader = new LogsReaderCompositeStage(configuration);
 		
 		RewriteBeforeAndAfterEventsStage processor = new RewriteBeforeAndAfterEventsStage(parameterConfiguration.getAddrlineExecutable(),
 				parameterConfiguration.getModelExecutable());
-		
-		DataSinkStage writer = new DataSinkStage(configuration);
-		
+
 		this.connectPorts(reader.getOutputPort(), processor.getInputPort());
-		this.connectPorts(processor.getOutputPort(), writer.getInputPort());
 	}
 }

tools/rewrite-log-entries/src/main/java/org/oceandsl/log/rewriter/TeetimeConfiguration.java

@@ -5,6 +5,8 @@ package org.oceandsl.log.rewriter;
 
 import java.io.IOException;
 
+import org.oceandsl.analysis.RewriteBeforeAndAfterEventsStage;
+
 import kieker.analysis.sink.DataSinkStage;
 import kieker.tools.source.LogsReaderCompositeStage;
 import teetime.framework.Configuration;