Skip to content

Commit 2bedb1a

Browse files
dirikidiriki
committed
dirty commit
1 parent b572c24 commit 2bedb1a

File tree

18 files changed

+135
-113
lines changed

18 files changed

+135
-113
lines changed

‎.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
catalog-v001.xml
2-
~.*\.class
3-
~.*\.pptx?
2+
.class
3+
.classpath
4+
.project
5+
.settings/
46
/RoomAggregatorTestLab/
57
.gradle/

‎KP statistiche/src/org/studyroom/statistics/view/web/WebApp.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public static void init(){
2323
s.addRoute("/statistics",GraphicPage.class);
2424
s.addRoute("/statistics/rsc/.*",StaticPageHandler.class,new File(".."+File.separator+"web"+File.separator+"statistics"));
2525
s.addWebSocketMapping("statistics",GraphicPage.Socket.class);
26-
System.out.println(new File(".."+File.separator+"web"+File.separator+"statistics").getAbsolutePath());
2726
s.addSessionFinalizer(ss->((IGraphicViewModel)ss.get(VIEW_MODEL_KEY)).unbind());
2827
}
2928
}

‎QueryWebServer/.classpath

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@
1010
<attribute name="FROM_GRADLE_MODEL" value="true"/>
1111
</attributes>
1212
</classpathentry>
13-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
1413
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
15-
<classpathentry kind="output" path="bin"/>
14+
<classpathentry path="bin" kind="output"/>
15+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
16+
<classpathentry sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar" kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar"/>
17+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/QueryWebServer/libs/sofia_kp.jar"/>
18+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/QueryWebServer/libs/nanohttpd-2.3.1.jar"/>
19+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/QueryWebServer/libs/nanohttpd-nanolets-2.3.1.jar"/>
20+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/QueryWebServer/libs/nanohttpd-websocket-2.3.1.jar"/>
21+
<classpathentry sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/932392dc515dae4e750ac4a96c39ba69d5e81db3/log4j-core-2.11.0-sources.jar" kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/e6b751e02120c08702d98750f6a80bc25343b7f5/log4j-core-2.11.0.jar"/>
22+
<classpathentry sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/97f6fb29d69b48fe4bdb47cc21c834b4536cf752/log4j-api-2.11.0-sources.jar" kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/bede79a3f150711634a3047985517431bf6499f2/log4j-api-2.11.0.jar"/>
23+
<classpathentry sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.11.3/871302b15d8cee9bfb393c4f1d0386b17646d8d1/jsoup-1.11.3-sources.jar" kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.11.3/36da09a8f68484523fa2aaa100399d612b247d67/jsoup-1.11.3.jar"/>
24+
<classpathentry sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.json/json/20180813/60753006d96d5fc85b61b0897f3326b5c4e1c4f0/json-20180813-sources.jar" kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.json/json/20180813/8566b2b0391d9d4479ea225645c6ed47ef17fe41/json-20180813.jar"/>
25+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/QueryWebServer/libs/WebServer.jar"/>
1626
</classpath>

‎QueryWebServer/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/.gradle/
22
/bin/
3+
/build/

‎QueryWebServer/.project

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
<projectDescription>
33
<name>QueryWebServer</name>
44
<comment></comment>
5-
<projects>
6-
</projects>
5+
<projects/>
6+
<natures>
7+
<nature>org.eclipse.jdt.core.javanature</nature>
8+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
9+
</natures>
710
<buildSpec>
811
<buildCommand>
912
<name>org.eclipse.jdt.core.javabuilder</name>
10-
<arguments>
11-
</arguments>
13+
<arguments/>
1214
</buildCommand>
1315
<buildCommand>
1416
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15-
<arguments>
16-
</arguments>
17+
<arguments/>
1718
</buildCommand>
1819
</buildSpec>
19-
<natures>
20-
<nature>org.eclipse.jdt.core.javanature</nature>
21-
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22-
</natures>
20+
<linkedResources/>
21+
<filteredResources/>
2322
</projectDescription>

‎QueryWebServer/.settings/org.eclipse.jdt.core.prefs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2-
org.eclipse.jdt.core.compiler.compliance=1.8
3-
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4-
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
5-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
6-
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8-
eclipse.preferences.version=1
9-
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
10-
org.eclipse.jdt.core.compiler.source=1.8
11-
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1+
#
2+
#Sun Nov 11 21:56:17 CET 2018
3+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
4+
org.eclipse.jdt.core.compiler.compliance=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
7+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
8+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
9+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
10+
eclipse.preferences.version=1
11+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
12+
org.eclipse.jdt.core.compiler.source=1.8
13+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

