fixed typo

added cmd project templates
improved pom files
added jetty plugin to rest project

ma-impl.sublime-workspace

@@ -271,14 +271,6 @@
 	},
 	"buffers":
 	[
-		{
-			"file": "/home/eike/Repositories/fu/ss15/ma/doc/thesis/thesis.tex",
-			"settings":
-			{
-				"buffer_size": 9316,
-				"line_ending": "Unix"
-			}
-		}
 	],
 	"build_system": "",
 	"build_system_choices":
@@ -458,15 +450,17 @@
 	"expanded_folders":
 	[
 		"/home/eike/Repositories/fu/ss15/ma/impl",
-		"/home/eike/Repositories/fu/ss15/ma/impl/vm"
+		"/home/eike/Repositories/fu/ss15/ma/impl/vm",
+		"/home/eike/Repositories/fu/ss15/ma/impl/vm/config"
 	],
 	"file_history":
 	[
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/bootstrap.sh",
+		"/home/eike/Repositories/fu/ss15/ma/doc/thesis/thesis.tex",
+		"/home/eike/Repositories/fu/ss15/ma/impl/Vagrantfile",
 		"/home/eike/Repositories/fu/ss15/ma/impl/tmbs-processor-backend/src/main/scala/de/cochu/tmbs/processor/MongoDBTest.scala",
 		"/home/eike/Repositories/fu/ss15/ma/impl/.gitignore",
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/config/initd-tomcat",
-		"/home/eike/Repositories/fu/ss15/ma/impl/Vagrantfile",
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/config/environment",
 		"/home/eike/Repositories/fu/ss15/ma/impl/tmbs-frontend/app/templates/articles.hbs",
 		"/home/eike/Repositories/fu/ss15/ma/impl/tmbs-frontend/app/templates/application.hbs",
@@ -851,97 +845,8 @@
 	"groups":
 	[
 		{
-			"selected": 0,
 			"sheets":
 			[
-				{
-					"buffer": 0,
-					"file": "/home/eike/Repositories/fu/ss15/ma/doc/thesis/thesis.tex",
-					"semi_transient": false,
-					"settings":
-					{
-						"buffer_size": 9316,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								1519,
-								1519
-							]
-						],
-						"settings":
-						{
-							"BracketHighlighterBusy": false,
-							"bh_regions":
-							[
-								"bh_square",
-								"bh_square_center",
-								"bh_square_open",
-								"bh_square_close",
-								"bh_square_content",
-								"bh_angle",
-								"bh_angle_center",
-								"bh_angle_open",
-								"bh_angle_close",
-								"bh_angle_content",
-								"bh_c_define",
-								"bh_c_define_center",
-								"bh_c_define_open",
-								"bh_c_define_close",
-								"bh_c_define_content",
-								"bh_single_quote",
-								"bh_single_quote_center",
-								"bh_single_quote_open",
-								"bh_single_quote_close",
-								"bh_single_quote_content",
-								"bh_double_quote",
-								"bh_double_quote_center",
-								"bh_double_quote_open",
-								"bh_double_quote_close",
-								"bh_double_quote_content",
-								"bh_default",
-								"bh_default_center",
-								"bh_default_open",
-								"bh_default_close",
-								"bh_default_content",
-								"bh_regex",
-								"bh_regex_center",
-								"bh_regex_open",
-								"bh_regex_close",
-								"bh_regex_content",
-								"bh_unmatched",
-								"bh_unmatched_center",
-								"bh_unmatched_open",
-								"bh_unmatched_close",
-								"bh_unmatched_content",
-								"bh_tag",
-								"bh_tag_center",
-								"bh_tag_open",
-								"bh_tag_close",
-								"bh_tag_content",
-								"bh_round",
-								"bh_round_center",
-								"bh_round_open",
-								"bh_round_close",
-								"bh_round_content",
-								"bh_curly",
-								"bh_curly_center",
-								"bh_curly_open",
-								"bh_curly_close",
-								"bh_curly_content"
-							],
-							"incomplete_sync": null,
-							"syntax": "Packages/LaTeX/LaTeX.sublime-syntax"
-						},
-						"translation.x": 0.0,
-						"translation.y": 540.0,
-						"zoom_level": 1.0
-					},
-					"stack_index": 0,
-					"type": "text"
-				}
 			]
 		}
 	],

vipra-cmd/cmd/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

vipra-cmd/cmd/.gitignore

+/target/

vipra-cmd/cmd/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vipra-cmd</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

vipra-cmd/cmd/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

vipra-cmd/cmd/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

vipra-cmd/cmd/.settings/org.eclipse.m2e.core.prefs

+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

vipra-cmd/cmd/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>de.vipra</groupId>
+	<artifactId>cmd</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>Vipra CMD</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<log4jVersion>2.4.1</log4jVersion>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4jVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4jVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4jVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-web</artifactId>
+			<version>${log4jVersion}</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- Testing -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+	</dependencies>
+</project>

