Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dad
fdp-api
Commits
6c0f57c4
Commit
6c0f57c4
authored
Nov 04, 2020
by
cazenave
Browse files
change application.yml
parent
b0f4dcbc
Changes
329
Show whitespace changes
Inline
Side-by-side
src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
View file @
6c0f57c4
...
...
@@ -112,12 +112,12 @@ public class Rdf_Migration_0001_Init implements RdfProductionMigration {
add
(
s
,
DCTERMS
.
CONFORMS_TO
,
i
(
"https://www.purl.org/fairtools/fdp/schema/0.1/fdpMetadata"
));
add
(
s
,
DCTERMS
.
LANGUAGE
,
language
);
// Identifier
IRI
identifierIri
=
i
(
persistentUrl
+
"#identifier"
);
IRI
identifierIri
=
i
(
persistentUrl
+
"
/
#identifier"
);
add
(
s
,
DATACITE
.
HASIDENTIFIER
,
identifierIri
);
add
(
s
,
identifierIri
,
RDF
.
TYPE
,
DATACITE
.
IDENTIFIER
);
add
(
s
,
identifierIri
,
DCTERMS
.
IDENTIFIER
,
l
(
persistentUrl
));
// Access Rights
IRI
arIri
=
i
(
persistentUrl
+
"#accessRights"
);
IRI
arIri
=
i
(
persistentUrl
+
"
/
#accessRights"
);
add
(
s
,
DCTERMS
.
ACCESS_RIGHTS
,
arIri
);
add
(
s
,
arIri
,
RDF
.
TYPE
,
DCTERMS
.
RIGHTS_STATEMENT
);
add
(
s
,
arIri
,
DCTERMS
.
DESCRIPTION
,
l
(
accessRightsDescription
));
...
...
src/main/java/nl/dtls/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
View file @
6c0f57c4
...
...
@@ -118,7 +118,7 @@ public class MetadataEnhancer {
}
private
Identifier
createMetadataIdentifier
(
IRI
uri
)
{
IRI
identifierUri
=
i
(
uri
.
stringValue
()
+
"#identifier"
);
IRI
identifierUri
=
i
(
uri
.
stringValue
()
+
"
/
#identifier"
);
return
new
Identifier
(
identifierUri
,
DATACITE
.
IDENTIFIER
,
l
(
uri
));
}
...
...
src/main/resources/application-production.yml
View file @
6c0f57c4
# version width K8 DNS services
instance
:
clientUrl
:
http://fdp-client.default.svc.cluster.local
persistentUrl
:
http://10.6.10.9/
clientUrl
:
http://51.178.69.147
server
:
port
:
80
...
...
@@ -9,14 +8,14 @@ server:
spring
:
data
:
mongodb
:
uri
:
mongodb://mongo.
default
.svc.cluster.local:27017/fdp
uri
:
mongodb://mongo.
f2ds
.svc.cluster.local:27017/fdp
repository
:
type
:
5
blazegraph
:
url
:
http://blazegraph.
default
.svc.cluster.local:8888/blazegraph
url
:
http://blazegraph.
f2ds
.svc.cluster.local:8888/blazegraph
...
...
src/main/resources/application.yml
View file @
6c0f57c4
# version width K8 DNS services
instance
:
clientUrl
:
http://fdp-client.default.svc.cluster.local
clientUrl
:
http://51.178.69.147
server
:
port
:
80
spring
:
data
:
mongodb
:
uri
:
mongodb://mongo:27017/fdp
management
:
health
:
solr
:
enabled
:
false
info
:
defaults
:
enabled
:
false
security
:
jwt
:
token
:
secret-key
:
IBQADE2IGQAWYWPUR2RTLCE2GSUST8MNLYM6XJJ0442SO8LBQ0Y5NSSZPDMEEJ9DH5EXL02AZCZWGOWH5RY23BDT7WBBMVC607DTANIJ3VH8KD6JDOLW03G68Q5Z2Y430QV76RBCIM3TIFGP32Y33QR3LFXEGGII2UQOZFQFOZ2NZ9KLDHJLAAOU2PH82PVH7DTBNLTQD30HQG6OI09O9LT9BDKIYYB10TO2MDDS1MZ0C77O8OQDDLAXDK8LFWGMZSK4MAUJNLPTMVGX5CSVXAGNDBFNSZNGA37XSCP7JAYR8AQQDEHM5GOB3AIBOKDQ3BJ3GORFAZOHU3EJU2JBFY5JH8BM8QEUCQ6XZEE6SWO28HSNWVHV8UB3Z0M46BX7K0UM9HJJQ3I3R1KGTSRTR3U4XTTDHPKRBNGZ8HM4ZTJOOF26KFE21Q9C2LQD6OZRZ5REOYKGN2V47OLYPO2QB6982TPEE8HVBOJ7I9GE4MHG0BFMO9UKSZA5P17KR4TLBKXG51AB4DWQPK445FX7ZLBV6KSUUNDSCQI7PVI31MMET8168WGEN25WWUHSEB5KVLQH53BVJ0P7B0NHJOY31DH5F2ZUIAVFFE6MRPZAUHYRY5LQLFUFB1MF0MX6J61WEPC5MBLCD1JN9UP35HSHR8Z3YHTBP388DSGPX74C88S4A3BTK8PIIQ3TQKL819VL7LOHXJL1FODC1TGW0KGBV8XRPPV5K75KG5MJM7E3WMXDEY5G4PJYNLT5G67257X1RONPG518N76CBXUQBTYTBYH81PBHD0O09PY3R5X9IDDI4FBIAX4WANZSRLUQNJT4EI7W8AYHZ16P2O769O4GS2ECL3IDUPVYCFINAC2E1Q80P1PVZNLDFF9440E0Q27375NK5NLZQQCJXBB8J4QPFI78TW2MH9O5OVQ04506FWBUCLK3O6Q3XCXKBJRPLZBB6SVKXCOYELQQA0U5QBW4VNYNHY4TFZ8RDSNVULB5GV35432IAFKAQBL1KVA7LJBMAN06EFXW303MYYGKEH2URL02RHRDHROQHAH4TY76F1R9RKPVF620MYMBNF9LNC96U7PX2E5WCO7B778ZYT6RZKMPHP5FRG3LT0HSY540ZN91B1ACZAID1JTJKWOIGQSKPQEO3ORDNI2WQMPNTI7KJL6CP53VXFVM0M54F1IVK0V1M7QIUXVJ3VC6XNFDMV77I8DOL926SNS5Z952LGQFVPSS60X7MMPJ8PNNT0BX4B14CYT5E3832H8YOATAHD9PFD30ELYJV4S6RDZ0D6CJWM5KQGBCXHXAB98Z4DYWGAC5T7K5N17SWAT86VU3VNP8AJP2AGZVFBBEI3MCP7RW7Z1DR85YI6CMW7M8MUAWB66LWU6NAZ4PW4FSD443KX15FYYRZDPDNGKLVZY5680G0TCW76N40D1JU4GBLCWASIHEU110XZZ0OLYLHCJCQGELT7Y5B10VBRVWW48Q6AGJ0T85Y73RCCPBJSU73UAN51R0E65RF6OQGNOY6RDHCI06S8EO6AMZMK503M0ORDFSH8BE6NE9J2022ZSFEO0FM513SLKUSYPK4NG0FJIBCR3T0Y7CIOF6WDA5AA9JY615PQPRD38E0GDFM2A1XIU9Y5LR71F69VZPC5CXJZOXVB2T6WQNJDEN8KBGK1R55IOLBK6LYPVB1SOWM26K46OM39ZZX5H8D4OMAX9B6MHKQD0D4V8VNTQO5P0MRE39YUC231T87HCJDILC8IBS6LB2PC7F8C5TYLZ2Q8RKC015I4JX3SAOFZIPGGD0Q5HQYH1PVYIVU43QNK2N5O13NPMF6NT6BHK4GXR52IZLYWD9KR0UAZJ1YCL7COD2VF4AI1SMP0PZPODVQVGX7BFEVRBS9XKI1TAWLEGRSYD5XBLWH91YPFIUDVCOJT4RQJOHV9QRM32BJYMBTTJYN42NFKF6SRXWHXIKMMDEHXCUECAJW70A6UM0QEIC988M03FJ5RY34VUPQ30NV23QJVCZ1PR81N8BT2VNCDOONYSS33YKW0QBUGJ2HX7UAP1TQN49GEC6GUP0I434S6DQZEEY06MRF0QLIU79F2HWN2XG5Q9X6VXRTEA7PT3X78CY5YM3N2LX81Y10NQC5U1NZYZQD2NV347MTSFO8MECHODX6OX3LCKIQELAOMQ7DVD6I1MJUWG5DI8TC1OL4JMGJOCY7J4GAOY5SXNBLF39REZQYP7IW5G8943QQD6FICJWBSHO8Y7Z745UXJIWZ4WPB3TB4355UP4O0EU6WFSMPUNJK8GN8FJHCQTOKTCNZA6L77JMNUMIP70QM525H815U7YH3JPXJ4NDH1YAVKR9OYRKDKN64843DGKW7HDN1KOGG2I41G8K2AKRWTFR69HC3WHZEX0MQ7YNQF5RVIDFH503388FLJVM778DTR23754Y62EAX9OBY10YDWHRHRQQDR5NQX9A07T9ZLZ9AI59WFEUM2GQAH1ZA9ELZB3OW7LB961300QVUOYAJWWMMRFOFGX6QYTB4IBM3PACQCJSFTK4K3YRUS5R
# valid repository type options {1 = inMemoryStore, 2 = NativeStore, 3 = AllegroGraph, 4 = graphDB, 5 = blazegraph}
uri
:
mongodb://mongo.f2ds.svc.cluster.local:27017/fdp
repository
:
type
:
5
native
:
dir
:
/tmp/fdp-store/
agraph
:
url
:
http://localhost:10035/repositories/fdp
username
:
user
password
:
password
graphDb
:
url
:
http://localhost:7200
repository
:
test
blazegraph
:
url
:
http://localhost:8888/blazegraph
repository
:
url
:
http://blazegraph.f2ds.svc.cluster.local:8888/blazegraph
metadataProperties
:
publisherURI
:
https://www.eosc-pillar.eu/
...
...
@@ -47,3 +33,6 @@ threadPoolSize: 4
metadataMetrics
:
https://purl.org/fair-metrics/FM_F1A: https://www.ietf.org/rfc/rfc3986.txt
https://purl.org/fair-metrics/FM_A1.1: https://www.wikidata.org/wiki/Q8777
target/classes/META-INF/build-info.properties
View file @
6c0f57c4
#Properties
#Tue Sep 08 09:47:12 CEST 2020
build.time
=
2020-09-08T07
\:
47
\:
11.996Z
build.artifact
=
fairdatapoint
#Wed Nov 04 09:29:03 CET 2020
build.version
=
1.3.0
build.group
=
nl.dtls
build.name
=
FairDataPoint
build.version
=
1.3.0
build.artifact
=
fairdatapoint
build.time
=
2020-11-04T08
\:
29
\:
03.559465Z
target/classes/META-INF/spring-configuration-metadata.json
0 → 100644
View file @
6c0f57c4
{
"groups"
:
[],
"properties"
:
[
{
"name"
:
"instance.clientUrl"
,
"type"
:
"java.lang.String"
,
"description"
:
"Client URL."
},
{
"name"
:
"instance.persistentUrl"
,
"type"
:
"java.lang.String"
,
"description"
:
"Persistent URL."
},
{
"name"
:
"security.jwt.token.expiration"
,
"type"
:
"java.lang.Long"
,
"description"
:
"Number of days until a token expires."
},
{
"name"
:
"security.jwt.token.secret-key"
,
"type"
:
"java.lang.String"
,
"description"
:
"Secret string used for JWT signing and validation (we recommend to generate some randomly)."
}
],
"hints"
:
[]
}
\ No newline at end of file
target/classes/application-production.yml
View file @
6c0f57c4
# version width K8 DNS services
instance
:
clientUrl
:
http://fdp-client.default.svc.cluster.local
persistentUrl
:
http://10.6.10.9/
clientUrl
:
http://51.178.69.147
server
:
port
:
80
...
...
@@ -9,14 +8,14 @@ server:
spring
:
data
:
mongodb
:
uri
:
mongodb://mongo.
default
.svc.cluster.local:27017/fdp
uri
:
mongodb://mongo.
f2ds
.svc.cluster.local:27017/fdp
repository
:
type
:
5
blazegraph
:
url
:
http://blazegraph.
default
.svc.cluster.local:8888/blazegraph
url
:
http://blazegraph.
f2ds
.svc.cluster.local:8888/blazegraph
...
...
target/classes/application.yml
View file @
6c0f57c4
# version width K8 DNS services
instance
:
clientUrl
:
http://fdp-client.default.svc.cluster.local
clientUrl
:
http://51.178.69.147
server
:
port
:
80
spring
:
data
:
mongodb
:
uri
:
mongodb://mongo:27017/fdp
management
:
health
:
solr
:
enabled
:
false
info
:
defaults
:
enabled
:
false
security
:
jwt
:
token
:
secret-key
:
IBQADE2IGQAWYWPUR2RTLCE2GSUST8MNLYM6XJJ0442SO8LBQ0Y5NSSZPDMEEJ9DH5EXL02AZCZWGOWH5RY23BDT7WBBMVC607DTANIJ3VH8KD6JDOLW03G68Q5Z2Y430QV76RBCIM3TIFGP32Y33QR3LFXEGGII2UQOZFQFOZ2NZ9KLDHJLAAOU2PH82PVH7DTBNLTQD30HQG6OI09O9LT9BDKIYYB10TO2MDDS1MZ0C77O8OQDDLAXDK8LFWGMZSK4MAUJNLPTMVGX5CSVXAGNDBFNSZNGA37XSCP7JAYR8AQQDEHM5GOB3AIBOKDQ3BJ3GORFAZOHU3EJU2JBFY5JH8BM8QEUCQ6XZEE6SWO28HSNWVHV8UB3Z0M46BX7K0UM9HJJQ3I3R1KGTSRTR3U4XTTDHPKRBNGZ8HM4ZTJOOF26KFE21Q9C2LQD6OZRZ5REOYKGN2V47OLYPO2QB6982TPEE8HVBOJ7I9GE4MHG0BFMO9UKSZA5P17KR4TLBKXG51AB4DWQPK445FX7ZLBV6KSUUNDSCQI7PVI31MMET8168WGEN25WWUHSEB5KVLQH53BVJ0P7B0NHJOY31DH5F2ZUIAVFFE6MRPZAUHYRY5LQLFUFB1MF0MX6J61WEPC5MBLCD1JN9UP35HSHR8Z3YHTBP388DSGPX74C88S4A3BTK8PIIQ3TQKL819VL7LOHXJL1FODC1TGW0KGBV8XRPPV5K75KG5MJM7E3WMXDEY5G4PJYNLT5G67257X1RONPG518N76CBXUQBTYTBYH81PBHD0O09PY3R5X9IDDI4FBIAX4WANZSRLUQNJT4EI7W8AYHZ16P2O769O4GS2ECL3IDUPVYCFINAC2E1Q80P1PVZNLDFF9440E0Q27375NK5NLZQQCJXBB8J4QPFI78TW2MH9O5OVQ04506FWBUCLK3O6Q3XCXKBJRPLZBB6SVKXCOYELQQA0U5QBW4VNYNHY4TFZ8RDSNVULB5GV35432IAFKAQBL1KVA7LJBMAN06EFXW303MYYGKEH2URL02RHRDHROQHAH4TY76F1R9RKPVF620MYMBNF9LNC96U7PX2E5WCO7B778ZYT6RZKMPHP5FRG3LT0HSY540ZN91B1ACZAID1JTJKWOIGQSKPQEO3ORDNI2WQMPNTI7KJL6CP53VXFVM0M54F1IVK0V1M7QIUXVJ3VC6XNFDMV77I8DOL926SNS5Z952LGQFVPSS60X7MMPJ8PNNT0BX4B14CYT5E3832H8YOATAHD9PFD30ELYJV4S6RDZ0D6CJWM5KQGBCXHXAB98Z4DYWGAC5T7K5N17SWAT86VU3VNP8AJP2AGZVFBBEI3MCP7RW7Z1DR85YI6CMW7M8MUAWB66LWU6NAZ4PW4FSD443KX15FYYRZDPDNGKLVZY5680G0TCW76N40D1JU4GBLCWASIHEU110XZZ0OLYLHCJCQGELT7Y5B10VBRVWW48Q6AGJ0T85Y73RCCPBJSU73UAN51R0E65RF6OQGNOY6RDHCI06S8EO6AMZMK503M0ORDFSH8BE6NE9J2022ZSFEO0FM513SLKUSYPK4NG0FJIBCR3T0Y7CIOF6WDA5AA9JY615PQPRD38E0GDFM2A1XIU9Y5LR71F69VZPC5CXJZOXVB2T6WQNJDEN8KBGK1R55IOLBK6LYPVB1SOWM26K46OM39ZZX5H8D4OMAX9B6MHKQD0D4V8VNTQO5P0MRE39YUC231T87HCJDILC8IBS6LB2PC7F8C5TYLZ2Q8RKC015I4JX3SAOFZIPGGD0Q5HQYH1PVYIVU43QNK2N5O13NPMF6NT6BHK4GXR52IZLYWD9KR0UAZJ1YCL7COD2VF4AI1SMP0PZPODVQVGX7BFEVRBS9XKI1TAWLEGRSYD5XBLWH91YPFIUDVCOJT4RQJOHV9QRM32BJYMBTTJYN42NFKF6SRXWHXIKMMDEHXCUECAJW70A6UM0QEIC988M03FJ5RY34VUPQ30NV23QJVCZ1PR81N8BT2VNCDOONYSS33YKW0QBUGJ2HX7UAP1TQN49GEC6GUP0I434S6DQZEEY06MRF0QLIU79F2HWN2XG5Q9X6VXRTEA7PT3X78CY5YM3N2LX81Y10NQC5U1NZYZQD2NV347MTSFO8MECHODX6OX3LCKIQELAOMQ7DVD6I1MJUWG5DI8TC1OL4JMGJOCY7J4GAOY5SXNBLF39REZQYP7IW5G8943QQD6FICJWBSHO8Y7Z745UXJIWZ4WPB3TB4355UP4O0EU6WFSMPUNJK8GN8FJHCQTOKTCNZA6L77JMNUMIP70QM525H815U7YH3JPXJ4NDH1YAVKR9OYRKDKN64843DGKW7HDN1KOGG2I41G8K2AKRWTFR69HC3WHZEX0MQ7YNQF5RVIDFH503388FLJVM778DTR23754Y62EAX9OBY10YDWHRHRQQDR5NQX9A07T9ZLZ9AI59WFEUM2GQAH1ZA9ELZB3OW7LB961300QVUOYAJWWMMRFOFGX6QYTB4IBM3PACQCJSFTK4K3YRUS5R
# valid repository type options {1 = inMemoryStore, 2 = NativeStore, 3 = AllegroGraph, 4 = graphDB, 5 = blazegraph}
uri
:
mongodb://mongo.f2ds.svc.cluster.local:27017/fdp
repository
:
type
:
5
native
:
dir
:
/tmp/fdp-store/
agraph
:
url
:
http://localhost:10035/repositories/fdp
username
:
user
password
:
password
graphDb
:
url
:
http://localhost:7200
repository
:
test
blazegraph
:
url
:
http://localhost:8888/blazegraph
repository
:
url
:
http://blazegraph.f2ds.svc.cluster.local:8888/blazegraph
metadataProperties
:
publisherURI
:
https://www.eosc-pillar.eu/
...
...
@@ -47,3 +33,6 @@ threadPoolSize: 4
metadataMetrics
:
https://purl.org/fair-metrics/FM_F1A: https://www.ietf.org/rfc/rfc3986.txt
https://purl.org/fair-metrics/FM_A1.1: https://www.wikidata.org/wiki/Q8777
target/classes/git.properties
View file @
6c0f57c4
#Generated by Git-Commit-Id-Plugin
#
Tue Sep
0
8
09:
47:1
1 CE
S
T 2020
#
Wed Nov
0
4
09:
29:0
1 CET 2020
git.branch
=
master
git.build.host
=
pc295dev.pallas.cines.fr
git.build.time
=
2020-
09
-0
8
T09
\:
47
\:
1
1+0
2
00
git.build.host
=
cazenave-N751JX
git.build.time
=
2020-
11
-0
4
T09
\:
29
\:
0
1+0
1
00
git.build.user.email
=
cazenave@cines.fr
git.build.user.name
=
cazenave
git.build.version
=
1.3.0
git.closest.tag.commit.count
=
git.closest.tag.name
=
git.commit.id
=
80e17bae00f5df8496676caa87d272f7a093fef9
git.commit.id.abbrev
=
80e17ba
git.commit.id.describe
=
80e17ba
-dirty
git.commit.id.describe-short
=
80e17ba
-dirty
git.commit.message.full
=
change client url to loadbalacer kubernetes
url
git.commit.message.short
=
change client url to loadbalacer kubernetes
url
git.commit.time
=
2020-0
8-20
T1
6
\:
01
\:
10
+0200
git.commit.id
=
b0f4dcbc532a2cdefef12bf32220a0ef75ce7a98
git.commit.id.abbrev
=
b0f4dcb
git.commit.id.describe
=
b0f4dcb
-dirty
git.commit.id.describe-short
=
b0f4dcb
-dirty
git.commit.message.full
=
persistent
url
git.commit.message.short
=
persistent
url
git.commit.time
=
2020-0
9-08
T1
3
\:
20
\:
49
+0200
git.commit.user.email
=
cazenave@cines.fr
git.commit.user.name
=
cazenave
git.dirty
=
true
...
...
target/classes/nl/dtls/fairdatapoint/Application.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/Profiles.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/config/ConfigController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/membership/MembershipController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/metadata/GenericController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/shape/ShapeController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/token/TokenController.class
0 → 100644
View file @
6c0f57c4
File added
target/classes/nl/dtls/fairdatapoint/api/controller/user/UserController.class
0 → 100644
View file @
6c0f57c4
File added
Prev
1
2
3
4
5
…
17
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment