Skip to content

Commit 5387136

Browse files
aaronziaaronzi
committed
Removes remaining spring 3 stuff
1 parent 0ef409d commit 5387136

121 files changed

Lines changed: 506 additions & 486 deletions

File tree

Some content is hidden

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

‎basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/main/resources/application-MongoDB.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ basyx.aasdiscoveryservice.mongodb.collectionName=${AUTHENTICATION_DATABASE:db-na
33
registry.type=MongoDB
44
registry.discovery.enabled=true
55
spring.config.activate.on-profile=MongoDB
6-
spring.data.mongodb.authentication-database=${AUTHENTICATION_DATABASE:db-name}
7-
spring.data.mongodb.database=${AUTHENTICATION_DATABASE:db-name}
8-
spring.data.mongodb.host=${DATABASE_HOST:localhost}
9-
spring.data.mongodb.port=${DATABASE_PORT:27017}
10-
spring.data.mongodb.username=${DATABASE_USERNAME:db-username}
11-
spring.data.mongodb.password=${DATABASE_PASSWORD:db-password}
6+
spring.mongodb.authentication-database=${AUTHENTICATION_DATABASE:db-name}
7+
spring.mongodb.database=${AUTHENTICATION_DATABASE:db-name}
8+
spring.mongodb.host=${DATABASE_HOST:localhost}
9+
spring.mongodb.port=${DATABASE_PORT:27017}
10+
spring.mongodb.username=${DATABASE_USERNAME:db-username}
11+
spring.mongodb.password=${DATABASE_PASSWORD:db-password}

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-backend-mongodb/src/test/resources/application.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
basyx.backend = MongoDB
22
basyx.aasdiscoveryservice.mongodb.collectionName= discoveryServiceTestCollection
33

4-
spring.data.mongodb.host=127.0.0.1
5-
spring.data.mongodb.port=27017
6-
spring.data.mongodb.database=aas-env
7-
spring.data.mongodb.authentication-database=admin
8-
spring.data.mongodb.username=mongoAdmin
9-
spring.data.mongodb.password=mongoPassword
4+
spring.mongodb.host=127.0.0.1
5+
spring.mongodb.port=27017
6+
spring.mongodb.database=aas-env
7+
spring.mongodb.authentication-database=admin
8+
spring.mongodb.username=mongoAdmin
9+
spring.mongodb.password=mongoPassword

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-feature-authorization/src/test/resources/application-specific.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ basyx.aasdiscoveryservice.name=aas-discovery-service
55
basyx.backend = InMemory
66

77
#basyx.backend = MongoDB
8-
#spring.data.mongodb.host=mongo
9-
# or spring.data.mongodb.host=127.0.0.1
10-
#spring.data.mongodb.port=27017
11-
#spring.data.mongodb.database=aasenvironments
12-
#spring.data.mongodb.authentication-database=admin
13-
#spring.data.mongodb.username=mongoAdmin
14-
#spring.data.mongodb.password=mongoPassword
8+
#spring.mongodb.host=mongo
9+
# or spring.mongodb.host=127.0.0.1
10+
#spring.mongodb.port=27017
11+
#spring.mongodb.database=aasenvironments
12+
#spring.mongodb.authentication-database=admin
13+
#spring.mongodb.username=mongoAdmin
14+
#spring.mongodb.password=mongoPassword
1515

1616
# basyx.aasrepository.feature.mqtt.enabled = true
1717
# mqtt.clientId=TestClient

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-feature-authorization/src/test/resources/application-wildcard.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ basyx.aasdiscoveryservice.name=aas-discovery-service
55
basyx.backend = InMemory
66

77
#basyx.backend = MongoDB
8-
#spring.data.mongodb.host=mongo
9-
# or spring.data.mongodb.host=127.0.0.1
10-
#spring.data.mongodb.port=27017
11-
#spring.data.mongodb.database=aasenvironments
12-
#spring.data.mongodb.authentication-database=admin
13-
#spring.data.mongodb.username=mongoAdmin
14-
#spring.data.mongodb.password=mongoPassword
8+
#spring.mongodb.host=mongo
9+
# or spring.mongodb.host=127.0.0.1
10+
#spring.mongodb.port=27017
11+
#spring.mongodb.database=aasenvironments
12+
#spring.mongodb.authentication-database=admin
13+
#spring.mongodb.username=mongoAdmin
14+
#spring.mongodb.password=mongoPassword
1515

1616
# basyx.aasrepository.feature.mqtt.enabled = true
1717
# mqtt.clientId=TestClient

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/src/main/resources/application.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ basyx.backend=InMemory
77
#spring.h2.console.path=/h2-console
88

99
#basyx.backend=MongoDB
10-
#spring.data.mongodb.host=127.0.0.1
11-
##or spring.data.mongodb.host=127.0.0.1
12-
#spring.data.mongodb.port=27017
13-
#spring.data.mongodb.database=concepts
14-
#spring.data.mongodb.authentication-database=admin
15-
#spring.data.mongodb.username=mongoAdmin
16-
#spring.data.mongodb.password=mongoPassword
10+
#spring.mongodb.host=127.0.0.1
11+
##or spring.mongodb.host=127.0.0.1
12+
#spring.mongodb.port=27017
13+
#spring.mongodb.database=concepts
14+
#spring.mongodb.authentication-database=admin
15+
#spring.mongodb.username=mongoAdmin
16+
#spring.mongodb.password=mongoPassword
1717
#basyx.aasdiscoveryservice.mongodb.collectionName=aasdiscovery-service
1818

1919
#alternative
20-
#spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/?authMechanism=DEFAULT
20+
#spring.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/?authMechanism=DEFAULT
2121

2222
# basyx.cors.allowed-origins=http://localhost:3000, http://localhost:4000
2323

‎basyx.aasenvironment/basyx.aasenvironment-client/src/test/resources/application-authorization.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ spring.application.name=AAS Environment
44
basyx.backend = InMemory
55

66
#basyx.backend = MongoDB
7-
#spring.data.mongodb.host=mongo
8-
# or spring.data.mongodb.host=127.0.0.1
9-
#spring.data.mongodb.port=27017
10-
#spring.data.mongodb.database=aasenvironments
11-
#spring.data.mongodb.authentication-database=admin
12-
#spring.data.mongodb.username=mongoAdmin
13-
#spring.data.mongodb.password=mongoPassword
7+
#spring.mongodb.host=mongo
8+
# or spring.mongodb.host=127.0.0.1
9+
#spring.mongodb.port=27017
10+
#spring.mongodb.database=aasenvironments
11+
#spring.mongodb.authentication-database=admin
12+
#spring.mongodb.username=mongoAdmin
13+
#spring.mongodb.password=mongoPassword
1414

1515
# basyx.aasrepository.feature.mqtt.enabled = true
1616
# mqtt.clientId=TestClient

‎basyx.aasenvironment/basyx.aasenvironment-client/src/test/resources/application-mongodb.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
basyx.backend = MongoDB
22

3-
spring.data.mongodb.host=127.0.0.1
4-
spring.data.mongodb.port=27017
5-
spring.data.mongodb.database=aas-env
6-
spring.data.mongodb.authentication-database=admin
7-
spring.data.mongodb.username=mongoAdmin
8-
spring.data.mongodb.password=mongoPassword
3+
spring.mongodb.host=127.0.0.1
4+
spring.mongodb.port=27017
5+
spring.mongodb.database=aas-env
6+
spring.mongodb.authentication-database=admin
7+
spring.mongodb.username=mongoAdmin
8+
spring.mongodb.password=mongoPassword

‎basyx.aasenvironment/basyx.aasenvironment-client/src/test/resources/application.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ spring.application.name=AAS Environment
44
basyx.backend = InMemory
55

66
#basyx.backend = MongoDB
7-
#spring.data.mongodb.host=mongo
8-
# or spring.data.mongodb.host=127.0.0.1
9-
#spring.data.mongodb.port=27017
10-
#spring.data.mongodb.database=aasenvironments
11-
#spring.data.mongodb.authentication-database=admin
12-
#spring.data.mongodb.username=mongoAdmin
13-
#spring.data.mongodb.password=mongoPassword
7+
#spring.mongodb.host=mongo
8+
# or spring.mongodb.host=127.0.0.1
9+
#spring.mongodb.port=27017
10+
#spring.mongodb.database=aasenvironments
11+
#spring.mongodb.authentication-database=admin
12+
#spring.mongodb.username=mongoAdmin
13+
#spring.mongodb.password=mongoPassword
1414

1515
# basyx.aasrepository.feature.mqtt.enabled = true
1616
# mqtt.clientId=TestClient

‎basyx.aasenvironment/basyx.aasenvironment-feature-authorization/src/test/resources/application.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ spring.application.name=AAS Environment
44
basyx.backend = InMemory
55

66
#basyx.backend = MongoDB
7-
#spring.data.mongodb.host=mongo
8-
# or spring.data.mongodb.host=127.0.0.1
9-
#spring.data.mongodb.port=27017
10-
#spring.data.mongodb.database=aasenvironments
11-
#spring.data.mongodb.authentication-database=admin
12-
#spring.data.mongodb.username=mongoAdmin
13-
#spring.data.mongodb.password=mongoPassword
7+
#spring.mongodb.host=mongo
8+
# or spring.mongodb.host=127.0.0.1
9+
#spring.mongodb.port=27017
10+
#spring.mongodb.database=aasenvironments
11+
#spring.mongodb.authentication-database=admin
12+
#spring.mongodb.username=mongoAdmin
13+
#spring.mongodb.password=mongoPassword
1414

1515
# basyx.aasrepository.feature.mqtt.enabled = true
1616
# mqtt.clientId=TestClient

‎basyx.aasenvironment/basyx.aasenvironment.component/src/main/resources/application.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ spring.application.name=AAS Environment
44
basyx.backend = InMemory
55

66
#basyx.backend = MongoDB
7-
# spring.data.mongodb.host=mongo
8-
# or spring.data.mongodb.host=127.0.0.1
9-
# spring.data.mongodb.port=27017
10-
# spring.data.mongodb.database=aasenvironments
11-
# spring.data.mongodb.authentication-database=admin
12-
# spring.data.mongodb.username=mongoAdmin
13-
# spring.data.mongodb.password=mongoPassword
7+
# spring.mongodb.host=mongo
8+
# or spring.mongodb.host=127.0.0.1
9+
# spring.mongodb.port=27017
10+
# spring.mongodb.database=aasenvironments
11+
# spring.mongodb.authentication-database=admin
12+
# spring.mongodb.username=mongoAdmin
13+
# spring.mongodb.password=mongoPassword
1414

1515
# basyx.aasrepository.feature.mqtt.enabled = true
1616
# mqtt.clientId=TestClient

0 commit comments

Comments
 (0)