Skip to content

Commit 206a271

Browse files
dtheilerdtheiler
committed
release 8.1.0
1 parent 0c19602 commit 206a271

File tree

16 files changed

+1596
-1588
lines changed

16 files changed

+1596
-1588
lines changed

‎ss-adapter/ss-adapter-rest-v1/pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@
4444

4545
<apiSource>
4646
<apiVersion>v1</apiVersion>
47-
<basePath>http://test-ll.know-center.tugraz.at/bp-3/SSAdapterRest</basePath>
47+
<basePath>http://localhost:8080/ss-adapter-rest</basePath>
48+
<!--
49+
localhost:8080/ss-adapter-rest
50+
test-ll.know-center.tugraz.at/ltb
51+
-->
4852
<locations>at.kc.tugraz.ss.adapter.rest.v1</locations>
4953

5054
<apiInfo>
@@ -56,7 +60,11 @@
5660
<licenseUrl>${project.licenseURI}</licenseUrl>
5761
</apiInfo>
5862

59-
<swaggerUIDocBasePath>http://test-ll.know-center.tugraz.at/bp-3/api-docs</swaggerUIDocBasePath>
63+
<swaggerUIDocBasePath>http://localhost:8080/ss-adapter-rest/api-docs</swaggerUIDocBasePath>
64+
<!--
65+
localhost:8080/ss-adapter-rest/api-docs
66+
test-ll.know-center.tugraz.at/ltb/api-docs
67+
-->
6068
<swaggerInternalFilter>com.wordnik.swagger.config.DefaultSpecFilter</swaggerInternalFilter>
6169
<outputPath>${basedir}/src/main/webapp/api-docs</outputPath>
6270
<swaggerDirectory>${basedir}/src/main/webapp/api-docs</swaggerDirectory>

‎ss-adapter/ss-adapter-rest-v1/src/main/java/at/kc/tugraz/ss/adapter/rest/v1/SSRestMainV1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public SSRestMainV1() throws Exception{
6666
resourceConfig.register(MultiPartFeature.class);
6767

6868
// SSLogU.info("rest enter");
69-
SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "ss-adapter-rest-conf-bp-3.yaml");
69+
SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "ss-adapter-rest-conf.yaml");
7070

