Merge pull request #189 from jplag/release-prep

Preparation for the v3.0.0 release

README.md

@@ -7,32 +7,29 @@
 ## Download and Installation
 
 ### Downloading a release
-Download a [released version](https://github.com/jplag/jplag/releases), the most recent is [v2.12.1](https://github.com/jplag/jplag/releases/tag/v2.12.1-SNAPSHOT).
+Download a [released version](https://github.com/jplag/jplag/releases), the most recent is [v3.0.0](https://github.com/jplag/jplag/releases/tag/v3.0.0-SNAPSHOT).
 All releases are single-JAR releases.
 
 ### Building from sources 
-*Note that v3.0.0 is still very much a work in progress, we thus recommend using a released version for now.*
 1. Download or clone the code from this repository.
 2. Run `mvn clean install` from the root of the repository to install all submodules. You will find the JARs in the respective `target` directories.
 3. Inside the `jplag` directory run `mvn clean generate-sources package assembly:single`. 
 
-You'll find the generated JAR with all dependencies in  `jplag/target`.
+You will find the generated JAR with all dependencies in  `jplag/target`.
 
-## (Breaking) Changes coming with the v3.0.0 release
+## JPlag legacy version
+In case you depend on the legacy version of JPlag we refer to the [legacy release v2.12.1](https://github.com/jplag/jplag/releases/tag/v2.12.1-SNAPSHOT) and the [legacy branch](https://github.com/jplag/jplag/tree/legacy).
 
-> Note: The following list is incomplete and gives a rough overview of the changes. In case you depend on missing features we refer to the [legacy release v2.12.1](https://github.com/jplag/jplag/releases/tag/v2.12.1-SNAPSHOT) and the [legacy branch](https://github.com/jplag/jplag/tree/legacy).
+The following features are only available in version v3.0.0 and onwards:
+* a Java API for third-party integration
+* a simplified command-line interface
+* support for Java files containing new language features
+* improved colors for source codes matches in the report
+* a parallel comparison mode
 
-* Java API to allow 3rd party integration (see Java API usage below).
-* Result clustering is currently not supported (but might be restored).
-* All comparisons are now sorted by average similarity. Maximum similarity is currently not supported (but might be restored).
-* The CLI interface is now properly defined based on `argparse4j`. The CLI interface was slightly changed, a detailed description of all available options of the new CLI can be found below.
-* The following comparison modes are no longer supported: **experimental**, **external**, **special** and **revision**.
-* Renamed the `Program` class to `JPlag`. It contains the main logic, the parsed submissions, and delegates the comparison of files to one of the new `ComparisonStrategy` implementing classes.
-* The new `JPlagOptions` class replaces all previous Options-related classes and manages all available program options.
-* The new `JPlagResult` class bundles all results of a plagiarism detection run. An instance of this class can optionally be passed to the new `Report` class to generate web pages for the results
-* The new `JPlagComparison` class replaces the old `AllMatches` class.
-* We removed `AvgComparator`, `AvgReversedComparator`, `MaxComparator`, `MaxReversedComparator`, `MinComparator`, and `MinReversedComparator` from the `JPlagComparison` (previously `AllMatches`) class. The `JPlagResult` and `JPlagComparison` classes should make adding a custom sorting logic very straightforward if that's required.
-* Removed deprecated web service: `adminTool`, `atujplag`, `homepage`, `maven-libs`, `webService`, and `wsClient`
+The following features are currently only supported in the legacy version:
+* result clustering
+* comparison based on maximum similarity
 
 ## Usage
 JPlag can either be used via the CLI or directly via its Java API.
@@ -190,3 +187,6 @@ We're happy to incorporate all improvements to JPlag into this codebase. Feel fr
 
 ### Adding new languages
 Adding a new language frontend is quite simple. Have a look at one of the `jplag.frontend` projects. All you need is a parser for the language (e.g., for ANTLR or for JavaCC) and a few lines of code that send the tokens (that are generated by the parser) to JPlag.
+
+## Research
+If you are doing research related to JPlag, we would love to know what you are doing. Feel free to contact us at jplag@ipd.kit.edu or here on GitHub.

jplag.frontend-utils/pom.xml

@@ -3,7 +3,7 @@
   <artifactId>frontend-utils</artifactId>
   <version>0.0.3-SNAPSHOT</version>
   <parent>
-  	<groupId>edu.kit.ipd.jplag</groupId>
+  	<groupId>de.jplag</groupId>
   	<artifactId>parent</artifactId>
   	<version>0.3-SNAPSHOT</version>
   	<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend-utils/src/main/java/jplag/InputState.java → jplag.frontend-utils/src/main/java/de/jplag/InputState.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.io.InputStream;
 import java.io.Reader;

jplag.frontend-utils/src/main/java/jplag/Language.java → jplag.frontend-utils/src/main/java/de/jplag/Language.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.io.File;
 

jplag.frontend-utils/src/main/java/jplag/NewlineStream.java → jplag.frontend-utils/src/main/java/de/jplag/NewlineStream.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.io.IOException;
 import java.io.InputStream;

jplag.frontend-utils/src/main/java/jplag/Parser.java → jplag.frontend-utils/src/main/java/de/jplag/Parser.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 /**
  * @author Emeric Kwemou

jplag.frontend-utils/src/main/java/jplag/ParserToken.java → jplag.frontend-utils/src/main/java/de/jplag/ParserToken.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 public class ParserToken extends antlr.Token {
     /**

jplag.frontend-utils/src/main/java/jplag/ProgramI.java → jplag.frontend-utils/src/main/java/de/jplag/ProgramI.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 public interface ProgramI {
 

jplag.frontend-utils/src/main/java/jplag/Token.java → jplag.frontend-utils/src/main/java/de/jplag/Token.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.io.Serializable;
 

jplag.frontend-utils/src/main/java/jplag/TokenConstants.java → jplag.frontend-utils/src/main/java/de/jplag/TokenConstants.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 public interface TokenConstants {
     final static int FILE_END = 0;

jplag.frontend-utils/src/main/java/jplag/TokenHashMap.java → jplag.frontend-utils/src/main/java/de/jplag/TokenHashMap.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

jplag.frontend-utils/src/main/java/jplag/TokenList.java → jplag.frontend-utils/src/main/java/de/jplag/TokenList.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 import java.util.ArrayList;
 import java.util.List;

jplag.frontend-utils/src/main/java/jplag/UnicodeReader.java → jplag.frontend-utils/src/main/java/de/jplag/UnicodeReader.java

@@ -14,7 +14,7 @@
  * Unicode format = UTF-16LE
  */
 
-package jplag;
+package de.jplag;
 
 import java.io.IOException;
 import java.io.InputStream;

jplag.frontend.chars/pom.xml

@@ -11,8 +11,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.chars.Parser</mainClass>
-							<packageName>jplag.chars</packageName>
+							<mainClass>de.jplag.chars.Parser</mainClass>
+							<packageName>de.jplag.chars</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -22,12 +22,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.chars/src/main/java/jplag/chars/CharToken.java → jplag.frontend.chars/src/main/java/de/jplag/chars/CharToken.java

@@ -1,6 +1,6 @@
-package jplag.chars;
+package de.jplag.chars;
 
-public class CharToken extends jplag.Token {
+public class CharToken extends de.jplag.Token {
 	private static final long serialVersionUID = 1L;
 
 	private int index;

jplag.frontend.chars/src/main/java/jplag/chars/Language.java → jplag.frontend.chars/src/main/java/de/jplag/chars/Language.java

@@ -1,17 +1,17 @@
-package jplag.chars;
+package de.jplag.chars;
 
 import java.io.File;
 
-import jplag.ProgramI;
-import jplag.Token;
+import de.jplag.ProgramI;
+import de.jplag.Token;
 
 /*
  * read in text files as characters
  */
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private ProgramI program;
 
-	private jplag.chars.Parser parser = new Parser();
+	private de.jplag.chars.Parser parser = new Parser();
 
 	public Language(ProgramI program) {
 		this.program = program;
@@ -27,7 +27,7 @@ public class Language implements jplag.Language {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see jplag.Language#errorsCount()
+	 * @see de.jplag.Language#errorsCount()
 	 */
 	@Override
     public int errorsCount() {
@@ -50,7 +50,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -76,7 +76,7 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.chars.CharToken.numberOfTokens();
+		return de.jplag.chars.CharToken.numberOfTokens();
 	}
 
 	@Override

jplag.frontend.chars/src/main/java/jplag/chars/Parser.java → jplag.frontend.chars/src/main/java/de/jplag/chars/Parser.java

@@ -1,16 +1,16 @@
-package jplag.chars;
+package de.jplag.chars;
 
 import java.io.File;
 import java.io.FileReader;
 import java.nio.charset.StandardCharsets;
 
-import jplag.TokenList;
+import de.jplag.TokenList;
 
-public class Parser extends jplag.Parser implements jplag.TokenConstants {
+public class Parser extends de.jplag.Parser implements de.jplag.TokenConstants {
 
 	private TokenList struct;
 
-	public jplag.TokenList parse(File dir, String files[]) {
+	public de.jplag.TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.cpp/pom.xml

@@ -94,12 +94,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.cpp/src/main/java/jplag/cpp/CPPToken.java → jplag.frontend.cpp/src/main/java/de/jplag/cpp/CPPToken.java

@@ -1,6 +1,6 @@
-package jplag.cpp;
+package de.jplag.cpp;
 
-public class CPPToken extends jplag.Token implements CPPTokenConstants {
+public class CPPToken extends de.jplag.Token implements CPPTokenConstants {
 	private static final long serialVersionUID = 1L;
 	private int line;
 

jplag.frontend.cpp/src/main/java/jplag/cpp/CPPTokenConstants.java → jplag.frontend.cpp/src/main/java/de/jplag/cpp/CPPTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.cpp;
+package de.jplag.cpp;
 
-public interface CPPTokenConstants extends jplag.TokenConstants {
+public interface CPPTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
   // Used to optionally separate methods from each other
   // with an always marked token

jplag.frontend.cpp/src/main/java/jplag/cpp/Language.java → jplag.frontend.cpp/src/main/java/de/jplag/cpp/Language.java

@@ -1,13 +1,13 @@
-package jplag.cpp;
+package de.jplag.cpp;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
 /*
  * Leider werden C/C++ nicht geparst, sondern nur gescannt...
  */
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private Scanner scanner;
 
 	public Language(ProgramI program) {
@@ -59,7 +59,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.scanner.scan(dir, files);
 	}
 
@@ -70,11 +70,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.cpp.CPPToken.numberOfTokens();
+		return de.jplag.cpp.CPPToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.cpp.CPPToken.type2string(type);
+		return de.jplag.cpp.CPPToken.type2string(type);
 	}
 }

jplag.frontend.cpp/src/main/java/jplag/cpp/Scanner.java → jplag.frontend.cpp/src/main/java/de/jplag/cpp/Scanner.java

@@ -1,16 +1,16 @@
-package jplag.cpp;
+package de.jplag.cpp;
 
 import java.io.File;
 
-import jplag.Parser;
+import de.jplag.Parser;
 
 public class Scanner extends Parser implements CPPTokenConstants {
 	private String actFile;
 
-	private jplag.TokenList struct;
+	private de.jplag.TokenList struct;
 
-	public jplag.TokenList scan(File dir, String files[]) {
-		struct = new jplag.TokenList();
+	public de.jplag.TokenList scan(File dir, String files[]) {
+		struct = new de.jplag.TokenList();
 		errors = 0;
 		CPPScanner scanner = null;// will be initialized in Method scanFile
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.cpp/src/main/javacc/CPP.jj

@@ -14,14 +14,14 @@ options
 }
 
 PARSER_BEGIN(CPPScanner)
-package jplag.cpp;
+package de.jplag.cpp;
 import java.io.*;
-import jplag.*;
+import de.jplag.*;
 
 public class CPPScanner implements CPPTokenConstants {
     private static Scanner scanner2;
     public static boolean scanFile(File dir, String fileName,
-        jplag.cpp.CPPScanner scanner, jplag.cpp.Scanner scannerX) {
+        de.jplag.cpp.CPPScanner scanner, de.jplag.cpp.Scanner scannerX) {
         try {
             InputStream in = new NewlineStream(
                 new FileInputStream(new File(dir,fileName)));

jplag.frontend.csharp-1.2/pom.xml

@@ -50,8 +50,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.csharp.Parser</mainClass>
-							<packageName>jplag.csharp</packageName>
+							<mainClass>de.jplag.csharp.Parser</mainClass>
+							<packageName>de.jplag.csharp</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -66,12 +66,12 @@
 			<artifactId>antlr</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.csharp-1.2/src/main/antlr/csharp.g

@@ -2,7 +2,7 @@
 
 header 
 {
-package jplag.csharp.grammar;
+package de.jplag.csharp.grammar;
 
 }
 
@@ -20,7 +20,7 @@ options
 	defaultErrorHandler = false;		// don't generate parser error handlers
 	buildAST = false;   
  	exportVocab=CSharp;
-    classHeaderSuffix = "jplag.csharp.CSharpTokenConstants";
+    classHeaderSuffix = "de.jplag.csharp.CSharpTokenConstants";
 }
 
 
@@ -144,12 +144,12 @@ tokens
 	ModifierAttributes;
 	LinePragma;
 }
-	// Emeric 22.01.05 feld jplag.java.Parser parser
+	// Emeric 22.01.05 feld de.jplag.java.Parser parser
 	
 	
 // extended consume routine:
 {
-public jplag.csharp.Parser parser ;
+public de.jplag.csharp.Parser parser ;
     private Token lastConsumedToken = null;
     public void consume() {
         try {

jplag.frontend.csharp-1.2/src/main/java/jplag/csharp/CSharpToken.java → jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/CSharpToken.java

@@ -1,6 +1,6 @@
-package jplag.csharp;
+package de.jplag.csharp;
 
-public class CSharpToken extends jplag.Token implements CSharpTokenConstants {
+public class CSharpToken extends de.jplag.Token implements CSharpTokenConstants {
   private static final long serialVersionUID = 1L;
   private int line, column, length;
 

jplag.frontend.csharp-1.2/src/main/java/jplag/csharp/CSharpTokenConstants.java → jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/CSharpTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.csharp;
+package de.jplag.csharp;
 
-public interface CSharpTokenConstants extends jplag.TokenConstants {
+public interface CSharpTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
 
   // Used to optionally separate methods from each other

jplag.frontend.csharp-1.2/src/main/java/jplag/csharp/Language.java → jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/Language.java

@@ -1,10 +1,10 @@
-package jplag.csharp;
+package de.jplag.csharp;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private Parser parser;
 
 	public Language(ProgramI program) {
@@ -40,7 +40,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -66,11 +66,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.csharp.CSharpToken.numberOfTokens();
+		return de.jplag.csharp.CSharpToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.csharp.CSharpToken.type2string(type);
+		return de.jplag.csharp.CSharpToken.type2string(type);
 	}
 }

jplag.frontend.csharp-1.2/src/main/java/jplag/csharp/Parser.java → jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/Parser.java

@@ -1,19 +1,19 @@
-package jplag.csharp;
+package de.jplag.csharp;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
 
-import jplag.TokenList;
-import jplag.UnicodeReader;
-import jplag.csharp.grammar.CSharpLexer;
-import jplag.csharp.grammar.CSharpParser;
+import de.jplag.TokenList;
+import de.jplag.UnicodeReader;
+import de.jplag.csharp.grammar.CSharpLexer;
+import de.jplag.csharp.grammar.CSharpParser;
 
-public class Parser extends jplag.Parser implements CSharpTokenConstants {
+public class Parser extends de.jplag.Parser implements CSharpTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 
-	public jplag.TokenList parse(File dir, String files[]) {
+	public de.jplag.TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.java-1.1exp/pom.xml

@@ -49,8 +49,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.javax.Parser</mainClass>
-							<packageName>jplag.javax</packageName>
+							<mainClass>de.jplag.javax.Parser</mainClass>
+							<packageName>de.jplag.javax</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -96,12 +96,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.java-1.1exp/src/main/java/jplag/javax/JavaToken.java → jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/JavaToken.java

@@ -1,6 +1,6 @@
-package jplag.javax;
+package de.jplag.javax;
 
-public class JavaToken extends jplag.Token implements JavaTokenConstants {
+public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 8090049637477580276L;
 	private int line;
 

jplag.frontend.java-1.1exp/src/main/java/jplag/javax/JavaTokenConstants.java → jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/JavaTokenConstants.java

@@ -1,8 +1,8 @@
-package jplag.javax;
+package de.jplag.javax;
 
 //import java.io.*;
 
-public interface JavaTokenConstants extends jplag.TokenConstants {
+public interface JavaTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
 
   final static int J_PACKAGE =          1;  

jplag.frontend.java-1.1exp/src/main/java/jplag/javax/Language.java → jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/Language.java

@@ -1,10 +1,10 @@
-package jplag.javax;
+package de.jplag.javax;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private Parser parser;
 
 	public Language(ProgramI program) {
@@ -55,7 +55,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -66,11 +66,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.javax.JavaToken.numberOfTokens();
+		return de.jplag.javax.JavaToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.javax.JavaToken.type2string(type);
+		return de.jplag.javax.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.1exp/src/main/java/jplag/javax/Parser.java → jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/Parser.java

@@ -1,14 +1,14 @@
-package jplag.javax;
+package de.jplag.javax;
 
 import java.io.File;
 
-public class Parser extends jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.Parser implements JavaTokenConstants {
 	private String actFile;
 
-	private jplag.TokenList struct;
+	private de.jplag.TokenList struct;
 
-	public jplag.TokenList parse(File dir, String files[]) {
-		struct = new jplag.TokenList();
+	public de.jplag.TokenList parse(File dir, String files[]) {
+		struct = new de.jplag.TokenList();
 		errors = 0;
 		JavaParser parser = null;// no worry it will be reinitialized
 		// in method parseFile(...)

jplag.frontend.java-1.1exp/src/main/javacc/Java1.1.jj

@@ -24,13 +24,13 @@ options {
 }
 
 PARSER_BEGIN(JavaParser)
-package jplag.javax;
+package de.jplag.javax;
 import java.io.*;
 
 public class JavaParser implements JavaTokenConstants {
   //static JavaParser parser = null;
- private   jplag.javax.Parser parser2 ;
-  public static boolean parseFile(File dir, String fileName,jplag.javax.JavaParser parser,jplag.javax.Parser parserX) {
+ private   de.jplag.javax.Parser parser2 ;
+  public static boolean parseFile(File dir, String fileName,de.jplag.javax.JavaParser parser,de.jplag.javax.Parser parserX) {
     File file=null;
     try {
       FileInputStream in = new FileInputStream(file=new File(dir,fileName));

jplag.frontend.java-1.2/Readme.txt

@@ -8,19 +8,19 @@ names, and comments are ignored, etc. Only some kind of program structure
 remains, which is then compared to other source files.
 
 This package contains a minimal set of files required to build our 
-Java 1.4 frontend (including ANTLR 2.7.7). The jplag.JPlag class has been
+Java 1.4 frontend (including ANTLR 2.7.7). The de.jplag.JPlag class has been
 reduced to only two functions.
 The grammar is specified with ANTLR 2.7.7 (src/main/antlr/java.g). In 
 some productions the parser adds tokens to the above mentioned token stream. 
 Search for "parser.add(" to find these locations. The token types are defined
-in "src/main/java/jplag/java/JavaToken.java" and "src/main/java/jplag/java/JavaTokenConstants.java".
+in "src/main/java/de/jplag/java/JavaToken.java" and "src/main/java/de/jplag/java/JavaTokenConstants.java".
 
 After building the source with a simple "mvn compile", you can test the parser by 
-invoking the main method of jplag.java.Parser with a Java file to parse as arguemtn:
+invoking the main method of de.jplag.java.Parser with a Java file to parse as arguemtn:
 
-java -cp "antlr.jar;build" jplag.java.Parser src/main/java/jplag/java/Parser.java
+java -cp "antlr.jar;build" de.jplag.java.Parser src/main/java/de/jplag/java/Parser.java
 
-This will show you the listing of src/main/java/jplag/java/Parser.java on the right side 
+This will show you the listing of src/main/java/de/jplag/java/Parser.java on the right side 
 of the screen with the generated tokens and their locations on the left side.
 
 To generate a new frontend you have to do the following things:

jplag.frontend.java-1.2/pom.xml

@@ -52,8 +52,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.java.Parser</mainClass>
-							<packageName>jplag.java</packageName>
+							<mainClass>de.jplag.java.Parser</mainClass>
+							<packageName>de.jplag.java</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -68,12 +68,12 @@
 			<artifactId>antlr</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.java-1.2/src/main/antlr/java.g

@@ -1,10 +1,10 @@
 header {
-  package jplag.java.grammar;
+  package de.jplag.java.grammar;
   
   import java.io.IOException;
-  import jplag.java.*;
-  import jplag.InputState;
-  import jplag.ParserToken;
+  import de.jplag.java.*;
+  import de.jplag.InputState;
+  import de.jplag.ParserToken;
 }
 
 /** Java 1.2 Recognizer
@@ -101,9 +101,9 @@ tokens {
   FOR_ITERATOR; EMPTY_STAT; FINAL="final"; ABSTRACT="abstract";
 }
 	
-	// Emeric 13.01.05 feld jplag.java.Parser parser
+	// Emeric 13.01.05 feld de.jplag.java.Parser parser
 	
-	{public jplag.java.Parser parser ;}
+	{public de.jplag.java.Parser parser ;}
 	
 // Compilation Unit: In Java, this is a single file.  This is the start
 //   rule for this parser

jplag.frontend.java-1.2/src/main/java/jplag/java/JavaToken.java → jplag.frontend.java-1.2/src/main/java/de/jplag/java/JavaToken.java

@@ -1,6 +1,6 @@
-package jplag.java;
+package de.jplag.java;
 
-public class JavaToken extends jplag.Token implements JavaTokenConstants {
+public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 1581274829013336295L;
 	private int line, column, length;
 

jplag.frontend.java-1.2/src/main/java/jplag/java/JavaTokenConstants.java → jplag.frontend.java-1.2/src/main/java/de/jplag/java/JavaTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.java;
+package de.jplag.java;
 
-public interface JavaTokenConstants extends jplag.TokenConstants {
+public interface JavaTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
 
   final static int J_PACKAGE = 1;               //

jplag.frontend.java-1.2/src/main/java/jplag/java/Language.java → jplag.frontend.java-1.2/src/main/java/de/jplag/java/Language.java

@@ -1,10 +1,10 @@
-package jplag.java;
+package de.jplag.java;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private Parser parser;
 
 	public Language(ProgramI program) {
@@ -39,7 +39,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -65,11 +65,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.java.JavaToken.numberOfTokens();
+		return de.jplag.java.JavaToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.java.JavaToken.type2string(type);
+		return de.jplag.java.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.2/src/main/java/jplag/java/Parser.java → jplag.frontend.java-1.2/src/main/java/de/jplag/java/Parser.java

@@ -1,19 +1,19 @@
-package jplag.java;
+package de.jplag.java;
 
 import java.io.File;
 import java.io.FileInputStream;
 
-import jplag.InputState;
-import jplag.ParserToken;
-import jplag.TokenList;
-import jplag.java.grammar.JLexer;
-import jplag.java.grammar.JRecognizer;
+import de.jplag.InputState;
+import de.jplag.ParserToken;
+import de.jplag.TokenList;
+import de.jplag.java.grammar.JLexer;
+import de.jplag.java.grammar.JRecognizer;
 
-public class Parser extends jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.Parser implements JavaTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 
-	public jplag.TokenList parse(File dir, String files[]) {
+	public de.jplag.TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -36,7 +36,7 @@ public class Parser extends jplag.Parser implements JavaTokenConstants {
 			inputState = new InputState(fis);
 			JLexer lexer = new JLexer(inputState);
 			lexer.setFilename(file);
-			lexer.setTokenObjectClass("jplag.ParserToken");
+			lexer.setTokenObjectClass("de.jplag.ParserToken");
 
 			// Create a parser that reads from the scanner
 			JRecognizer parser = new JRecognizer(lexer);

jplag.frontend.java-1.5/.gitignore

@@ -1,6 +1,6 @@
-src/main/java/jplag/java15/grammar/CharStream.java
-src/main/java/jplag/java15/grammar/JavaParser.java
-src/main/java/jplag/java15/grammar/JavaParserConstants.java
-src/main/java/jplag/java15/grammar/JavaParserTokenManager.java
-src/main/java/jplag/java15/grammar/ParseException.java
-src/main/java/jplag/java15/grammar/TokenMgrError.java
+src/main/java/de/jplag/java15/grammar/CharStream.java
+src/main/java/de/jplag/java15/grammar/JavaParser.java
+src/main/java/de/jplag/java15/grammar/JavaParserConstants.java
+src/main/java/de/jplag/java15/grammar/JavaParserTokenManager.java
+src/main/java/de/jplag/java15/grammar/ParseException.java
+src/main/java/de/jplag/java15/grammar/TokenMgrError.java

jplag.frontend.java-1.5/pom.xml

@@ -33,7 +33,7 @@
 					<grammarEncoding>${project.build.sourceEncoding}</grammarEncoding>
 					<debugparser>false</debugparser>
 					<isStatic>false</isStatic>
-					<outputDirectory>${project.basedir}/src/main/java/jplag/java15/grammar</outputDirectory>
+					<outputDirectory>${project.basedir}/src/main/java/de/jplag/java15/grammar</outputDirectory>
 				</configuration>
 				<executions>
 					<execution>
@@ -51,8 +51,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.java15.Parser</mainClass>
-							<packageName>jplag.java15</packageName>
+							<mainClass>de.jplag.java15.Parser</mainClass>
+							<packageName>de.jplag.java15</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -62,12 +62,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.java-1.5/src/main/java/jplag/java15/JavaToken.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/JavaToken.java

@@ -1,8 +1,6 @@
-package jplag.java15;
+package de.jplag.java15;
 
-import jplag.Token;
-
-public class JavaToken extends jplag.Token implements JavaTokenConstants {
+public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 3743208940428676175L;
 	private int line, column, length;
 

jplag.frontend.java-1.5/src/main/java/jplag/java15/JavaTokenConstants.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/JavaTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.java15;
+package de.jplag.java15;
 
-public interface JavaTokenConstants extends jplag.TokenConstants {
+public interface JavaTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
   
   // Used to optionally separate methods from each other

jplag.frontend.java-1.5/src/main/java/jplag/java15/Language.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/Language.java

@@ -1,10 +1,10 @@
-package jplag.java15;
+package de.jplag.java15;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 	private Parser parser;
 
 	public Language(ProgramI program) {
@@ -39,7 +39,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -65,11 +65,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.java15.JavaToken.numberOfTokens();
+		return de.jplag.java15.JavaToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.java15.JavaToken.type2string(type);
+		return de.jplag.java15.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.5/src/main/java/jplag/java15/LanguageWithDelimitedMethods.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/LanguageWithDelimitedMethods.java

@@ -1,15 +1,15 @@
-package jplag.java15;
+package de.jplag.java15;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
 /**
  * Java 1.5 parser with method separators; if you know why these separators
  * exist, PLEASE tell us or document at
- * https://svn.ipd.kit.edu/trac/jplag/wiki/Server/Frontends/Java-1.5)
+ * https://svn.ipd.kit.edu/trac/de/jplag/wiki/Server/Frontends/Java-1.5)
  */
-public class LanguageWithDelimitedMethods implements jplag.Language {
+public class LanguageWithDelimitedMethods implements de.jplag.Language {
 	private Parser parser;
 
 	public LanguageWithDelimitedMethods(ProgramI program) {
@@ -44,7 +44,7 @@ public class LanguageWithDelimitedMethods implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -70,11 +70,11 @@ public class LanguageWithDelimitedMethods implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.java15.JavaToken.numberOfTokens();
+		return de.jplag.java15.JavaToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.java15.JavaToken.type2string(type);
+		return de.jplag.java15.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.5/src/main/java/jplag/java15/Parser.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/Parser.java

@@ -1,22 +1,22 @@
-package jplag.java15;
+package de.jplag.java15;
 
 import java.io.File;
 
-import jplag.java15.grammar.JavaParser;
-import jplag.java15.grammar.Token;
+import de.jplag.java15.grammar.JavaParser;
+import de.jplag.java15.grammar.Token;
 
-public class Parser extends jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.Parser implements JavaTokenConstants {
 	private String actFile;
 	private boolean useMethodSeparators;
 
-	private jplag.TokenList struct;
+	private de.jplag.TokenList struct;
 
 	public Parser(boolean useMethodSeparators) {
 		this.useMethodSeparators = useMethodSeparators;
 	}
 
-	public jplag.TokenList parse(File dir, String files[]) {
-		struct = new jplag.TokenList();
+	public de.jplag.TokenList parse(File dir, String files[]) {
+		struct = new de.jplag.TokenList();
 		errors = 0;
 
 		JavaParser parser = null; // This will be (re)initialised in parseFile()

jplag.frontend.java-1.5/src/main/java/jplag/java15/grammar/JavaTabModCharStream.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/grammar/JavaTabModCharStream.java

@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 3.0 */
-package jplag.java15.grammar;
+package de.jplag.java15.grammar;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to

jplag.frontend.java-1.5/src/main/java/jplag/java15/grammar/Token.java → jplag.frontend.java-1.5/src/main/java/de/jplag/java15/grammar/Token.java

@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
-package jplag.java15.grammar;
+package de.jplag.java15.grammar;
 
 /**
  * Describes the input token stream.

jplag.frontend.java-1.5/src/main/javacc/Java1.5.jj

@@ -30,14 +30,14 @@ options {
 }
 
 PARSER_BEGIN(JavaParser)
-package jplag.java15.grammar;
+package de.jplag.java15.grammar;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.nio.charset.StandardCharsets;
 
-import jplag.UnicodeReader;
-import jplag.java15.JavaTokenConstants;
+import de.jplag.UnicodeReader;
+import de.jplag.java15.JavaTokenConstants;
 
 /**
  * Grammar to parse Java version 1.5
@@ -49,7 +49,7 @@ public class JavaParser implements JavaTokenConstants
      * Class to hold modifiers.
      */
   
-    private jplag.java15.Parser parser2;
+    private de.jplag.java15.Parser parser2;
     static public final class ModifierSet
     {
         /* Definitions of the bits in the modifiers field.  */
@@ -133,7 +133,7 @@ public class JavaParser implements JavaTokenConstants
     //JavaParser parser = null;
     JavaTabModCharStream charStream = null;
 
-    public static boolean parseFile(File dir, String fileName, JavaParser parser, jplag.java15.Parser parserX)
+    public static boolean parseFile(File dir, String fileName, JavaParser parser, de.jplag.java15.Parser parserX)
     {
         try {
             FileInputStream in = new FileInputStream(new File(dir,fileName));

jplag.frontend.java-1.7/pom.xml

@@ -37,12 +37,6 @@
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
 				<version>4.2</version>
-				<configuration>
-					<!-- Comma separated list of grammar files or pattern grammar files 
-						By default, grammar file(s) is in ${basedir}/src/main/antlr -->
-					<!-- <grammars>*.g</grammars> -->
-					<grammars>Java7.g4</grammars>
-				</configuration>
 				<executions>
 					<execution>
 						<goals>
@@ -58,8 +52,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.java17.Parser</mainClass>
-							<packageName>jplag.java17</packageName>
+							<mainClass>de.jplag.java17.Parser</mainClass>
+							<packageName>de.jplag.java17</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -70,7 +64,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 		<dependency>
@@ -78,13 +72,13 @@
 			<artifactId>antlr4-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>java-1.5</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.java-1.7/src/main/java/jplag/java17/JavaToken.java → jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JavaToken.java

@@ -1,6 +1,6 @@
-package jplag.java17;
+package de.jplag.java17;
 
-public class JavaToken extends jplag.Token implements JavaTokenConstants {
+public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = -383581430479870696L;
 	private int line, column, length;
 

jplag.frontend.java-1.7/src/main/java/jplag/java17/JavaTokenConstants.java → jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JavaTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.java17;
+package de.jplag.java17;
 
-public interface JavaTokenConstants extends jplag.TokenConstants {
+public interface JavaTokenConstants extends de.jplag.TokenConstants {
 	final static int FILE_END = 0;
 
 	// Used to optionally separate methods from each other

jplag.frontend.java-1.7/src/main/java/jplag/java17/JplagJava7Listener.java → jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JplagJava7Listener.java

@@ -1,18 +1,18 @@
-package jplag.java17;
+package de.jplag.java17;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import jplag.java17.grammar.Java7Listener;
-import jplag.java17.grammar.Java7Parser.*;
+import de.jplag.java17.grammar.Java7Listener;
+import de.jplag.java17.grammar.Java7Parser.*;
 
 public class JplagJava7Listener implements Java7Listener, JavaTokenConstants {
 
-	private jplag.java17.Parser jplagParser;
+	private de.jplag.java17.Parser jplagParser;
 
-	public JplagJava7Listener(jplag.java17.Parser jplag) {
+	public JplagJava7Listener(de.jplag.java17.Parser jplag) {
 		jplagParser = jplag;
 	}
 

jplag.frontend.java-1.7/src/main/java/jplag/java17/Language.java → jplag.frontend.java-1.7/src/main/java/de/jplag/java17/Language.java

@@ -1,14 +1,14 @@
-package jplag.java17;
+package de.jplag.java17;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
-	private jplag.java17.Parser parser;
+public class Language implements de.jplag.Language {
+	private de.jplag.java17.Parser parser;
 
 	public Language(ProgramI program) {
-		this.parser = new jplag.java17.Parser();
+		this.parser = new de.jplag.java17.Parser();
 		this.parser.setProgram(program);
 	}
 
@@ -39,7 +39,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -65,11 +65,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.java17.JavaToken.numberOfTokens();
+		return de.jplag.java17.JavaToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.java17.JavaToken.type2string(type);
+		return de.jplag.java17.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.7/src/main/java/jplag/java17/Parser.java → jplag.frontend.java-1.7/src/main/java/de/jplag/java17/Parser.java

@@ -1,4 +1,4 @@
-package jplag.java17;
+package de.jplag.java17;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -11,16 +11,16 @@ import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
-import jplag.TokenList;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
-import jplag.java17.grammar.Java7Parser.CompilationUnitContext;
+import de.jplag.TokenList;
+import de.jplag.java17.grammar.Java7Lexer;
+import de.jplag.java17.grammar.Java7Parser;
+import de.jplag.java17.grammar.Java7Parser.CompilationUnitContext;
 
-public class Parser extends jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.Parser implements JavaTokenConstants {
 	private TokenList struct = new TokenList();
 	private String currentFile;
 
-	public jplag.TokenList parse(File dir, String files[]) {
+	public de.jplag.TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.java-1.7/src/test/java/jplag/StrippedProgram.java → jplag.frontend.java-1.7/src/test/java/de/jplag/StrippedProgram.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 /**
  * This is a stripped version of the JPlag main class Program to be used during front end development only.

jplag.frontend.java-1.7/src/test/java/jplag/antlr4Learning/Antlr4LearningTests.java → jplag.frontend.java-1.7/src/test/java/de/jplag/antlr4Learning/Antlr4LearningTests.java

@@ -1,4 +1,4 @@
-package jplag.antlr4Learning;
+package de.jplag.antlr4Learning;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -14,9 +14,9 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import jplag.java17.JplagJava7Listener;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
+import de.jplag.java17.JplagJava7Listener;
+import de.jplag.java17.grammar.Java7Lexer;
+import de.jplag.java17.grammar.Java7Parser;
 
 public class Antlr4LearningTests {
 	private static File srcTestResources;
@@ -37,8 +37,8 @@ public class Antlr4LearningTests {
 		// create a buffer of tokens pulled from the lexer
 		CommonTokenStream tokens = new CommonTokenStream(lexer);
 
-		jplag.java17.grammar.Java7Parser j7p = new Java7Parser(tokens);
-		j7p.addParseListener(new JplagJava7Listener(new jplag.java17.Parser()));
+		Java7Parser j7p = new Java7Parser(tokens);
+		j7p.addParseListener(new JplagJava7Listener(new de.jplag.java17.Parser()));
 
 		j7p.compilationUnit();
 	}

jplag.frontend.java-1.7/src/test/java/jplag/java17/Bug58.java → jplag.frontend.java-1.7/src/test/java/de/jplag/java17/Bug58.java

@@ -1,4 +1,4 @@
-package jplag.java17;
+package de.jplag.java17;
 
 import java.io.File;
 import java.io.IOException;
@@ -6,7 +6,7 @@ import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/** See https://svn.ipd.kit.edu/trac/jplag/ticket/58 */
+/** See https://svn.ipd.kit.edu/trac/de/jplag/ticket/58 */
 public class Bug58 {
 	private static File srcTestResources;
 
@@ -31,7 +31,7 @@ public class Bug58 {
 	}
 
 	/**
-	 * Uses the actual parser component (not only the antlr parser but the jplag
+	 * Uses the actual parser component (not only the antlr parser but the de.jplag
 	 * frontend) to parse a file. Should throw no errors and exceptions :)
 	 * 
 	 * @param file
@@ -39,7 +39,7 @@ public class Bug58 {
 	 */
 	private void parseWithActualParser(File file) {
 		Parser parser = new Parser();
-		parser.setProgram(new jplag.StrippedProgram());
+		parser.setProgram(new de.jplag.StrippedProgram());
 		parser.parse(null, new String[] { file.toString() });
 	}
 }

jplag.frontend.java-1.7/src/test/java/jplag/java17/ParserTest.java → jplag.frontend.java-1.7/src/test/java/de/jplag/java17/ParserTest.java

@@ -1,4 +1,4 @@
-package jplag.java17;
+package de.jplag.java17;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -15,9 +15,9 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import jplag.StrippedProgram;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
+import de.jplag.StrippedProgram;
+import de.jplag.java17.grammar.Java7Lexer;
+import de.jplag.java17.grammar.Java7Parser;
 
 public class ParserTest {
 
@@ -231,7 +231,7 @@ public class ParserTest {
 	/**
 	 * Compare results (token sequence) with Java 1.5 parser (without method
 	 * separators ; if you know why they exist, PLEASE tell us or document at
-	 * https://svn.ipd.kit.edu/trac/jplag/wiki/Server/Frontends/Java-1.5)
+	 * https://svn.ipd.kit.edu/trac/de/jplag/wiki/Server/Frontends/Java-1.5)
 	 * 
 	 * @param javaFile
 	 * @throws IOException
@@ -249,9 +249,9 @@ public class ParserTest {
 	private String parseWithJ5Parser(File javaFile) {
 
 		// parse with old parser
-		jplag.java15.Parser oldParser = new jplag.java15.Parser(false);
+		de.jplag.java15.Parser oldParser = new de.jplag.java15.Parser(false);
 		oldParser.setProgram(new StrippedProgram());
-		jplag.TokenList oldStruct = oldParser.parse(javaFile.getParentFile(), new String[] { javaFile.getName() });
+		de.jplag.TokenList oldStruct = oldParser.parse(javaFile.getParentFile(), new String[] { javaFile.getName() });
 
 		String oldTokens = buildTokenString(oldStruct, true);
 		return oldTokens;
@@ -262,16 +262,16 @@ public class ParserTest {
 	 * (meaning the integer values are the same but Java 1.7 has more than Java
 	 * 1.5)
 	 * 
-	 * @see jplag.java17.JavaToken
+	 * @see de.jplag.java17.JavaToken
 	 * 
 	 * @param oldStruct
 	 * @param withDetails
 	 * @return
 	 */
-	private String buildTokenString(jplag.TokenList oldStruct, boolean withDetails) {
+	private String buildTokenString(de.jplag.TokenList oldStruct, boolean withDetails) {
 		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < oldStruct.size(); i++) {
-			sb.append(jplag.java17.JavaToken.type2string(oldStruct.getToken(i).type));
+			sb.append(de.jplag.java17.JavaToken.type2string(oldStruct.getToken(i).type));
 			if (withDetails) {
 				sb.append(" L:" + oldStruct.getToken(i).getLine()  
 				+ " C:" + oldStruct.getToken(i).getLine()
@@ -286,9 +286,9 @@ public class ParserTest {
 
 	private String parseWithJ7Parser(File javaFile, boolean withDetails) {
 		// parse with new parser
-		jplag.java17.Parser newParser = new Parser();
+		de.jplag.java17.Parser newParser = new Parser();
 		newParser.setProgram(new StrippedProgram());
-		jplag.TokenList newStruct = newParser.parse(javaFile.getParentFile(), new String[] { javaFile.getName() });
+		de.jplag.TokenList newStruct = newParser.parse(javaFile.getParentFile(), new String[] { javaFile.getName() });
 
 		String newTokens = buildTokenString(newStruct, withDetails);
 		return newTokens;

jplag.frontend.java-1.9/pom.xml

@@ -13,8 +13,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.java19.Parser</mainClass>
-							<packageName>jplag.java19</packageName>
+							<mainClass>de.jplag.java19.Parser</mainClass>
+							<packageName>de.jplag.java19</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -25,12 +25,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.java-1.9/src/main/java/jplag/java19/JavaToken.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/JavaToken.java

@@ -1,6 +1,6 @@
-package jplag.java19;
+package de.jplag.java19;
 
-public class JavaToken extends jplag.Token implements JavaTokenConstants {
+public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
     private static final long serialVersionUID = -383581430479870696L;
     private int line, column, length;
 

jplag.frontend.java-1.9/src/main/java/jplag/java19/JavaTokenConstants.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/JavaTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.java19;
+package de.jplag.java19;
 
-public interface JavaTokenConstants extends jplag.TokenConstants {
+public interface JavaTokenConstants extends de.jplag.TokenConstants {
     final static int FILE_END = 0;
 
     // check used to mark tokens that are actually generated by the adapter

jplag.frontend.java-1.9/src/main/java/jplag/java19/JavacAdapter.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/JavacAdapter.java

@@ -1,4 +1,4 @@
-package jplag.java19;
+package de.jplag.java19;
 
 import java.io.File;
 import java.io.IOException;

jplag.frontend.java-1.9/src/main/java/jplag/java19/Language.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/Language.java

@@ -1,14 +1,14 @@
-package jplag.java19;
+package de.jplag.java19;
 
 import java.io.File;
 
-import jplag.ProgramI;
-import jplag.TokenList;
+import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 /**
  * Language for Java 9 and newer.
  */
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
     private Parser parser;
 
     public Language(ProgramI program) {

jplag.frontend.java-1.9/src/main/java/jplag/java19/Parser.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/Parser.java

@@ -1,12 +1,12 @@
-package jplag.java19;
+package de.jplag.java19;
 
 import java.io.File;
 
-public class Parser extends jplag.Parser {
-    private jplag.TokenList tokenList;
+public class Parser extends de.jplag.Parser {
+    private de.jplag.TokenList tokenList;
 
-    public jplag.TokenList parse(File dir, String files[]) {
-        tokenList = new jplag.TokenList();
+    public de.jplag.TokenList parse(File dir, String files[]) {
+        tokenList = new de.jplag.TokenList();
         errors = 0;
         File pathedFiles[] = new File[files.length];
         for (int i = 0; i < files.length; i++) {

jplag.frontend.java-1.9/src/main/java/jplag/java19/TokenGeneratingTreeScanner.java → jplag.frontend.java-1.9/src/main/java/de/jplag/java19/TokenGeneratingTreeScanner.java

@@ -1,4 +1,4 @@
-package jplag.java19;
+package de.jplag.java19;
 
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.AssertTree;

jplag.frontend.python-3/pom.xml

@@ -51,8 +51,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.python3.Parser</mainClass>
-							<packageName>jplag.python3</packageName>
+							<mainClass>de.jplag.python3.Parser</mainClass>
+							<packageName>de.jplag.python3</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -63,7 +63,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 		<dependency>
@@ -72,7 +72,7 @@
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.python-3/src/main/java/jplag/python3/JplagPython3Listener.java → jplag.frontend.python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java

@@ -1,17 +1,17 @@
-package jplag.python3;
+package de.jplag.python3;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import jplag.python3.grammar.Python3Listener;
-import jplag.python3.grammar.Python3Parser;
+import de.jplag.python3.grammar.Python3Listener;
+import de.jplag.python3.grammar.Python3Parser;
 
 public class JplagPython3Listener implements Python3Listener, Python3TokenConstants {
 
-    private jplag.python3.Parser jplagParser;
+    private de.jplag.python3.Parser jplagParser;
 
-    public JplagPython3Listener(jplag.python3.Parser jplag) {
+    public JplagPython3Listener(de.jplag.python3.Parser jplag) {
         jplagParser = jplag;
     }
 

jplag.frontend.python-3/src/main/java/jplag/python3/Language.java → jplag.frontend.python-3/src/main/java/de/jplag/python3/Language.java

@@ -1,15 +1,15 @@
-package jplag.python3;
+package de.jplag.python3;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 
-    private jplag.python3.Parser parser;
+    private de.jplag.python3.Parser parser;
 
     public Language(ProgramI program) {
-        this.parser = new jplag.python3.Parser();
+        this.parser = new de.jplag.python3.Parser();
         this.parser.setProgram(program);
     }
 
@@ -40,7 +40,7 @@ public class Language implements jplag.Language {
     }
 
     @Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
         return this.parser.parse(dir, files);
     }
 
@@ -66,11 +66,11 @@ public class Language implements jplag.Language {
 
     @Override
     public int noOfTokens() {
-        return jplag.python3.Python3Token.numberOfTokens();
+        return de.jplag.python3.Python3Token.numberOfTokens();
     }
 
     @Override
     public String type2string(int type) {
-        return jplag.python3.Python3Token.type2string(type);
+        return de.jplag.python3.Python3Token.type2string(type);
     }
 }

jplag.frontend.python-3/src/main/java/jplag/python3/Parser.java → jplag.frontend.python-3/src/main/java/de/jplag/python3/Parser.java

@@ -1,4 +1,4 @@
-package jplag.python3;
+package de.jplag.python3;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -11,17 +11,17 @@ import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
-import jplag.TokenList;
-import jplag.python3.grammar.Python3Lexer;
-import jplag.python3.grammar.Python3Parser;
-import jplag.python3.grammar.Python3Parser.File_inputContext;
+import de.jplag.TokenList;
+import de.jplag.python3.grammar.Python3Lexer;
+import de.jplag.python3.grammar.Python3Parser;
+import de.jplag.python3.grammar.Python3Parser.File_inputContext;
 
-public class Parser extends jplag.Parser implements Python3TokenConstants {
+public class Parser extends de.jplag.Parser implements Python3TokenConstants {
 
     private TokenList struct = new TokenList();
     private String currentFile;
 
-    public jplag.TokenList parse(File dir, String files[]) {
+    public de.jplag.TokenList parse(File dir, String files[]) {
         struct = new TokenList();
         errors = 0;
         for (int i = 0; i < files.length; i++) {

jplag.frontend.python-3/src/main/java/jplag/python3/Python3Token.java → jplag.frontend.python-3/src/main/java/de/jplag/python3/Python3Token.java

@@ -1,6 +1,6 @@
-package jplag.python3;
+package de.jplag.python3;
 
-public class Python3Token extends jplag.Token implements Python3TokenConstants {
+public class Python3Token extends de.jplag.Token implements Python3TokenConstants {
 
     private static final long serialVersionUID = 1485877548175917943L;
     

jplag.frontend.python-3/src/main/java/jplag/python3/Python3TokenConstants.java → jplag.frontend.python-3/src/main/java/de/jplag/python3/Python3TokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.python3;
+package de.jplag.python3;
 
-public interface Python3TokenConstants extends jplag.TokenConstants {
+public interface Python3TokenConstants extends de.jplag.TokenConstants {
 
     final static int FILE_END = 0;
     final static int SEPARATOR_TOKEN = 1;

jplag.frontend.scheme/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jplag.frontend.scheme</name>
+	<name>de.jplag.frontend.scheme</name>
 	<comment></comment>
 	<projects>
 	</projects>

jplag.frontend.scheme/pom.xml

@@ -60,8 +60,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.scheme.Parser</mainClass>
-							<packageName>jplag.scheme</packageName>
+							<mainClass>de.jplag.scheme.Parser</mainClass>
+							<packageName>de.jplag.scheme</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -107,12 +107,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.scheme/src/main/java/jplag/scheme/InsertStream.java → jplag.frontend.scheme/src/main/java/de/jplag/scheme/InsertStream.java

@@ -1,4 +1,4 @@
-package jplag.scheme;
+package de.jplag.scheme;
 
 import java.io.File;
 import java.io.FileDescriptor;

jplag.frontend.scheme/src/main/java/jplag/scheme/Language.java → jplag.frontend.scheme/src/main/java/de/jplag/scheme/Language.java

@@ -1,10 +1,10 @@
-package jplag.scheme;
+package de.jplag.scheme;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 
 	public Language(ProgramI program) {
 		this.parser = new Parser();
@@ -17,7 +17,7 @@ public class Language implements jplag.Language {
 		return this.parser.errorsCount();
 	}
 
-	private jplag.scheme.Parser parser; // Not yet instantiated? See constructor!
+	private de.jplag.scheme.Parser parser; // Not yet instantiated? See constructor!
 
 	@Override
     public String[] suffixes() {
@@ -56,7 +56,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -67,11 +67,11 @@ public class Language implements jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return jplag.scheme.SchemeToken.numberOfTokens();
+		return de.jplag.scheme.SchemeToken.numberOfTokens();
 	}
 
 	@Override
     public String type2string(int type) {
-		return jplag.scheme.SchemeToken.type2string(type);
+		return de.jplag.scheme.SchemeToken.type2string(type);
 	}
 }

jplag.frontend.scheme/src/main/java/jplag/scheme/Parser.java → jplag.frontend.scheme/src/main/java/de/jplag/scheme/Parser.java

@@ -1,14 +1,14 @@
-package jplag.scheme;
+package de.jplag.scheme;
 
 import java.io.File;
 
-public class Parser extends jplag.Parser implements SchemeTokenConstants {
+public class Parser extends de.jplag.Parser implements SchemeTokenConstants {
 	private String actFile;
 
-	private jplag.TokenList struct;
+	private de.jplag.TokenList struct;
 
-	public jplag.TokenList parse(File dir, String files[]) {
-		struct = new jplag.TokenList();
+	public de.jplag.TokenList parse(File dir, String files[]) {
+		struct = new de.jplag.TokenList();
 		errors = 0;
 		SchemeParser parser = null;// no worry it will be reinitialized
 		// in method parseFile(...)

jplag.frontend.scheme/src/main/java/jplag/scheme/SchemeToken.java → jplag.frontend.scheme/src/main/java/de/jplag/scheme/SchemeToken.java

@@ -1,74 +1,76 @@
-package jplag.scheme;
-
-public class SchemeToken extends jplag.Token implements SchemeTokenConstants {
-	private static final long serialVersionUID = -143418583849687339L;
-	private int line;
-
-  public SchemeToken(int type, String file, int line) {
-    super(type, file, line);
-  }
-
-  @Override
-public int getLine() { return line; }
-  @Override
-public void setLine(int line) { this.line = line; }
-
-  @Override
-public int getColumn() {return 0;}
-  @Override
-public int getLength() {return 0;}
-
-  public static String type2string(int type) {
-    switch (type) {
-    case SchemeTokenConstants.FILE_END:
-                             return "********";
-    case S_BOOL:             return "BOOL    ";
-    case S_NUMBER:           return "NUMBER  ";
-    case S_CHAR:             return "CHAR    ";
-    case S_STRING:           return "STRING  ";
-    case S_ID:               return "ID      ";
-    case S_LIST_BEGIN:       return "(LIST   ";
-    case S_LIST_END:         return "LIST)   ";
-    case S_VECTOR_BEGIN:     return "(VECTOR ";
-    case S_VECTOR_END:       return "VECTOR) ";
-    case S_LITERAL:          return "LITERAL ";
-    case S_QUOT_BEGIN:       return "(QUOT   ";
-    case S_QUOT_END:         return "QUOT)   ";
-    case S_CALL:             return "CALL    ";
-    case S_LAMBDA_BEGIN:     return "(LAMBDA ";
-    case S_LAMBDA_END:       return "LAMBDA) ";
-    case S_FORMAL_BEGIN:     return "(FORMAL ";
-    case S_FORMAL_END:       return "FORMAL) ";
-    case S_BODY_BEGIN:       return "(BODY   ";
-    case S_BODY_END:         return "BODY)   ";
-    case S_IF_BEGIN:         return "(IF     ";
-    case S_IF_END:           return "IF)     ";
-    case S_ALTERN:           return "ALTERN  ";
-    case S_ASSIGN_BEGIN:     return "(ASSIGN ";
-    case S_ASSIGN_END:       return "ASSIGN) ";
-    case S_COND_BEGIN:       return "(COND   ";
-    case S_COND_END:         return "COND)   ";
-    case S_ELSE:             return "ELSE    ";
-    case S_CASE_BEGIN:       return "(CASE   ";
-    case S_CASE_END:         return "CASE)   ";
-    case S_DO_BEGIN:         return "(DO     ";
-    case S_DO_END:           return "DO)     ";
-    case S_COMMAND:          return "COMMAND ";
-    case S_DEF_BEGIN:        return "(DEF    ";
-    case S_DEF_END:          return "DEF)    ";
-    case S_BEGIN:            return "(       ";
-    case S_END:              return ")       ";
-    case S_AND:              return "AND     ";
-    case S_OR:               return "OR      ";
-    case S_LET:              return "LET     ";
-    case S_DELAY:            return "DELAY   ";
-    case S_VAR:              return "VAR     ";
-      
-    default:                 return "<?????> ";
-    }
-  }
-  
-  public static int numberOfTokens() { 
-    return NUM_DIFF_TOKENS;
-  }
-}
+package de.jplag.scheme;
+
+import de.jplag.Token;
+
+public class SchemeToken extends Token implements SchemeTokenConstants {
+	private static final long serialVersionUID = -143418583849687339L;
+	private int line;
+
+  public SchemeToken(int type, String file, int line) {
+    super(type, file, line);
+  }
+
+  @Override
+public int getLine() { return line; }
+  @Override
+public void setLine(int line) { this.line = line; }
+
+  @Override
+public int getColumn() {return 0;}
+  @Override
+public int getLength() {return 0;}
+
+  public static String type2string(int type) {
+    switch (type) {
+    case SchemeTokenConstants.FILE_END:
+                             return "********";
+    case S_BOOL:             return "BOOL    ";
+    case S_NUMBER:           return "NUMBER  ";
+    case S_CHAR:             return "CHAR    ";
+    case S_STRING:           return "STRING  ";
+    case S_ID:               return "ID      ";
+    case S_LIST_BEGIN:       return "(LIST   ";
+    case S_LIST_END:         return "LIST)   ";
+    case S_VECTOR_BEGIN:     return "(VECTOR ";
+    case S_VECTOR_END:       return "VECTOR) ";
+    case S_LITERAL:          return "LITERAL ";
+    case S_QUOT_BEGIN:       return "(QUOT   ";
+    case S_QUOT_END:         return "QUOT)   ";
+    case S_CALL:             return "CALL    ";
+    case S_LAMBDA_BEGIN:     return "(LAMBDA ";
+    case S_LAMBDA_END:       return "LAMBDA) ";
+    case S_FORMAL_BEGIN:     return "(FORMAL ";
+    case S_FORMAL_END:       return "FORMAL) ";
+    case S_BODY_BEGIN:       return "(BODY   ";
+    case S_BODY_END:         return "BODY)   ";
+    case S_IF_BEGIN:         return "(IF     ";
+    case S_IF_END:           return "IF)     ";
+    case S_ALTERN:           return "ALTERN  ";
+    case S_ASSIGN_BEGIN:     return "(ASSIGN ";
+    case S_ASSIGN_END:       return "ASSIGN) ";
+    case S_COND_BEGIN:       return "(COND   ";
+    case S_COND_END:         return "COND)   ";
+    case S_ELSE:             return "ELSE    ";
+    case S_CASE_BEGIN:       return "(CASE   ";
+    case S_CASE_END:         return "CASE)   ";
+    case S_DO_BEGIN:         return "(DO     ";
+    case S_DO_END:           return "DO)     ";
+    case S_COMMAND:          return "COMMAND ";
+    case S_DEF_BEGIN:        return "(DEF    ";
+    case S_DEF_END:          return "DEF)    ";
+    case S_BEGIN:            return "(       ";
+    case S_END:              return ")       ";
+    case S_AND:              return "AND     ";
+    case S_OR:               return "OR      ";
+    case S_LET:              return "LET     ";
+    case S_DELAY:            return "DELAY   ";
+    case S_VAR:              return "VAR     ";
+      
+    default:                 return "<?????> ";
+    }
+  }
+  
+  public static int numberOfTokens() { 
+    return NUM_DIFF_TOKENS;
+  }
+}

jplag.frontend.scheme/src/main/java/jplag/scheme/SchemeTokenConstants.java → jplag.frontend.scheme/src/main/java/de/jplag/scheme/SchemeTokenConstants.java

@@ -1,6 +1,6 @@
-package jplag.scheme;
+package de.jplag.scheme;
 
-public interface SchemeTokenConstants extends jplag.TokenConstants {
+public interface SchemeTokenConstants extends de.jplag.TokenConstants {
   final static int FILE_END = 0;
 
   // Used to optionally separate methods from each other

jplag.frontend.scheme/src/main/javacc/Scheme.jj

@@ -50,17 +50,17 @@ options
 
 
 PARSER_BEGIN(SchemeParser)
-package jplag.scheme;
+package de.jplag.scheme;
 import java.io.*;
 
 public class SchemeParser implements SchemeTokenConstants {
     /* used for context in the template production rule */
     private static int templateParam;
-    private jplag.scheme.Parser parser2 ;
+    private de.jplag.scheme.Parser parser2 ;
     //static SchemeParser parser = null;
 
     public static boolean parseFile(File dir, String fileName,
-        SchemeParser parser,jplag.scheme.Parser parserX)
+        SchemeParser parser, de.jplag.scheme.Parser parserX)
     {
         File file=null;
         try {

jplag.frontend.text/pom.xml

@@ -51,8 +51,8 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>jplag.text.Parser</mainClass>
-							<packageName>jplag.text</packageName>
+							<mainClass>de.jplag.text.Parser</mainClass>
+							<packageName>de.jplag.text</packageName>
 						</manifest>
 					</archive>
 				</configuration>
@@ -67,12 +67,12 @@
 			<artifactId>antlr</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag</groupId>
+			<groupId>de.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.frontend.text/src/main/antlr/text.g

@@ -3,10 +3,10 @@
 header
 {
 
-package jplag.text;
+package de.jplag.text;
 
-import jplag.InputState;
-import jplag.ParserToken;
+import de.jplag.InputState;
+import de.jplag.ParserToken;
 
 //import java.io.InputStream;
 //import java.io.InputStreamReader;
@@ -40,7 +40,7 @@ options
 }
 
 {
-public jplag.text.Parser parser;
+public de.jplag.text.Parser parser;
   /**
    * The main routine is just for testing.
    */

jplag.frontend.text/src/main/java/jplag/text/Language.java → jplag.frontend.text/src/main/java/de/jplag/text/Language.java

@@ -1,19 +1,19 @@
 
-package jplag.text;
+package de.jplag.text;
 
 import java.io.File;
 
-import jplag.ProgramI;
+import de.jplag.ProgramI;
 
 /**
  * @Changed by Emeric Kwemou 29.01.2005
  *  
  */
-public class Language implements jplag.Language {
+public class Language implements de.jplag.Language {
 
 	private ProgramI program;
 
-	private jplag.text.Parser parser = new jplag.text.Parser();
+	private de.jplag.text.Parser parser = new de.jplag.text.Parser();
 
 	public Language(ProgramI program) {
 		this.program = program;
@@ -47,7 +47,7 @@ public class Language implements jplag.Language {
 	}
 
 	@Override
-    public jplag.TokenList parse(File dir, String[] files) {
+    public de.jplag.TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -74,7 +74,7 @@ public class Language implements jplag.Language {
 	@Override
     public int noOfTokens() {
         return parser.tokenStructure.serial;
-//		return jplag.text.TextToken.numberOfTokens();   // always returns 1 ....
+//		return de.jplag.text.TextToken.numberOfTokens();   // always returns 1 ....
 	}
 
 	@Override

jplag.frontend.text/src/main/java/jplag/text/Parser.java → jplag.frontend.text/src/main/java/de/jplag/text/Parser.java

@@ -1,4 +1,4 @@
-package jplag.text;
+package de.jplag.text;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -7,15 +7,15 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.util.HashSet;
 
-import jplag.InputState;
-import jplag.ParserToken;
-import jplag.TokenList;
+import de.jplag.InputState;
+import de.jplag.ParserToken;
+import de.jplag.TokenList;
 
 /**
  * @Changed by Emeric Kwemou 29.01.2005
  *  
  */
-public class Parser extends jplag.Parser implements jplag.TokenConstants {
+public class Parser extends de.jplag.Parser implements de.jplag.TokenConstants {
 
 	protected TokenStructure tokenStructure = new TokenStructure();
 
@@ -47,7 +47,7 @@ public class Parser extends jplag.Parser implements jplag.TokenConstants {
 		}
 	}
 
-	public jplag.TokenList parse(File dir, String files[]) {
+	public de.jplag.TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -72,7 +72,7 @@ public class Parser extends jplag.Parser implements jplag.TokenConstants {
 			inputState = new InputState(fis);
 			TextLexer lexer = new TextLexer(inputState);
 			lexer.setFilename(file);
-			lexer.setTokenObjectClass("jplag.ParserToken");
+			lexer.setTokenObjectClass("de.jplag.ParserToken");
 
 			// Create a parser that reads from the scanner
 			TextParser parser = new TextParser(lexer);
@@ -109,6 +109,6 @@ public class Parser extends jplag.Parser implements jplag.TokenConstants {
 		runOut = true;
 		errors++;
 		program.print("ERROR: Out of serials!", null);
-        System.out.println("jplag.text.Parser: ERROR: Out of serials!");
+        System.out.println("de.jplag.text.Parser: ERROR: Out of serials!");
 	}
 }

jplag.frontend.text/src/main/java/jplag/text/TextToken.java → jplag.frontend.text/src/main/java/de/jplag/text/TextToken.java

@@ -1,6 +1,6 @@
-package jplag.text;
+package de.jplag.text;
 
-public class TextToken extends jplag.Token {
+public class TextToken extends de.jplag.Token {
 	private static final long serialVersionUID = 4301179216570538972L;
 
 	public static int getSerial(String text, Parser parser) {

jplag.frontend.text/src/main/java/jplag/text/TokenStructure.java → jplag.frontend.text/src/main/java/de/jplag/text/TokenStructure.java

@@ -1,7 +1,7 @@
 /*
  * Created on 27.01.2005
  */
-package jplag.text;
+package de.jplag.text;
 
 import java.util.Hashtable;
 import java.util.Map.Entry;

jplag.parent/pom.xml

@@ -2,12 +2,12 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>edu.kit.ipd.jplag</groupId>
+  <groupId>de.jplag</groupId>
   <artifactId>parent</artifactId>
   <version>0.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <url>http://jplag.ipd.kit.edu</url>
+  <url>http://jplag.de</url>
 
   <issueManagement>
     <system>GitHub</system>
@@ -175,47 +175,47 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>java-1.1exp</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>text</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>java-1.7</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>java-1.9</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>python-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>csharp-1.2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>cpp</artifactId>
         <version>0.0.2-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>scheme</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>edu.kit.ipd.jplag</groupId>
+        <groupId>de.jplag</groupId>
         <artifactId>chars</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
@@ -250,22 +250,22 @@
 				<version>3.5</version>
 			</dependency>
 			<dependency>
-				<groupId>edu.kit.ipd.jplag</groupId>
+				<groupId>de.jplag</groupId>
 				<artifactId>utils</artifactId>
 				<version>0.0.3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>edu.kit.ipd.jplag</groupId>
+				<groupId>de.jplag</groupId>
 				<artifactId>frontend-utils</artifactId>
 				<version>0.0.3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>edu.kit.ipd.jplag</groupId>
+				<groupId>de.jplag</groupId>
 				<artifactId>jplag</artifactId>
 				<version>3.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>edu.kit.ipd.jplag</groupId>
+				<groupId>de.jplag</groupId>
 				<artifactId>java-1.5</artifactId>
 				<version>0.0.1-SNAPSHOT</version>
 			</dependency>

jplag.utils/pom.xml

@@ -5,7 +5,7 @@
 	<version>0.0.3-SNAPSHOT</version>
 
 	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
+		<groupId>de.jplag</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>../jplag.parent/pom.xml</relativePath>

jplag.utils/src/main/java/jplagUtils/DesktopUtils.java → jplag.utils/src/main/java/de/jplag/utils/DesktopUtils.java

@@ -1,4 +1,4 @@
-package jplagUtils;
+package de.jplag.utils;
 
 import java.awt.Desktop;
 import java.net.MalformedURLException;

jplag.utils/src/main/java/jplagUtils/PropertiesLoader.java → jplag.utils/src/main/java/de/jplag/utils/PropertiesLoader.java

@@ -1,19 +1,19 @@
-package jplagUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class PropertiesLoader {
-	public static Properties loadProps(String resourceName) {
-		Properties props = new Properties();
-		try (InputStream in = PropertiesLoader.class.getClassLoader()
-				.getResourceAsStream(resourceName);) {
-			props.load(in);
-			in.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return props;
-	}
-}
+package de.jplag.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class PropertiesLoader {
+	public static Properties loadProps(String resourceName) {
+		Properties props = new Properties();
+		try (InputStream in = PropertiesLoader.class.getClassLoader()
+				.getResourceAsStream(resourceName);) {
+			props.load(in);
+			in.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return props;
+	}
+}

jplag/pom.xml

@@ -3,11 +3,11 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jplag</artifactId>
+  <artifactId>de.jplag</artifactId>
   <version>3.0.0-SNAPSHOT</version>
 
   <parent>
-    <groupId>edu.kit.ipd.jplag</groupId>
+    <groupId>de.jplag</groupId>
     <artifactId>parent</artifactId>
     <version>0.3-SNAPSHOT</version>
     <relativePath>../jplag.parent/pom.xml</relativePath>
@@ -24,7 +24,7 @@
         <directory>src/main/resources</directory>
         <filtering>false</filtering>
         <excludes>
-          <exclude>jplag/version.properties</exclude>
+          <exclude>de/jplag/version.properties</exclude>
         </excludes>
       </resource>
     </resources>
@@ -61,7 +61,7 @@
           <debugParser>false</debugParser>
           <isStatic>false</isStatic>
           <!-- we need this since the old plugin does not read the package from
-              the grammar; as of 2.4 the plugin does that on its own <packageName>jplag.filter</packageName> -->
+              the grammar; as of 2.4 the plugin does that on its own <packageName>de.jplag.filter</packageName> -->
         </configuration>
         <executions>
           <execution>
@@ -78,8 +78,8 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>jplag.CLI</mainClass>
-              <packageName>jplag</packageName>
+              <mainClass>de.jplag.CLI</mainClass>
+              <packageName>de.jplag</packageName>
             </manifest>
           </archive>
         </configuration>
@@ -95,8 +95,8 @@
 
           <archive>
             <manifest>
-              <mainClass>jplag.CLI</mainClass>
-              <packageName>jplag</packageName>
+              <mainClass>de.jplag.CLI</mainClass>
+              <packageName>de.jplag</packageName>
             </manifest>
           </archive>
         </configuration>
@@ -149,62 +149,62 @@
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>frontend-utils</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>java-1.1exp</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>utils</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>text</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>java-1.5</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>java-1.7</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>java-1.9</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>python-3</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>csharp-1.2</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>cpp</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>scheme</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>edu.kit.ipd.jplag</groupId>
+      <groupId>de.jplag</groupId>
       <artifactId>chars</artifactId>
     </dependency>
     <dependency>

jplag/src/main/java/jplag/CLI.java → jplag/src/main/java/de/jplag/CLI.java

@@ -1,27 +1,27 @@
-package jplag;
+package de.jplag;
 
-import static jplag.CommandLineArgument.BASE_CODE;
-import static jplag.CommandLineArgument.COMPARISON_MODE;
-import static jplag.CommandLineArgument.DEBUG;
-import static jplag.CommandLineArgument.EXCLUDE_FILE;
-import static jplag.CommandLineArgument.LANGUAGE;
-import static jplag.CommandLineArgument.MIN_TOKEN_MATCH;
-import static jplag.CommandLineArgument.RESULT_FOLDER;
-import static jplag.CommandLineArgument.ROOT_DIRECTORY;
-import static jplag.CommandLineArgument.SIMILARITY_THRESHOLD;
-import static jplag.CommandLineArgument.STORED_MATCHES;
-import static jplag.CommandLineArgument.SUBDIRECTORY;
-import static jplag.CommandLineArgument.SUFFIXES;
-import static jplag.CommandLineArgument.VERBOSITY;
+import static de.jplag.CommandLineArgument.BASE_CODE;
+import static de.jplag.CommandLineArgument.COMPARISON_MODE;
+import static de.jplag.CommandLineArgument.DEBUG;
+import static de.jplag.CommandLineArgument.EXCLUDE_FILE;
+import static de.jplag.CommandLineArgument.LANGUAGE;
+import static de.jplag.CommandLineArgument.MIN_TOKEN_MATCH;
+import static de.jplag.CommandLineArgument.RESULT_FOLDER;
+import static de.jplag.CommandLineArgument.ROOT_DIRECTORY;
+import static de.jplag.CommandLineArgument.SIMILARITY_THRESHOLD;
+import static de.jplag.CommandLineArgument.STORED_MATCHES;
+import static de.jplag.CommandLineArgument.SUBDIRECTORY;
+import static de.jplag.CommandLineArgument.SUFFIXES;
+import static de.jplag.CommandLineArgument.VERBOSITY;
 
 import java.io.File;
 import java.util.Random;
 
-import jplag.options.JPlagOptions;
-import jplag.options.LanguageOption;
-import jplag.options.Verbosity;
-import jplag.reporting.Report;
-import jplag.strategy.ComparisonMode;
+import de.jplag.options.JPlagOptions;
+import de.jplag.options.LanguageOption;
+import de.jplag.options.Verbosity;
+import de.jplag.reporting.Report;
+import de.jplag.strategy.ComparisonMode;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -37,7 +37,7 @@ public class CLI {
             "Scientifically Published", "Maintained by SDQ", "RIP Structure and Table", "What else?", "You have been warned!", "Since Java 1.0",
             "More Abstract than Tree", "Students Nightmare", "No, changing variable names does not work", "The tech is out there!"};
 
-    private static final String PROGRAM_NAME = "jplag";
+    private static final String PROGRAM_NAME = "de.jplag";
 
     private final ArgumentParser parser;
 

jplag/src/main/java/jplag/CommandLineArgument.java → jplag/src/main/java/de/jplag/CommandLineArgument.java

@@ -1,16 +1,16 @@
-package jplag;
+package de.jplag;
 
-import static jplag.options.JPlagOptions.DEFAULT_COMPARISON_MODE;
-import static jplag.options.JPlagOptions.DEFAULT_SIMILARITY_THRESHOLD;
-import static jplag.options.JPlagOptions.DEFAULT_STORED_MATCHES;
+import static de.jplag.options.JPlagOptions.DEFAULT_COMPARISON_MODE;
+import static de.jplag.options.JPlagOptions.DEFAULT_SIMILARITY_THRESHOLD;
+import static de.jplag.options.JPlagOptions.DEFAULT_STORED_MATCHES;
 import static net.sourceforge.argparse4j.impl.Arguments.storeTrue;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
-import jplag.options.LanguageOption;
-import jplag.strategy.ComparisonMode;
+import de.jplag.options.LanguageOption;
+import de.jplag.strategy.ComparisonMode;
 import net.sourceforge.argparse4j.inf.Argument;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.Namespace;

jplag/src/main/java/jplag/ExitException.java → jplag/src/main/java/de/jplag/ExitException.java

@@ -1,4 +1,4 @@
-package jplag;
+package de.jplag;
 
 /**
  * Exception to be reached through to the main caller of JPlag to replace the "exit" method