Skip to content

Commit 26d3897

Browse files
hugifixhugifix
authored
Merge pull request #32 from rwth-acis/develop
release be-v0.2.6
2 parents 7a2c97b + 8e884c8 commit 26d3897

File tree

88 files changed

+8697
-8201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+8697
-8201
lines changed

‎.classpath‎

Lines changed: 55 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,59 @@
33
<classpathentry kind="src" path="src/main"/>
44
<classpathentry kind="src" output="tmp/test" path="src/test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
7-
<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
8-
<classpathentry kind="lib" path="lib/ant-junit-1.6.5.jar"/>
9-
<classpathentry kind="lib" path="lib/asm-4.0.jar"/>
10-
<classpathentry kind="lib" path="lib/asm-tree-4.0.jar"/>
11-
<classpathentry kind="lib" path="lib/asm-util-4.0.jar"/>
12-
<classpathentry kind="lib" path="lib/cglib-3.0.jar"/>
13-
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
14-
<classpathentry kind="lib" path="lib/commons-dbcp2-2.0.jar"/>
15-
<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
16-
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
17-
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
18-
<classpathentry kind="lib" path="lib/commons-pool2-2.2.jar"/>
19-
<classpathentry kind="lib" path="lib/FreePastry-2.1.jar"/>
20-
<classpathentry kind="lib" path="lib/geronimo-jta_1.1_spec-1.1.1.jar"/>
21-
<classpathentry kind="lib" path="lib/gson-2.3.jar"/>
22-
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
23-
<classpathentry kind="lib" path="lib/hamcrest-all-1.3.jar"/>
24-
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
25-
<classpathentry kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
26-
<classpathentry kind="lib" path="lib/integration-1.6.1.jar"/>
27-
<classpathentry kind="lib" path="lib/jackson-annotations-2.4.5.jar"/>
28-
<classpathentry kind="lib" path="lib/jackson-core-2.4.5.jar"/>
29-
<classpathentry kind="lib" path="lib/jackson-databind-2.4.5.jar"/>
30-
<classpathentry kind="lib" path="lib/jackson-dataformat-xml-2.4.5.jar"/>
31-
<classpathentry kind="lib" path="lib/jackson-dataformat-yaml-2.4.5.jar"/>
32-
<classpathentry kind="lib" path="lib/jackson-datatype-joda-2.4.5.jar"/>
33-
<classpathentry kind="lib" path="lib/jackson-jaxrs-base-2.4.5.jar"/>
34-
<classpathentry kind="lib" path="lib/jackson-jaxrs-json-provider-2.4.5.jar"/>
35-
<classpathentry kind="lib" path="lib/jackson-module-jaxb-annotations-2.4.5.jar"/>
36-
<classpathentry kind="lib" path="lib/javassist-3.18.2-GA.jar"/>
37-
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
38-
<classpathentry kind="lib" path="lib/joda-time-2.2.jar"/>
39-
<classpathentry kind="lib" path="lib/jodd-bean-3.6.1.jar"/>
40-
<classpathentry kind="lib" path="lib/jodd-core-3.6.1.jar"/>
41-
<classpathentry kind="lib" path="lib/jodd-vtor-3.6.1.jar"/>
42-
<classpathentry kind="lib" path="lib/jooq-3.8.2.jar"/>
43-
<classpathentry kind="lib" path="lib/jooq-codegen-3.8.2.jar"/>
44-
<classpathentry kind="lib" path="lib/jooq-meta-3.8.2.jar"/>
45-
<classpathentry kind="lib" path="lib/json-simple-1.1.jar"/>
46-
<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
47-
<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
48-
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
49-
<classpathentry kind="lib" path="lib/lang-tag-1.4.jar"/>
50-
<classpathentry kind="lib" path="lib/las2peer-0.5.4.jar"/>
51-
<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.5.4.jar"/>
52-
<classpathentry kind="lib" path="lib/las2peer-web-connector-0.5.4.jar"/>
53-
<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
54-
<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
55-
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6.jar"/>
56-
<classpathentry kind="lib" path="lib/nestedvm-1.0.jar"/>
57-
<classpathentry kind="lib" path="lib/nimbus-jose-jwt-4.0.jar"/>
58-
<classpathentry kind="lib" path="lib/oauth2-oidc-sdk-4.17.jar"/>
59-
<classpathentry kind="lib" path="lib/org.apache.felix.bundlerepository-1.4.2.jar"/>
60-
<classpathentry kind="lib" path="lib/org.apache.felix.framework-2.0.2.jar"/>
61-
<classpathentry kind="lib" path="lib/org.apache.felix.main-2.0.2.jar"/>
62-
<classpathentry kind="lib" path="lib/org.apache.felix.shell.tui-1.4.1.jar"/>
63-
<classpathentry kind="lib" path="lib/org.apache.felix.shell-1.4.1.jar"/>
64-
<classpathentry kind="lib" path="lib/org.osgi.core-1.0.1.jar"/>
65-
<classpathentry kind="lib" path="lib/org.osgi.service.obr-1.0.2.jar"/>
66-
<classpathentry kind="lib" path="lib/persistence-api-1.0.jar"/>
67-
<classpathentry kind="lib" path="lib/reflections-0.9.10.jar"/>
68-
<classpathentry kind="lib" path="lib/slf4j-api-1.6.3.jar"/>
69-
<classpathentry kind="lib" path="lib/snakeyaml-1.12.jar"/>
70-
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.7.2.jar"/>
71-
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
72-
<classpathentry kind="lib" path="lib/swagger-annotations-1.5.4.jar"/>
73-
<classpathentry kind="lib" path="lib/swagger-core-1.5.4.jar"/>
74-
<classpathentry kind="lib" path="lib/swagger-jaxrs-1.5.4.jar"/>
75-
<classpathentry kind="lib" path="lib/swagger-models-1.5.4.jar"/>
76-
<classpathentry kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
77-
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
6+
<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
7+
<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
8+
<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
9+
<classpathentry kind="lib" path="lib/commons-dbcp2-2.0.jar"/>
10+
<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
11+
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
12+
<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
13+
<classpathentry kind="lib" path="lib/commons-pool2-2.2.jar"/>
14+
<classpathentry kind="lib" path="lib/FreePastry-2.1.1.jar"/>
15+
<classpathentry kind="lib" path="lib/gson-2.3.jar"/>
16+
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
17+
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
18+
<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
19+
<classpathentry kind="lib" path="lib/httpcore-4.4.3.jar"/>
20+
<classpathentry kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
21+
<classpathentry kind="lib" path="lib/jackson-annotations-2.4.5.jar"/>
22+
<classpathentry kind="lib" path="lib/jackson-core-2.4.5.jar"/>
23+
<classpathentry kind="lib" path="lib/jackson-databind-2.4.5.jar"/>
24+
<classpathentry kind="lib" path="lib/jackson-dataformat-xml-2.4.5.jar"/>
25+
<classpathentry kind="lib" path="lib/jackson-dataformat-yaml-2.4.5.jar"/>
26+
<classpathentry kind="lib" path="lib/jackson-datatype-joda-2.4.5.jar"/>
27+
<classpathentry kind="lib" path="lib/jackson-jaxrs-base-2.4.5.jar"/>
28+
<classpathentry kind="lib" path="lib/jackson-jaxrs-json-provider-2.4.5.jar"/>
29+
<classpathentry kind="lib" path="lib/jackson-module-jaxb-annotations-2.4.5.jar"/>
30+
<classpathentry kind="lib" path="lib/javassist-3.18.2-GA.jar"/>
31+
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
32+
<classpathentry kind="lib" path="lib/joda-time-2.2.jar"/>
33+
<classpathentry kind="lib" path="lib/jodd-bean-3.6.1.jar"/>
34+
<classpathentry kind="lib" path="lib/jodd-core-3.6.1.jar"/>
35+
<classpathentry kind="lib" path="lib/jodd-vtor-3.6.1.jar"/>
36+
<classpathentry kind="lib" path="lib/jooq-3.8.2.jar"/>
37+
<classpathentry kind="lib" path="lib/jooq-codegen-3.8.2.jar"/>
38+
<classpathentry kind="lib" path="lib/jooq-meta-3.8.2.jar"/>
39+
<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
40+
<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
41+
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
42+
<classpathentry kind="lib" path="lib/lang-tag-1.4.jar"/>
43+
<classpathentry kind="lib" path="lib/las2peer-0.5.7.jar"/>
44+
<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.5.7.jar"/>
45+
<classpathentry kind="lib" path="lib/las2peer-web-connector-0.5.7.jar"/>
46+
<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
47+
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6.jar"/>
48+
<classpathentry kind="lib" path="lib/nimbus-jose-jwt-4.0.jar"/>
49+
<classpathentry kind="lib" path="lib/oauth2-oidc-sdk-4.17.jar"/>
50+
<classpathentry kind="lib" path="lib/reflections-0.9.10.jar"/>
51+
<classpathentry kind="lib" path="lib/slf4j-api-1.6.3.jar"/>
52+
<classpathentry kind="lib" path="lib/snakeyaml-1.12.jar"/>
53+
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
54+
<classpathentry kind="lib" path="lib/swagger-annotations-1.5.4.jar"/>
55+
<classpathentry kind="lib" path="lib/swagger-core-1.5.4.jar"/>
56+
<classpathentry kind="lib" path="lib/swagger-jaxrs-1.5.4.jar"/>
57+
<classpathentry kind="lib" path="lib/swagger-models-1.5.4.jar"/>
58+
<classpathentry kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
59+
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
7860
<classpathentry kind="output" path="tmp/classes"/>
79-
</classpath>
61+
</classpath>

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ restMapping.xml
2727

