Skip to content

Commit e21953f

Browse files
AlexanderNeumannAlexanderNeumann
committed
Merge branch 'develop' into SocialBotFramework
Conflicts: build.xml
2 parents d5afa3f + fca338b commit e21953f

16 files changed

+151
-25
lines changed

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
88
<classpathentry kind="lib" path="lib/jersey-media-json-jackson-2.25.1.jar"/>
99
<classpathentry kind="lib" path="servicebundle/gson-2.8.2.jar"/>
10-
<classpathentry kind="lib" path="lib/las2peer-bundle-0.7-SBF.jar"/>
10+
<classpathentry kind="lib" path="lib/las2peer-bundle-0.7.6.jar"/>
1111
<classpathentry kind="output" path="output"/>
1212
</classpath>

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ This suite of microservices forms the backend of the Distributed Noracle Project
77
Please try out our app at: [dbis.rwth-aachen.de/noracle/](http://dbis.rwth-aachen.de/noracle/)
88

99
---------------
10+
11+
## Setup
12+
1. Build the project using `ant all`
13+
1. Copy *launcher-configuration.ini* to *etc/*
14+
1. Start using `./start-local.sh` for starting in the same shell (useful for testing), or `./start-node.sh` for starting Noracle in a screen (useful for production)

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project name="Distributed-Noracle-Service" default="jar" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
22

3-
<property name="core.version" value="0.7-SNAPSHOT" />
3+
<property name="core.version" value="0.7.6" />
44

55
<property name="service.name" value="i5.las2peer.services.noracleService" />
66
<property name="service.class" value="NoracleService" />

‎launcher-configuration.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ service
1212
uploadStartupDirectory('example')
1313
uploadServicePackage('service/i5.las2peer.services.fileService-2.2.5.jar', 'agent-developer.xml', 'topsecret')
1414
startService('i5.las2peer.services.fileService.FileService@2.2.5','testtest')
15-
uploadServicePackage('service/i5.las2peer.services.noracleService-0.6.0.jar', 'agent-developer.xml', 'topsecret')
16-
startService('i5.las2peer.services.noracleService.NoracleSpaceService@0.6.0','testtest')
17-
startService('i5.las2peer.services.noracleService.NoracleQuestionService@0.6.0','testtest')
18-
startService('i5.las2peer.services.noracleService.NoracleQuestionRelationService@0.6.0','testtest')
19-
startService('i5.las2peer.services.noracleService.NoracleAgentService@0.6.0','testtest')
20-
startService('i5.las2peer.services.noracleService.NoracleVoteService@0.6.0','testtest')
21-
startService('i5.las2peer.services.noracleService.NoracleService@0.6.0','testtest')
15+
uploadServicePackage('service/i5.las2peer.services.noracleService-0.7.0.jar', 'agent-developer.xml', 'topsecret')
16+
startService('i5.las2peer.services.noracleService.NoracleSpaceService@0.7.0','testtest')
17+
startService('i5.las2peer.services.noracleService.NoracleQuestionService@0.7.0','testtest')
18+
startService('i5.las2peer.services.noracleService.NoracleQuestionRelationService@0.7.0','testtest')
19+
startService('i5.las2peer.services.noracleService.NoracleAgentService@0.7.0','testtest')
20+
startService('i5.las2peer.services.noracleService.NoracleVoteService@0.7.0','testtest')
21+
startService('i5.las2peer.services.noracleService.NoracleService@0.7.0','testtest')
2222
startWebConnector
2323
interactive

‎noracle-generate-examples.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
endpoint="https://steen.informatik.rwth-aachen.de:9082/distributed-noracle/v0.6.0"
3+
endpoint="https://steen.informatik.rwth-aachen.de:9082/distributed-noracle/v0.7.0"
44

55
space_creator_agent_id="762a164ba8eb06d3d110eeeb0321cb75f2624ab311f9c0c4d0e91bdc854a02f389b91573d6c29d70d3071a8a1738cd20fac87d638777dbfcef4ded8be71e2656"
66
space_creator_agent_login="noracle-example-smith"

‎src/main/i5/las2peer/services/noracleService/model/QuestionRelation.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public QuestionRelation(String relationId, String spaceId, String authorId, Stri
3232
this.timestampLastModified = timestampCreated;
3333
}
3434

35+
public void setSpaceId(String spaceId) {
36+
this.spaceId = spaceId;
37+
}
38+
3539
public String getRelationId() {
3640
return relationId;
3741
}
@@ -96,4 +100,8 @@ public void setTimestampLastModified(String timestampLastModified) {
96100
this.timestampLastModified = timestampLastModified;
97101
}
98102

103+
public void setAuthorId(String authorId) {
104+
this.authorId = authorId;
105+
}
106+
99107
}

‎src/main/i5/las2peer/services/noracleService/model/VotedQuestion.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package i5.las2peer.services.noracleService.model;
2+
3+
public class VotedQuestion extends Question {
4+
5+
private static final long serialVersionUID = 1L;
6+
7+
private VoteList votes;
8+
9+
public VotedQuestion() { // used in tests
10+
11+
}
12+
13+
public VotedQuestion(Question q) {
14+
this.setQuestionId(q.getQuestionId());
15+
this.setText(q.getText());
16+
this.setSpaceId(q.getSpaceId());
17+
this.setAuthorId(q.getAuthorId());
18+
this.setTimestampCreated(q.getTimestampCreated());
19+
this.setTimestampLastModified(q.getTimestampLastModified());
20+
this.setDepth(q.getDepth());
21+
}
22+
23+
public VoteList getVotes() {
24+
return votes;
25+
}
26+
27+
public void setVotes(VoteList votes) {
28+
this.votes = votes;
29+
}
30+
31+
}

‎src/main/i5/las2peer/services/noracleService/model/VotedQuestionList.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package i5.las2peer.services.noracleService.model;
2+
3+
import java.util.ArrayList;
4+
5+
public class VotedQuestionList extends ArrayList<VotedQuestion> {
6+
7+
private static final long serialVersionUID = 1L;
8+
9+
}

‎src/main/i5/las2peer/services/noracleService/model/VotedQuestionRelation.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package i5.las2peer.services.noracleService.model;
2+
3+
public class VotedQuestionRelation extends QuestionRelation {
4+
5+
private static final long serialVersionUID = 1L;
6+
7+
private VoteList votes;
8+
9+
public VotedQuestionRelation(QuestionRelation r) {
10+
this.setRelationId(r.getRelationId());
11+
this.setSpaceId(r.getSpaceId());
12+
this.setAuthorId(r.getAuthorId());
13+
this.setName(r.getName());
14+
this.setFirstQuestionId(r.getFirstQuestionId());
15+
this.setSecondQuestionId(r.getSecondQuestionId());
16+
this.setDirected(r.isDirected());
17+
this.setTimestampCreated(r.getTimestampCreated());
18+
this.setTimestampLastModified(r.getTimestampLastModified());
19+
}
20+
21+
public VoteList getVotes() {
22+
return votes;
23+
}
24+
25+
public void setVotes(VoteList votes) {
26+
this.votes = votes;
27+
}
28+
29+
}

‎src/main/i5/las2peer/services/noracleService/model/VotedQuestionRelationList.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package i5.las2peer.services.noracleService.model;
2+
3+
import java.util.ArrayList;
4+
5+
public class VotedQuestionRelationList extends ArrayList<VotedQuestionRelation> {
6+
7+
private static final long serialVersionUID = 1L;
8+
9+
}

0 commit comments

Comments
 (0)