From 43a96059d75f41a2276cdc55954231f6c7c33139 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 7 Jun 2017 11:48:40 +0200
Subject: [PATCH] eclipse config files upgrade
---
frontend-js/.classpath | 53 ++++++++++---------
frontend-js/.project | 13 +++++
.../.settings/org.eclipse.jdt.core.prefs | 3 ++
.../org.eclipse.wst.common.component | 5 ++
....eclipse.wst.common.project.facet.core.xml | 5 ++
.../src/test/js/ServerConnector-test.js | 2 +-
...nam&projectId=sample&token=MOCK_TOKEN_ID&} | 0
.../org.eclipse.wst.common.component | 1 -
.../org.eclipse.wst.common.component | 3 ++
9 files changed, 57 insertions(+), 28 deletions(-)
create mode 100644 frontend-js/.settings/org.eclipse.wst.common.component
create mode 100644 frontend-js/.settings/org.eclipse.wst.common.project.facet.core.xml
rename frontend-js/testFiles/apiCalls/overlay/addOverlay/{content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& => content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&} (100%)
diff --git a/frontend-js/.classpath b/frontend-js/.classpath
index 61f3bb94aa..b10870e6cf 100644
--- a/frontend-js/.classpath
+++ b/frontend-js/.classpath
@@ -1,26 +1,27 @@
-<?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 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.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>
+<?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 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.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"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/frontend-js/.project b/frontend-js/.project
index 30a0f2f92c..b16945b817 100644
--- a/frontend-js/.project
+++ b/frontend-js/.project
@@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
@@ -15,9 +20,17 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/frontend-js/.settings/org.eclipse.jdt.core.prefs b/frontend-js/.settings/org.eclipse.jdt.core.prefs
index d59e09c909..1ab2bb53af 100644
--- a/frontend-js/.settings/org.eclipse.jdt.core.prefs
+++ b/frontend-js/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
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
diff --git a/frontend-js/.settings/org.eclipse.wst.common.component b/frontend-js/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..9b323a9512
--- /dev/null
+++ b/frontend-js/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="frontend-js">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ </wb-module>
+</project-modules>
diff --git a/frontend-js/.settings/org.eclipse.wst.common.project.facet.core.xml b/frontend-js/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..6302d3e313
--- /dev/null
+++ b/frontend-js/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.8"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/frontend-js/src/test/js/ServerConnector-test.js b/frontend-js/src/test/js/ServerConnector-test.js
index 826a38e045..a7bae6073e 100644
--- a/frontend-js/src/test/js/ServerConnector-test.js
+++ b/frontend-js/src/test/js/ServerConnector-test.js
@@ -95,7 +95,7 @@ describe('ServerConnector', function() {
return ServerConnector.addOverlay({
name : "test nam",
description : "test desc",
- content : "name color\nCAPN1 #00FF00\nPARK7 #AC0000\nL-cysteine #0000AC\nglutathione #005050\n",
+ content : "name color\nCAPN1 #00FF00\nPARK7 #AC0000",
filename : "test.txt"
}).then(function(overlayId) {
assert.ok(overlayId);
diff --git a/frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&
similarity index 100%
rename from frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&
rename to frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&
diff --git a/rest-api/.settings/org.eclipse.wst.common.component b/rest-api/.settings/org.eclipse.wst.common.component
index e049d3a484..30ef6cd5dc 100644
--- a/rest-api/.settings/org.eclipse.wst.common.component
+++ b/rest-api/.settings/org.eclipse.wst.common.component
@@ -2,6 +2,5 @@
<wb-module deploy-name="MapViewer-rest-api">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
- <wb-resource deploy-path="/" source-path="/src/test/resources"/>
</wb-module>
</project-modules>
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index 6ef850217d..a9fabcecdb 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -37,6 +37,9 @@
<dependent-module archiveName="rest-api-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-rest-api/MapViewer-rest-api">
<dependency-type>uses</dependency-type>
</dependent-module>
+ <dependent-module archiveName="frontend-js-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/frontend-js/frontend-js">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="java-output-path" value="/MapViewer-web/target/classes"/>
<property name="context-root" value="MapViewer-web"/>
</wb-module>
--
GitLab