7171
/* util */
7272
SSMimeTypeU.init();

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFile.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
{
22
"apiVersion" : "v1",
33
"swaggerVersion" : "1.2",
4-
"basePath" : "http://test-ll.know-center.tugraz.at/bp-3/SSAdapterRest",
4+
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFile",
66
"apis" : [ {
7-
"path" : "/fileUserFileWrites",
7+
"path" : "/fileCanWrite",
88
"operations" : [ {
99
"method" : "POST",
10-
"summary" : "retrieve files user currently could replace when uploading respective file again as he is writer",
10+
"summary" : "query whether given file can be downloaded with write access",
1111
"notes" : "",
12-
"type" : "SSFileGetEditingFilesRet",
13-
"nickname" : "fileUserFileWrites",
12+
"type" : "SSFileCanWriteRet",
13+
"nickname" : "fileCanWrite",
1414
"produces" : [ "application/json" ],
1515
"consumes" : [ "application/json" ],
1616
"parameters" : [ {
1717
"name" : "body",
1818
"required" : false,
19-
"type" : "SSFileUserFileWritesPar",
19+
"type" : "SSFileCanWritePar",
2020
"paramType" : "body",
2121
"allowMultiple" : false
2222
} ]
2323
} ]
2424
}, {
25-
"path" : "/fileSetReaderOrWriter",
25+
"path" : "/fileExtGet",
2626
"operations" : [ {
2727
"method" : "POST",
28-
"summary" : "set user being writer or reaader for given file",
28+
"summary" : "retrieve a file's extension",
2929
"notes" : "",
30-
"type" : "SSFileSetReaderOrWriterRet",
31-
"nickname" : "fileSetReaderOrWriter",
30+
"type" : "SSFileExtGetRet",
31+
"nickname" : "fileExtGet",
3232
"produces" : [ "application/json" ],
3333
"consumes" : [ "application/json" ],
3434
"parameters" : [ {
3535
"name" : "body",
3636
"required" : false,
37-
"type" : "SSFileSetReaderOrWriterPar",
37+
"type" : "SSFileExtGetPar",
3838
"paramType" : "body",
3939
"allowMultiple" : false
4040
} ]
4141
} ]
4242
}, {
43-
"path" : "/fileCanWrite",
43+
"path" : "/fileUserFileWrites",
4444
"operations" : [ {
4545
"method" : "POST",
46-
"summary" : "query whether given file can be downloaded with write access",
46+
"summary" : "retrieve files user currently could replace when uploading respective file again as he is writer",
4747
"notes" : "",
48-
"type" : "SSFileCanWriteRet",
49-
"nickname" : "fileCanWrite",
48+
"type" : "SSFileGetEditingFilesRet",
49+
"nickname" : "fileUserFileWrites",
5050
"produces" : [ "application/json" ],
5151
"consumes" : [ "application/json" ],
5252
"parameters" : [ {
5353
"name" : "body",
5454
"required" : false,
55-
"type" : "SSFileCanWritePar",
55+
"type" : "SSFileUserFileWritesPar",
5656
"paramType" : "body",
5757
"allowMultiple" : false
5858
} ]
5959
} ]
6060
}, {
61-
"path" : "/fileExtGet",
61+
"path" : "/fileSetReaderOrWriter",
6262
"operations" : [ {
6363
"method" : "POST",
64-
"summary" : "retrieve a file's extension",
64+
"summary" : "set user being writer or reaader for given file",
6565
"notes" : "",
66-
"type" : "SSFileExtGetRet",
67-
"nickname" : "fileExtGet",
66+
"type" : "SSFileSetReaderOrWriterRet",
67+
"nickname" : "fileSetReaderOrWriter",
6868
"produces" : [ "application/json" ],
6969
"consumes" : [ "application/json" ],
7070
"parameters" : [ {
7171
"name" : "body",
7272
"required" : false,
73-
"type" : "SSFileExtGetPar",
73+
"type" : "SSFileSetReaderOrWriterPar",
7474
"paramType" : "body",
7575
"allowMultiple" : false
7676
} ]
@@ -137,7 +137,7 @@
137137
"SSFileSetReaderOrWriterPar" : {
138138
"id" : "SSFileSetReaderOrWriterPar",
139139
"description" : "",
140-
"required" : [ "file", "write", "key", "user", "op" ],
140+
"required" : [ "file", "write", "key", "op", "user" ],
141141
"properties" : {
142142
"file" : {
143143
"type" : "string",
@@ -151,39 +151,39 @@
151151
"type" : "string",
152152
"description" : "the user's access tocken"
153153
},
154-
"user" : {
155-
"type" : "string",
156-
"description" : "the user's identifier"
157-
},
158154
"op" : {
159155
"type" : "string",
160156
"description" : "operation to be executed"
157+
},
158+
"user" : {
159+
"type" : "string",
160+
"description" : "the user's identifier"
161161
}
162162
}
163163
},
164164
"SSFileUserFileWritesPar" : {
165165
"id" : "SSFileUserFileWritesPar",
166166
"description" : "",
167-
"required" : [ "key", "user", "op" ],
167+
"required" : [ "key", "op", "user" ],
168168
"properties" : {
169169
"key" : {
170170
"type" : "string",
171171
"description" : "the user's access tocken"
172172
},
173-
"user" : {
174-
"type" : "string",
175-
"description" : "the user's identifier"
176-
},
177173
"op" : {
178174
"type" : "string",
179175
"description" : "operation to be executed"
176+
},
177+
"user" : {
178+
"type" : "string",
179+
"description" : "the user's identifier"
180180
}
181181
}
182182
},
183183
"SSFileCanWritePar" : {
184184
"id" : "SSFileCanWritePar",
185185
"description" : "",
186-
"required" : [ "file", "key", "user", "op" ],
186+
"required" : [ "file", "key", "op", "user" ],
187187
"properties" : {
188188
"file" : {
189189
"type" : "string",
@@ -193,13 +193,13 @@
193193
"type" : "string",
194194
"description" : "the user's access tocken"
195195
},
196-
"user" : {
197-
"type" : "string",
198-
"description" : "the user's identifier"
199-
},
200196
"op" : {
201197
"type" : "string",
202198
"description" : "operation to be executed"
199+
},
200+
"user" : {
201+
"type" : "string",
202+
"description" : "the user's identifier"
203203
}
204204
}
205205
},
@@ -220,7 +220,7 @@
220220
"SSFileExtGetPar" : {
221221
"id" : "SSFileExtGetPar",
222222
"description" : "",
223-
"required" : [ "file", "key", "user", "op" ],
223+
"required" : [ "file", "key", "op", "user" ],
224224
"properties" : {
225225
"file" : {
226226
"type" : "string",
@@ -230,13 +230,13 @@
230230
"type" : "string",
231231
"description" : "the user's access tocken"
232232
},
233-
"user" : {
234-
"type" : "string",
235-
"description" : "the user's identifier"
236-
},
237233
"op" : {
238234
"type" : "string",
239235
"description" : "operation to be executed"
236+
},
237+
"user" : {
238+
"type" : "string",
239+
"description" : "the user's identifier"
240240
}
241241
}
242242
}

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFileDownload.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
11
{
22
"apiVersion" : "v1",
33
"swaggerVersion" : "1.2",
4-
"basePath" : "http://test-ll.know-center.tugraz.at/bp-3/SSAdapterRest",
4+
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFileDownload",
66
"apis" : [ {
7+
"path" : "/fileDownload",
8+
"operations" : [ {
9+
"method" : "POST",
10+
"summary" : "download a file via POST request",
11+
"notes" : "",
12+
"type" : "string",
13+
"format" : "byte",
14+
"nickname" : "fileDownload",
15+
"produces" : [ "application/octet-stream" ],
16+
"consumes" : [ "application/json" ],
17+
"parameters" : [ {
18+
"name" : "body",
19+
"required" : false,
20+
"type" : "SSFileDownloadPar",
21+
"paramType" : "body",
22+
"allowMultiple" : false
23+
} ]
24+
} ]
25+
}, {
726
"path" : "/fileDownloadGET",
827
"operations" : [ {
928
"method" : "GET",
@@ -34,31 +53,12 @@
3453
"allowMultiple" : false
3554
} ]
3655
} ]
37-
}, {
38-
"path" : "/fileDownload",
39-
"operations" : [ {
40-
"method" : "POST",
41-
"summary" : "download a file via POST request",
42-
"notes" : "",
43-
"type" : "string",
44-
"format" : "byte",
45-
"nickname" : "fileDownload",
46-
"produces" : [ "application/octet-stream" ],
47-
"consumes" : [ "application/json" ],
48-
"parameters" : [ {
49-
"name" : "body",
50-
"required" : false,
51-
"type" : "SSFileDownloadPar",
52-
"paramType" : "body",
53-
"allowMultiple" : false
54-
} ]
55-
} ]
5656
} ],
5757
"models" : {
5858
"SSFileDownloadPar" : {
5959
"id" : "SSFileDownloadPar",
6060
"description" : "",
61-
"required" : [ "file", "key", "user", "op" ],
61+
"required" : [ "file", "key", "op", "user" ],
6262
"properties" : {
6363
"file" : {
6464
"type" : "string",
@@ -68,13 +68,13 @@
6868
"type" : "string",
6969
"description" : "the user's access tocken"
7070
},
71-
"user" : {
72-
"type" : "string",
73-
"description" : "the user's identifier"
74-
},
7571
"op" : {
7672
"type" : "string",
7773
"description" : "operation to be executed"
74+
},
75+
"user" : {
76+
"type" : "string",
77+
"description" : "the user's identifier"
7878
}
7979
}
8080
}

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFileReplace.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"apiVersion" : "v1",
33
"swaggerVersion" : "1.2",
4-
"basePath" : "http://test-ll.know-center.tugraz.at/bp-3/SSAdapterRest",
4+
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFileReplace",
66
"apis" : [ {
77
"path" : "/fileReplace",

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFileUpload.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"apiVersion" : "v1",
33
"swaggerVersion" : "1.2",
4-
"basePath" : "http://test-ll.know-center.tugraz.at/bp-3/SSAdapterRest",
4+
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFileUpload",
66
"apis" : [ {
77
"path" : "/fileUpload",

0 commit comments

Comments
 (0)