2828
# Eclipse
2929
.metadata
30-
.idea/workspace.xml
30+
.idea/workspace.xml
31+
/bin/start_network.sh
32+
/bin/start_network.bat

‎bin/JOOQGeneration/run.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -classpath ../../lib/jooq-3.7.2.jar;../../lib/jooq-meta-3.7.2.jar;../../lib/jooq-codegen-3.7.2.jar;../../lib/mysql-connector-java-5.1.33.jar;. org.jooq.util.GenerationTool /reqbaz_generation_info.xml
1+
java -classpath ../../lib/jooq-3.8.2.jar;../../lib/jooq-meta-3.8.2.jar;../../lib/jooq-codegen-3.8.2.jar;../../lib/mysql-connector-java-5.1.6.jar;. org.jooq.util.GenerationTool /reqbaz_generation_info.xml

‎bin/JOOQGeneration/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -classpath ../../lib/jooq-3.4.2.jar:../../lib/jooq-meta-3.4.2.jar:../../lib/jooq-codegen-3.4.2.jar:../../lib/mysql-connector-java-5.1.33.jar:. org.jooq.util.GenerationTool /reqbaz_generation_info.xml
1+
java -classpath ../../lib/jooq-3.8.2.jar:../../lib/jooq-meta-3.8.2.jar:../../lib/jooq-codegen-3.8.2.jar:../../lib/mysql-connector-java-5.1.6.jar:. org.jooq.util.GenerationTool /reqbaz_generation_info.xml

