Skip to content

Commit b7a4286

Browse files
dtheilerdtheiler
committed
SSS-422
1 parent ae0c856 commit b7a4286

File tree

161 files changed

+25
-24
lines changed

Some content is hidden

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

161 files changed

+25
-24
lines changed

‎adapter/adapter.rest/adapter.rest.v3/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<executions>
4343

44-
<execution>
44+
<!-- <execution>
4545
<id>copy-docker-conf</id>
4646
<phase>prepare-package</phase>
4747
<goals>
@@ -55,7 +55,7 @@
5555
</resource>
5656
</resources>
5757
</configuration>
58-
</execution>
58+
</execution>-->
5959

6060
<!-- <execution>
6161
<id>copy-conf</id>
@@ -95,14 +95,14 @@
9595

9696
<locations>at.tugraz.sss.adapter.rest.v3</locations>
9797

98-
<!--<host>localhost:8080</host>-->
99-
<!--<basePath>/sss.adapter.rest.v3/rest</basePath>-->
98+
<host>localhost:8080</host>
99+
<basePath>/sss.adapter.rest.v3/rest</basePath>
100100

101101
<!--<host>test-ll.know-center.tugraz.at</host>-->
102102
<!--<basePath>/bp.preparation/rest</basePath>-->
103103

104-
<host>test-ll.know-center.tugraz.at</host>
105-
<basePath>/eval/rest</basePath>
104+
<!--<host>test-ll.know-center.tugraz.at</host>-->
105+
<!--<basePath>/eval/rest</basePath>-->
106106

107107
<info>
108108
<version>v3</version>