‎QueryWebServer/src/main/java/query/server/handlers/IndexHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class IndexHandler extends SIBFacingHandler {
3636
// its execution environment, which might change in the future. It should be the opposite: the src code
3737
// should make an assumption on how the files will be organized in its execution environment, and the
3838
// build/deploy scripts should make those assumptions true. Currently the opposite is happening.
39-
private final static String HTML_TEMPLATE_PATH = "queryWebServer/src/main/resources/indexTemplate.html";
39+
private final static String HTML_TEMPLATE_PATH = "../QueryWebServer/src/main/resources/indexTemplate.html";
4040
private final static String OPEN_ROOMS_DISPLAYER_ID = "open_rooms_table";
4141
private final static String CLOSED_ROOMS_DISPLAYER_ID = "closed_rooms_table";
4242

‎QueryWebServer/src/main/java/query/server/launcher/Main.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package query.server.launcher;
22

3-
import java.io.IOException;
3+
import java.io.*;
44
import java.util.HashMap;
55
import java.util.Map;
66

@@ -66,8 +66,8 @@ public static void main(String[] args) throws IOException {
6666
LOG.debug("Adding routes to web server...");
6767
server.addRoute("/", IndexHandler.class);
6868
server.addRoute("/filters", FiltersHandler.class);
69-
server.addRoute("queryWebServer/src/main/resources/script.js", StaticPageHandler.class);
70-
server.addRoute("queryWebServer/src/main/resources/styles.css", StaticPageHandler.class);
69+
server.addRoute("queryWebServer/src/main/resources/.*", StaticPageHandler.class, new File("../queryWebServer/src/main/resources/".replace('/',File.separatorChar)));
70+
//server.addRoute("queryWebServer/src/main/resources/styles.css", StaticPageHandler.class);
7171
server.addWebSocketMapping("filters", WsFiltersHandler.class);
7272
LOG.debug("Routes successfully added to web server.");
7373

‎RoomAggregatorAPI/.classpath

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src/main/java"/>
4-
<classpathentry kind="src" path="src/test/java"/>
5-
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
6-
<classpathentry path="bin" kind="output"/>
7-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
8-
<classpathentry sourcepath="/home/matteo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar" kind="lib" path="/home/matteo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar"/>
9-
<classpathentry kind="lib" path="/home/matteo/Desktop/CalcMProject/GitRepo/RoomAggregatorAPI/libs/sofia_kp.jar"/>
10-
<classpathentry sourcepath="/home/matteo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/97f6fb29d69b48fe4bdb47cc21c834b4536cf752/log4j-api-2.11.0-sources.jar" kind="lib" path="/home/matteo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/bede79a3f150711634a3047985517431bf6499f2/log4j-api-2.11.0.jar"/>
11-
<classpathentry sourcepath="/home/matteo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/932392dc515dae4e750ac4a96c39ba69d5e81db3/log4j-core-2.11.0-sources.jar" kind="lib" path="/home/matteo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/e6b751e02120c08702d98750f6a80bc25343b7f5/log4j-core-2.11.0.jar"/>
12-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java">
4+
<attributes>
5+
<attribute name="FROM_GRADLE_MODEL" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
10+
<classpathentry kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar" sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar"/>
11+
<classpathentry kind="lib" path="C:/Users/Riccardo/Git/CalcM/RoomAggregatorAPI/libs/sofia_kp.jar"/>
12+
<classpathentry kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/e6b751e02120c08702d98750f6a80bc25343b7f5/log4j-core-2.11.0.jar" sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.11.0/932392dc515dae4e750ac4a96c39ba69d5e81db3/log4j-core-2.11.0-sources.jar"/>
13+
<classpathentry kind="lib" path="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/bede79a3f150711634a3047985517431bf6499f2/log4j-api-2.11.0.jar" sourcepath="C:/Users/Riccardo/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.11.0/97f6fb29d69b48fe4bdb47cc21c834b4536cf752/log4j-api-2.11.0-sources.jar"/>
14+
<classpathentry kind="src" path="/util"/>
15+
<classpathentry kind="output" path="bin"/>
16+
</classpath>

‎RoomAggregatorAPI/.project

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>RoomAggregatorAPI</name>
4-
<comment></comment>
5-
<projects/>
6-
<natures>
7-
<nature>org.eclipse.jdt.core.javanature</nature>
8-
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
9-
</natures>
10-
<buildSpec>
11-
<buildCommand>
12-
<name>org.eclipse.jdt.core.javabuilder</name>
13-
<arguments/>
14-
</buildCommand>
15-
<buildCommand>
16-
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
17-
<arguments/>
18-
</buildCommand>
19-
</buildSpec>
20-
<linkedResources/>
21-
<filteredResources/>
22-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>RoomAggregatorAPI</name>
4+
<comment></comment>
5+
<projects/>
6+
<natures>
7+
<nature>org.eclipse.jdt.core.javanature</nature>
8+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
9+
</natures>
10+
<buildSpec>
11+
<buildCommand>
12+
<name>org.eclipse.jdt.core.javabuilder</name>
13+
<arguments/>
14+
</buildCommand>
15+
<buildCommand>
16+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
17+
<arguments/>
18+
</buildCommand>
19+
</buildSpec>
20+
<linkedResources/>
21+
<filteredResources/>
22+
</projectDescription>

0 commit comments

Comments
 (0)