diff --git a/build.sh b/build.sh index 8b43f60e87ada57a1c0035820f11c37f5c34ab14..8de1b5776f40819a305762907ad316347afc2718 100755 --- a/build.sh +++ b/build.sh @@ -52,9 +52,9 @@ fi echo "" >> $LOG echo "-------------------------------" >> $LOG -echo "compiling vipra-rest" | tee -a $LOG +echo "compiling vipra-backend" | tee -a $LOG echo "-------------------------------" >> $LOG -$MVN -f ./vipra-rest/pom.xml package >> $LOG 2>&1 +$MVN -f ./vipra-backend/pom.xml package >> $LOG 2>&1 if [ $? -ne 0 ]; then echo "error" exit 1 diff --git a/tasks.todo b/tasks.todo deleted file mode 100644 index 6cda7ed7675258d3b541e5f734506561a56ce433..0000000000000000000000000000000000000000 --- a/tasks.todo +++ /dev/null @@ -1,2 +0,0 @@ - ☐ topic/word network - ☐ enable topic editing/labeling \ No newline at end of file diff --git a/vipra-rest/.classpath b/vipra-backend/.classpath similarity index 100% rename from vipra-rest/.classpath rename to vipra-backend/.classpath diff --git a/vipra-rest/.gitignore b/vipra-backend/.gitignore similarity index 100% rename from vipra-rest/.gitignore rename to vipra-backend/.gitignore diff --git a/vipra-rest/.project b/vipra-backend/.project similarity index 97% rename from vipra-rest/.project rename to vipra-backend/.project index 7ff77ec0639e00436f95abc88c841d855d6a866c..10f814a3d38c59a44c1327e5f50fb0b1de952bab 100644 --- a/vipra-rest/.project +++ b/vipra-backend/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>vipra-rest</name> + <name>vipra-backend</name> <comment></comment> <projects> <project>vipra-cmd</project> diff --git a/vipra-rest/.settings/.jsdtscope b/vipra-backend/.settings/.jsdtscope similarity index 100% rename from vipra-rest/.settings/.jsdtscope rename to vipra-backend/.settings/.jsdtscope diff --git a/vipra-rest/.settings/org.eclipse.core.resources.prefs b/vipra-backend/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.core.resources.prefs rename to vipra-backend/.settings/org.eclipse.core.resources.prefs diff --git a/vipra-rest/.settings/org.eclipse.jdt.core.prefs b/vipra-backend/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.jdt.core.prefs rename to vipra-backend/.settings/org.eclipse.jdt.core.prefs diff --git a/vipra-rest/.settings/org.eclipse.jdt.ui.prefs b/vipra-backend/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.jdt.ui.prefs rename to vipra-backend/.settings/org.eclipse.jdt.ui.prefs diff --git a/vipra-rest/.settings/org.eclipse.m2e.core.prefs b/vipra-backend/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.m2e.core.prefs rename to vipra-backend/.settings/org.eclipse.m2e.core.prefs diff --git a/vipra-rest/.settings/org.eclipse.wst.common.component b/vipra-backend/.settings/org.eclipse.wst.common.component similarity index 79% rename from vipra-rest/.settings/org.eclipse.wst.common.component rename to vipra-backend/.settings/org.eclipse.wst.common.component index 8f4686f842327678fcce653ac158229d64b411e4..363ce15daea32cc3701cf69aeba0762672248c68 100644 --- a/vipra-rest/.settings/org.eclipse.wst.common.component +++ b/vipra-backend/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="vipra-rest"> + <wb-module deploy-name="vipra-backend"> <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"/> @@ -7,7 +7,7 @@ <dependent-module archiveName="util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util"> <dependency-type>uses</dependency-type> </dependent-module> - <property name="java-output-path" value="/vipra-rest/target/classes"/> - <property name="context-root" value="vipra-rest"/> + <property name="java-output-path" value="/vipra-backend/target/classes"/> + <property name="context-root" value="vipra"/> </wb-module> </project-modules> diff --git a/vipra-rest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml rename to vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml diff --git a/vipra-rest/.settings/org.eclipse.wst.common.project.facet.core.xml b/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.common.project.facet.core.xml rename to vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/vipra-rest/.settings/org.eclipse.wst.jsdt.ui.superType.container b/vipra-backend/.settings/org.eclipse.wst.jsdt.ui.superType.container similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.jsdt.ui.superType.container rename to vipra-backend/.settings/org.eclipse.wst.jsdt.ui.superType.container diff --git a/vipra-rest/.settings/org.eclipse.wst.jsdt.ui.superType.name b/vipra-backend/.settings/org.eclipse.wst.jsdt.ui.superType.name similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.jsdt.ui.superType.name rename to vipra-backend/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/vipra-rest/.settings/org.eclipse.wst.validation.prefs b/vipra-backend/.settings/org.eclipse.wst.validation.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.validation.prefs rename to vipra-backend/.settings/org.eclipse.wst.validation.prefs diff --git a/vipra-rest/.settings/org.eclipse.wst.ws.service.policy.prefs b/vipra-backend/.settings/org.eclipse.wst.ws.service.policy.prefs similarity index 100% rename from vipra-rest/.settings/org.eclipse.wst.ws.service.policy.prefs rename to vipra-backend/.settings/org.eclipse.wst.ws.service.policy.prefs diff --git a/vipra-backend/README.md b/vipra-backend/README.md new file mode 100644 index 0000000000000000000000000000000000000000..686893ee41cf4e887266435e15fc9e1e90cca8df --- /dev/null +++ b/vipra-backend/README.md @@ -0,0 +1,14 @@ +# Backend Service + +This project contains the Vipra backend services. These services include: + +* REST service (`de.vipra.rest` packages) +* WebSocket (`de.vipra.ws` packages) + +## REST Service + +The REST service is used by the frontend UI project to query and modify data in the database and search index. It offers multiple REST conform resources for CRUD operations. A full specification in the form of a WADL file can be found under: [application.wadl](http://localhost:8080/vipra/rest/application.wadl) + +## WebSocket + +The WebSocket is used by the frontend UI project to obtain instant updates on changed data. \ No newline at end of file diff --git a/vipra-rest/pom.xml b/vipra-backend/pom.xml similarity index 92% rename from vipra-rest/pom.xml rename to vipra-backend/pom.xml index a66565870f1128e28a58b4b9dead195710e8d5d6..0b93290d0545b5c866769197ad14087ca68c3cc2 100644 --- a/vipra-rest/pom.xml +++ b/vipra-backend/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.vipra</groupId> - <artifactId>rest</artifactId> + <artifactId>backend</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>war</packaging> - <name>Vipra REST Backend</name> + <name>Vipra Backend</name> <url>http://maven.apache.org</url> <properties> @@ -52,6 +52,11 @@ <artifactId>javax.servlet-api</artifactId> <version>${servletVersion}</version> </dependency> + <dependency> + <groupId>javax.websocket</groupId> + <artifactId>javax.websocket-api</artifactId> + <version>1.1</version> + </dependency> <!-- Logging --> <dependency> @@ -99,7 +104,7 @@ </dependencies> <build> - <finalName>vipra-rest</finalName> + <finalName>vipra</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/vipra-rest/src/main/java/de/vipra/rest/Application.java b/vipra-backend/src/main/java/de/vipra/rest/Application.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/Application.java rename to vipra-backend/src/main/java/de/vipra/rest/Application.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/Messages.java b/vipra-backend/src/main/java/de/vipra/rest/Messages.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/Messages.java rename to vipra-backend/src/main/java/de/vipra/rest/Messages.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/model/APIError.java b/vipra-backend/src/main/java/de/vipra/rest/model/APIError.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/model/APIError.java rename to vipra-backend/src/main/java/de/vipra/rest/model/APIError.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/model/Wrapper.java b/vipra-backend/src/main/java/de/vipra/rest/model/Wrapper.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/model/Wrapper.java rename to vipra-backend/src/main/java/de/vipra/rest/model/Wrapper.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/provider/CORSResponseFilter.java b/vipra-backend/src/main/java/de/vipra/rest/provider/CORSResponseFilter.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/provider/CORSResponseFilter.java rename to vipra-backend/src/main/java/de/vipra/rest/provider/CORSResponseFilter.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/provider/ObjectMapperProvider.java b/vipra-backend/src/main/java/de/vipra/rest/provider/ObjectMapperProvider.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/provider/ObjectMapperProvider.java rename to vipra-backend/src/main/java/de/vipra/rest/provider/ObjectMapperProvider.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/resource/ArticleResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/ArticleResource.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/resource/ArticleResource.java rename to vipra-backend/src/main/java/de/vipra/rest/resource/ArticleResource.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/resource/SearchResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/resource/SearchResource.java rename to vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/resource/TopicResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/TopicResource.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/resource/TopicResource.java rename to vipra-backend/src/main/java/de/vipra/rest/resource/TopicResource.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/resource/WordResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/WordResource.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/resource/WordResource.java rename to vipra-backend/src/main/java/de/vipra/rest/resource/WordResource.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/serializer/ObjectIdDeserializer.java b/vipra-backend/src/main/java/de/vipra/rest/serializer/ObjectIdDeserializer.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/serializer/ObjectIdDeserializer.java rename to vipra-backend/src/main/java/de/vipra/rest/serializer/ObjectIdDeserializer.java diff --git a/vipra-rest/src/main/java/de/vipra/rest/serializer/ObjectIdSerializer.java b/vipra-backend/src/main/java/de/vipra/rest/serializer/ObjectIdSerializer.java similarity index 100% rename from vipra-rest/src/main/java/de/vipra/rest/serializer/ObjectIdSerializer.java rename to vipra-backend/src/main/java/de/vipra/rest/serializer/ObjectIdSerializer.java diff --git a/vipra-ws/src/main/java/de/vipra/ws/DeviceWebSocketServer.java b/vipra-backend/src/main/java/de/vipra/ws/WebSocket.java similarity index 77% rename from vipra-ws/src/main/java/de/vipra/ws/DeviceWebSocketServer.java rename to vipra-backend/src/main/java/de/vipra/ws/WebSocket.java index 334c8b01a99d006cd70bbb60a37ad378aa62e02f..5db32f50194a4d371ca7c8861ed9a4e50967f3db 100644 --- a/vipra-ws/src/main/java/de/vipra/ws/DeviceWebSocketServer.java +++ b/vipra-backend/src/main/java/de/vipra/ws/WebSocket.java @@ -1,7 +1,6 @@ package de.vipra.ws; import java.io.IOException; -import java.util.logging.Logger; import javax.websocket.OnClose; import javax.websocket.OnError; @@ -10,10 +9,13 @@ import javax.websocket.OnOpen; import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; -@ServerEndpoint("/actions") -public class DeviceWebSocketServer { +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; - Logger log = Logger.getLogger("asd"); +@ServerEndpoint("/ws") +public class WebSocket { + + public static final Logger log = LogManager.getLogger(WebSocket.class); @OnOpen public void open(Session session) { diff --git a/vipra-rest/src/main/resources/config.properties b/vipra-backend/src/main/resources/config.properties similarity index 100% rename from vipra-rest/src/main/resources/config.properties rename to vipra-backend/src/main/resources/config.properties diff --git a/vipra-rest/src/main/resources/log4j2.xml b/vipra-backend/src/main/resources/log4j2.xml similarity index 100% rename from vipra-rest/src/main/resources/log4j2.xml rename to vipra-backend/src/main/resources/log4j2.xml diff --git a/vipra-backend/src/main/webapp/WEB-INF/web.xml b/vipra-backend/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000000000000000000000000000000000..90458a45e4c3c71a3e1d60ac21de704cec850c0f --- /dev/null +++ b/vipra-backend/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> + <servlet> + <servlet-name>jersey</servlet-name> + <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> + <init-param> + <param-name>javax.ws.rs.Application</param-name> + <param-value>de.vipra.rest.Application</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>jersey</servlet-name> + <url-pattern>/rest/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file diff --git a/vipra-rest/src/main/webapp/WEB-INF/web.xml b/vipra-rest/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index e8660b868690c13a40de15847bd89f76b1439ea1..0000000000000000000000000000000000000000 --- a/vipra-rest/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" - version="3.1"> - <servlet> - <servlet-name>jersey</servlet-name> - <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> - <init-param> - <param-name>javax.ws.rs.Application</param-name> - <param-value>de.vipra.rest.Application</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>jersey</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file diff --git a/vipra-rest/src/main/webapp/index.html b/vipra-rest/src/main/webapp/index.html deleted file mode 100644 index fe6c4aa0ed3d22835c1fc343883d906ad5b5b3fe..0000000000000000000000000000000000000000 --- a/vipra-rest/src/main/webapp/index.html +++ /dev/null @@ -1,14 +0,0 @@ -<!doctype html> -<html> - <head> - </head> - <body> - Welcome to the Vipra REST backend service.<br> - You will be redirected to the application descriptor. If not, click <a href="application.wadl">here</a>. - <script> - setTimeout(function() { - window.location.href = "application.wadl"; - }, 2000); - </script> - </body> -</html> \ No newline at end of file diff --git a/vipra-rest/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/vipra-rest/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF deleted file mode 100644 index 17945b17ea22167f846640cb9b2d2c101510666d..0000000000000000000000000000000000000000 --- a/vipra-rest/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: eike -Build-Jdk: 1.8.0_66-internal -Created-By: Maven Integration for Eclipse - diff --git a/vipra-ui/README.md b/vipra-ui/README.md new file mode 100644 index 0000000000000000000000000000000000000000..762d63e339bdb66fc3a5a9a6bcfdeff222f71b6e --- /dev/null +++ b/vipra-ui/README.md @@ -0,0 +1,3 @@ +# Vipra UI + +The frontend UI project. \ No newline at end of file diff --git a/vipra-ui/app/js/factories.js b/vipra-ui/app/js/factories.js index aa0599cc95ecf773e30b01fceb4ab9e9903bde93..593f3913e62b6dd3fb22c3614d1ccbf86e1c5ed0 100644 --- a/vipra-ui/app/js/factories.js +++ b/vipra-ui/app/js/factories.js @@ -6,28 +6,28 @@ var app = angular.module('vipra.factories', []); - var endpoint = '//' + location.hostname + ':8000'; + var endpoint = '//' + location.hostname + ':8000/vipra/rest'; app.factory('ArticleFactory', ['$resource', function($resource) { - return $resource(endpoint + '/vipra-rest/articles/:id', {}, { + return $resource(endpoint + '/articles/:id', {}, { query: { isArray: false, cache: true } }); }]); app.factory('TopicFactory', ['$resource', function($resource) { - return $resource(endpoint + '/vipra-rest/topics/:id', {}, { + return $resource(endpoint + '/topics/:id', {}, { query: { isArray: false, cache: true } }); }]); app.factory('WordFactory', ['$resource', function($resource) { - return $resource(endpoint + '/vipra-rest/words/:id', {}, { + return $resource(endpoint + '/words/:id', {}, { query: { isArray: false, cache: true } }); }]); app.factory('SearchFactory', ['$resource', function($resource) { - return $resource(endpoint + '/vipra-rest/search', {}, { + return $resource(endpoint + '/search', {}, { query: { isArray: false, cache: true } }); }]); diff --git a/vipra-util/README.md b/vipra-util/README.md new file mode 100644 index 0000000000000000000000000000000000000000..31b5fee6c2c243b531c42d0c7b32945dfe289b47 --- /dev/null +++ b/vipra-util/README.md @@ -0,0 +1,3 @@ +# Vipra Util + +This project contains sources shared by all Java projects of Vipra. \ No newline at end of file diff --git a/vipra-ws/.classpath b/vipra-ws/.classpath deleted file mode 100644 index 9e9361d11248b7b2e80576da5a1290139936978f..0000000000000000000000000000000000000000 --- a/vipra-ws/.classpath +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.0"> - <attributes> - <attribute name="owner.project.facets" value="jst.web"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <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"/> - <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/vipra-ws/.gitignore b/vipra-ws/.gitignore deleted file mode 100644 index 76daa494e2c10b171342bd3a8eea5e1b50075514..0000000000000000000000000000000000000000 --- a/vipra-ws/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build/ -/target/ diff --git a/vipra-ws/.project b/vipra-ws/.project deleted file mode 100644 index 6783af77e822ad4b159ca718a7792c5f1fdb0d54..0000000000000000000000000000000000000000 --- a/vipra-ws/.project +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>vipra-ws</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> - </natures> -</projectDescription> diff --git a/vipra-ws/.settings/.jsdtscope b/vipra-ws/.settings/.jsdtscope deleted file mode 100644 index 92e666d77dd95f33f7fc056a45049f2034b90ab8..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> diff --git a/vipra-ws/.settings/org.eclipse.core.resources.prefs b/vipra-ws/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032d4655898933f93050f48bf9581d14..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/<project>=UTF-8 diff --git a/vipra-ws/.settings/org.eclipse.jdt.core.prefs b/vipra-ws/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c8597b17a4096194eeb5b0a5c2da62e819f9a1b7..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,293 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/vipra-ws/.settings/org.eclipse.jdt.ui.prefs b/vipra-ws/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5713c654549b40f76104760ab2f6cd031d71f011..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_vipra -formatter_settings_version=12 diff --git a/vipra-ws/.settings/org.eclipse.m2e.core.prefs b/vipra-ws/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/vipra-ws/.settings/org.eclipse.wst.common.component b/vipra-ws/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 4bef75339481d8416e5c64cd6a4a042c9070b784..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="vipra-ws"> - <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> - <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> - <property name="context-root" value="vipra-ws"/> - <property name="java-output-path" value="/vipra-ws/build/classes"/> - </wb-module> -</project-modules> diff --git a/vipra-ws/.settings/org.eclipse.wst.common.project.facet.core.xml b/vipra-ws/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bec785deaca0066ec011e97cfb9198e9079db47f..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faceted-project> - <runtime name="Apache Tomcat v8.0"/> - <fixed facet="jst.web"/> - <fixed facet="java"/> - <fixed facet="wst.jsdt.web"/> - <installed facet="java" version="1.8"/> - <installed facet="jst.web" version="3.1"/> - <installed facet="wst.jsdt.web" version="1.0"/> -</faceted-project> diff --git a/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.container b/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803967bc0bf72a7dd66d7e292ed2e586..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.name b/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2c1982d1e8a5653073281994564ae8..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/vipra-ws/.settings/org.eclipse.wst.validation.prefs b/vipra-ws/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752a9761c4e5167d0301d3a27674430f..0000000000000000000000000000000000000000 --- a/vipra-ws/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/vipra-ws/pom.xml b/vipra-ws/pom.xml deleted file mode 100644 index 2b66da029dbe106be5a9d1d3da228b7de53f0dfc..0000000000000000000000000000000000000000 --- a/vipra-ws/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<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>ws</artifactId> - <version>0.0.1-SNAPSHOT</version> - <packaging>war</packaging> - - <name>Vipra WebSocket 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> - <servletVersion>3.1.0</servletVersion> - </properties> - - <build> - <finalName>vipra-ws</finalName> - </build> - - <dependencies> - <!-- Servlet API --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servletVersion}</version> - </dependency> - <dependency> - <groupId>javax.websocket</groupId> - <artifactId>javax.websocket-api</artifactId> - <version>1.1</version> - </dependency> - </dependencies> -</project> \ No newline at end of file diff --git a/vipra-ws/src/main/webapp/WEB-INF/web.xml b/vipra-ws/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 55266664a2f8afd5345542489f7916d4add11991..0000000000000000000000000000000000000000 --- a/vipra-ws/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" - version="3.1"> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> -</web-app> \ No newline at end of file diff --git a/vipra-ws/src/main/webapp/index.html b/vipra-ws/src/main/webapp/index.html deleted file mode 100644 index 2af2a3a9dafcbcfff44d5250c9c0cdaff26ac255..0000000000000000000000000000000000000000 --- a/vipra-ws/src/main/webapp/index.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -</head> -<body> - - <input type="text" id="textin"> - <button onclick="send()">Send</button> - - <script> - var socket = new WebSocket("ws://localhost:8080/vipra-ws/actions"); - var text = document.getElementById("textin"); - - function send() { - socket.send(text.value); - } - </script> - -</body> -</html> \ No newline at end of file diff --git a/vm/README.md b/vm/README.md new file mode 100644 index 0000000000000000000000000000000000000000..2a64d8d5b09a97e6b50592a5cfb06b01bc24027a --- /dev/null +++ b/vm/README.md @@ -0,0 +1,3 @@ +# VM + +This is the development vagrant vm base. It contains the vm bootstrap file. \ No newline at end of file