vipra-cmd/cmd/src/main/java/de/vipra/cmd/CmdOptions.java

+package de.vipra.cmd;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+
+public class CmdOptions extends Options {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String OPT_HELP = "h";
+	public static final String OPT_IMPORT = "i";
+
+	public CmdOptions() {
+		addOption(OPT_HELP, "help", false, "print this message");
+		addOption(OPT_IMPORT, "import", true, "import articles into the database");
+	}
+
+	public void printHelp() {
+		HelpFormatter formatter = new HelpFormatter();
+		formatter.printHelp("vipra", this);
+	}
+
+}

vipra-cmd/cmd/src/main/java/de/vipra/cmd/Main.java

+package de.vipra.cmd;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import de.vipra.cmd.option.ImportOption;
+
+public class Main {
+
+	public static final Logger log = LoggerFactory.getLogger(Main.class);
+
+	public static void main(String[] args) {
+		CommandLineParser parser = new DefaultParser();
+		CmdOptions options = new CmdOptions();
+		try {
+			CommandLine cmd = parser.parse(options, args);
+			if (cmd.hasOption(CmdOptions.OPT_HELP)) {
+				options.printHelp();
+			} else if (cmd.hasOption(CmdOptions.OPT_IMPORT)) {
+				ImportOption opt = new ImportOption(cmd);
+				opt.doImport();
+			}
+		} catch (ParseException e) {
+			log.error("error parsing cmd line: " + e.getMessage());
+			options.printHelp();
+		}
+	}
+
+}

vipra-cmd/cmd/src/main/java/de/vipra/cmd/lda/LDAWrapper.java

+package de.vipra.cmd.lda;
+
+public class LDAWrapper {
+
+}

vipra-cmd/cmd/src/main/java/de/vipra/cmd/option/ImportOption.java

+package de.vipra.cmd.option;
+
+import org.apache.commons.cli.CommandLine;
+
+public class ImportOption {
+
+	public ImportOption(CommandLine cmd) {
+		
+	}
+	
+	public void doImport() {
+		
+	}
+	
+}

vipra-cmd/cmd/src/main/resources/log4j2.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Root level="all">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
\ No newline at end of file

vipra-rest/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>vpira-rest</name>
+	<name>vipra-rest</name>
 	<comment></comment>
 	<projects>
 	</projects>

vipra-rest/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

vipra-rest/.settings/org.eclipse.wst.common.component

 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="vpira-rest">
+    <wb-module deploy-name="vipra-rest">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="java-output-path" value="/vpira-rest/target/classes"/>
+        <property name="java-output-path" value="/vipra-rest/target/classes"/>
         <property name="context-root" value="rest"/>
     </wb-module>
 </project-modules>

vipra-rest/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<groupId>de.vipra</groupId>
 	<artifactId>rest</artifactId>
-	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>Vipra REST Backend Application</name>
+	<packaging>war</packaging>
+
+	<name>Vipra REST Backend</name>
+	<url>http://maven.apache.org</url>
+
 	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
+		<jerseyVersion>2.22.1</jerseyVersion>
+		<jettyVersion>9.3.6.v20151106</jettyVersion>
+		<servletVersion>3.1.0</servletVersion>
+		<log4jVersion>2.4.1</log4jVersion>
 	</properties>
+
 	<dependencies>
 		<!-- Jersey REST -->
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
-			<version>2.22.1</version>
+			<version>${jerseyVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-moxy</artifactId>
-			<version>2.22.1</version>
+			<version>${jerseyVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework</groupId>
 			<artifactId>jersey-test-framework-core</artifactId>
-			<version>2.22.1</version>
+			<version>${jerseyVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-simple</artifactId>
-			<version>2.22.1</version>
+			<version>${jerseyVersion}</version>
 		</dependency>
 
 		<!-- Servlet API -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<version>${servletVersion}</version>
 		</dependency>
 
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.4.1</version>
+			<version>${log4jVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.4.1</version>
+			<version>${log4jVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.4.1</version>
+			<version>${log4jVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-web</artifactId>
-			<version>2.4.1</version>
+			<version>${log4jVersion}</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -77,4 +87,14 @@
 			<version>4.12</version>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jettyVersion}</version>
+			</plugin>
+		</plugins>
+	</build>
 </project>

vipra-rest/src/main/java/de/vipra/backend/rest/Application.java → vipra-rest/src/main/java/de/vipra/rest/Application.java

-package de.vipra.backend.rest;
+package de.vipra.rest;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.slf4j.Logger;

vipra-rest/src/main/java/de/vipra/backend/rest/CORSFilter.java → vipra-rest/src/main/java/de/vipra/rest/CORSFilter.java

-package de.vipra.backend.rest;
+package de.vipra.rest;
 
 import java.io.IOException;
 

vipra-rest/src/main/java/de/vipra/backend/rest/Messages.java → vipra-rest/src/main/java/de/vipra/rest/Messages.java

-package de.vipra.backend.rest;
+package de.vipra.rest;
 
 public class Messages {