‎adapter/adapter.rest/adapter.rest.v3/src/main/java/at/tugraz/sss/adapter/rest/v3/SSInitializer.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
import at.kc.tugraz.sss.video.serv.*;
4949
import at.tugraz.sss.conf.*;
5050
import at.tugraz.sss.serv.conf.api.*;
51-
import at.tugraz.sss.serv.datatype.*;
52-
import at.tugraz.sss.serv.datatype.enums.*;
5351
import at.tugraz.sss.serv.db.serv.*;
5452
import at.tugraz.sss.serv.impl.api.*;
5553
import at.tugraz.sss.serv.reg.*;
@@ -95,10 +93,10 @@ public void contextInitialized(ServletContextEvent sce) {
9593
try{
9694

9795
try{
96+
SSCoreConf.instSet("/sssWorkDir/" + SSFileU.fileNameSSSConf);
9897
// SSCoreConf.instSet("C:\\workspace_git\\tomcat\\SocialSemanticServer\\sssWorkDir\\" + SSFileU.fileNameSSSConf);
9998
// SSCoreConf.instSet("/home/dtheiler/bp.preparation/" + SSFileU.fileNameSSSConf);
100-
101-
SSCoreConf.instSet("/home/dtheiler/eval/" + SSFileU.fileNameSSSConf);
99+
// SSCoreConf.instSet("/home/dtheiler/eval/" + SSFileU.fileNameSSSConf);
102100
}catch(Exception error){
103101
System.err.println("conf couldnt be set");
104102
SSServErrReg.regErrThrow(error);

‎adapter/adapter.rest/adapter.rest.v3/src/main/java/at/tugraz/sss/adapter/rest/v3/SSRestClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@
3131

3232
public class SSRestClient {
3333

34-
// public static final String host = "http://localhost:8080/";
35-
// public static final String restPath = "sss.adapter.rest.v3/rest/";
34+
public static final String host = "http://localhost:8080/";
35+
public static final String restPath = "sss.adapter.rest.v3/rest/";
3636

3737
// public static final String host = "http://test-ll.know-center.tugraz.at/";
3838
// public static final String restPath = "bp.preparation/rest/";
3939

40-
public static final String host = "http://test-ll.know-center.tugraz.at/";
41-
public static final String restPath = "eval/rest/";
40+
// public static final String host = "http://test-ll.know-center.tugraz.at/";
41+
// public static final String restPath = "eval/rest/";
4242

4343
// public static final SSAuthEnum authMethod = SSAuthEnum.oidc;
4444
public static final SSAuthEnum authMethod = SSAuthEnum.csvFileAuth;
4545

46-
private final String oidcToken = "eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0NTM4MzI3OTUsImF1ZCI6WyIwM2Q3ZGQwOS1lOTllLTQzZWEtYmQ5My1kMDY2NjE0MjZjOTUiXSwiaXNzIjoiaHR0cHM6XC9cL2FwaS5sZWFybmluZy1sYXllcnMuZXVcL29cL29hdXRoMlwvIiwianRpIjoiYmUyOWI2MTktYzliYy00ZjdhLWI5NzQtODhkNTJiZGI4M2RiIiwiaWF0IjoxNDUzODE0Nzk1fQ.eN853nlyfqyN7bhJ1bDlydFSONcK29EBsehCk4sxhrOA4cbmN6UJyJrxWkl50-n4hdnoJFL-371tn-arCcmfqoZD8SqKexlmlZSbFSwyaYGgnNGK3V1Su889n9kLA5BiU33smdTIrC_6sVysnUoS3o8h1hvyeAIyqn-QFvHxVh8";
46+
private final String oidcToken = "";
4747
private final Client client;
4848

4949
private String key = null;

‎adapter/adapter.rest/adapter.rest.v3/src/main/webapp/api-docs/swagger.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
1414
}
1515
},
16-
"host" : "test-ll.know-center.tugraz.at",
17-
"basePath" : "/eval/rest",
16+
"host" : "localhost:8080",
17+
"basePath" : "/sss.adapter.rest.v3/rest",
1818
"tags" : [ {
1919
"name" : "activities"
2020
}, {

‎adapter/adapter.rest/adapter.rest.v3/src/main/webapp/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
if (url && url.length > 1) {
3535
url = decodeURIComponent(url[1]);
3636
} else {
37-
url = "http://test-ll.know-center.tugraz.at/eval/api-docs/swagger.json";
37+
// url = "http://test-ll.know-center.tugraz.at/eval/api-docs/swagger.json";
3838
// url = "http://test-ll.know-center.tugraz.at/bp.preparation/api-docs/swagger.json";
39-
// url = "http://localhost:8080/sss.adapter.rest.v3/api-docs/swagger.json";
39+
url = "http://localhost:8080/sss.adapter.rest.v3/api-docs/swagger.json";
4040
}
4141

4242
// Pre load translate...

‎adapter/adapter.socket/adapter.socket.v3/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<manifest>
5555
<addClasspath>true</addClasspath>
5656
<classpathPrefix>lib/</classpathPrefix>
57-
<mainClass>at.tugraz.sss.adapter.socket.SSSocketMainV2</mainClass>
57+
<mainClass>at.tugraz.sss.adapter.socket.v3.SSSocketMain</mainClass>
5858
</manifest>
5959
</archive>
6060
</configuration>
@@ -80,7 +80,7 @@
8080
<outputDirectory>${project.build.directory}/sss.app/</outputDirectory>
8181
<resources>
8282
<resource>
83-
<directory>${basedir}/src/main/resources/conf</directory>
83+
<directory>${basedir}/../../../resources/conf</directory>
8484
</resource>
8585
</resources>
8686
</configuration>

‎adapter/adapter.socket/adapter.socket.v3/src/main/java/at/tugraz/sss/adapter/socket/v3/SSSocketMain.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public void start(String[] args) throws Exception {
9696
// initializer.join();
9797
try{
9898

99-
SSCoreConf.instSet("C:\\workspace_git\\tomcat\\SocialSemanticServer\\sssWorkDir\\" + SSFileU.fileNameSSSConf);
99+
SSCoreConf.instSet("/sssWorkDir/" + SSFileU.fileNameSSSConf);
100+
// SSCoreConf.instSet("C:\\workspace_git\\tomcat\\SocialSemanticServer\\sssWorkDir\\" + SSFileU.fileNameSSSConf);
100101
// SSCoreConf.instSet("/home/dtheiler/bp.preparation/" + SSFileU.fileNameSSSConf);
101102

102103
try{

‎pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<packaging>pom</packaging>
99
<!-- <url>http://maven.apache.org</url> -->
1010

11+
<description>service framework to support informal learning (tools)</description>
12+
1113
<build>
1214

1315
<plugins>
@@ -150,5 +152,5 @@
150152
<module>serv</module>
151153
<module>conf</module>
152154
</modules>
153-
<description>service framework to support informal learning (tools)</description>
155+
154156
</project>

adapter/adapter.socket/adapter.socket.v3/src/main/resources/archive/achso/SSDataImportAchso.txt renamed to resources/archive/achso/SSDataImportAchso.txt

File renamed without changes.

adapter/adapter.socket/adapter.socket.v3/src/main/resources/archive/broadcast/SSBroadcast.txt renamed to resources/archive/broadcast/SSBroadcast.txt

File renamed without changes.

0 commit comments

Comments
 (0)