‎bin/start_network.bat‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎bin/start_network.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎etc/ReqBaz_create.sql‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ CREATE TABLE IF NOT EXISTS attachments (
99
Requirement_Id INT NOT NULL,
1010
User_Id INT NOT NULL,
1111
title VARCHAR(255) NOT NULL,
12-
discriminator CHAR(1) NOT NULL,
13-
file_path VARCHAR(500) NULL,
1412
description TEXT NULL,
15-
story TEXT NULL,
16-
subject VARCHAR(255) NULL,
17-
object VARCHAR(255) NULL,
18-
object_desc VARCHAR(255) NULL,
13+
mime_type VARCHAR(255) NOT NULL,
14+
identifier VARCHAR(900) NOT NULL,
15+
fileUrl VARCHAR(1000) NOT NULL,
1916
CONSTRAINT attachments_pk PRIMARY KEY (Id),
2017
CONSTRAINT Attachement_Requirement FOREIGN KEY Attachement_Requirement (Requirement_Id) REFERENCES requirements (Id)
2118
ON DELETE CASCADE,
@@ -30,10 +27,12 @@ CREATE TABLE IF NOT EXISTS comments (
3027
lastupdated_time TIMESTAMP NULL,
3128
Requirement_Id INT NOT NULL,
3229
User_Id INT NOT NULL,
30+
BelongsToComment_Id INT,
3331
CONSTRAINT comments_pk PRIMARY KEY (Id),
3432
CONSTRAINT Comment_Requirement FOREIGN KEY Comment_Requirement (Requirement_Id) REFERENCES requirements (Id)
3533
ON DELETE CASCADE,
36-
CONSTRAINT Comment_User FOREIGN KEY Comment_User (User_Id) REFERENCES users (Id)
34+
CONSTRAINT Comment_User FOREIGN KEY Comment_User (User_Id) REFERENCES users (Id),
35+
CONSTRAINT belongsToComment FOREIGN KEY comments (BelongsToComment_Id) REFERENCES comments (Id)
3736
);
3837

3938
-- Table components

0 commit comments

Comments
 (0)