From bbfef4f399b713e9b41507546bbe4a84351bcc68 Mon Sep 17 00:00:00 2001 From: Jannik Fried Date: Fri, 22 Aug 2025 10:14:25 +0200 Subject: [PATCH 1/5] Update aas-env.properties for QL Example --- examples/BaSyxQueryLanguage/basyx/aas-env.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/BaSyxQueryLanguage/basyx/aas-env.properties b/examples/BaSyxQueryLanguage/basyx/aas-env.properties index 1ac3a6855..64baa0bc9 100644 --- a/examples/BaSyxQueryLanguage/basyx/aas-env.properties +++ b/examples/BaSyxQueryLanguage/basyx/aas-env.properties @@ -14,12 +14,12 @@ spring.data.mongodb.authentication-database=admin spring.data.mongodb.username=mongoAdmin spring.data.mongodb.password=mongoPassword # Elasticsearch configuration -spring.elasticsearch.uris=http://elasticsearch:9200 +spring.elasticsearch.uris=http://es-local-dev:9200 spring.elasticsearch.username=elastic spring.elasticsearch.password=vtzJFt1b basyx.aasrepository.feature.search.enabled=true -basyx.aasrepository.feature.search.indexname=aas-index +basyx.aasrepository.feature.search.indexname=aas-index-test +basyx.cdrepository.feature.search.enabled=true +basyx.cdrepository.feature.search.indexname=cd-index-test basyx.submodelrepository.feature.search.enabled=true -basyx.submodelrepository.feature.search.indexname=sm-index -basyx.conceptdescriptionrepository.feature.search.enabled=true -basyx.conceptdescriptionrepository.feature.search.indexname=cd-index +basyx.submodelrepository.feature.search.indexname=sm-index-test From e57739c4738c2cc73fb955d08da390247aca31c3 Mon Sep 17 00:00:00 2001 From: Jannik Fried Date: Fri, 22 Aug 2025 10:58:04 +0200 Subject: [PATCH 2/5] Update aas-env.properties --- .../BaSyxQueryLanguage/basyx/aas-env.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/BaSyxQueryLanguage/basyx/aas-env.properties b/examples/BaSyxQueryLanguage/basyx/aas-env.properties index 64baa0bc9..dbddc9591 100644 --- a/examples/BaSyxQueryLanguage/basyx/aas-env.properties +++ b/examples/BaSyxQueryLanguage/basyx/aas-env.properties @@ -14,12 +14,12 @@ spring.data.mongodb.authentication-database=admin spring.data.mongodb.username=mongoAdmin spring.data.mongodb.password=mongoPassword # Elasticsearch configuration -spring.elasticsearch.uris=http://es-local-dev:9200 -spring.elasticsearch.username=elastic -spring.elasticsearch.password=vtzJFt1b basyx.aasrepository.feature.search.enabled=true -basyx.aasrepository.feature.search.indexname=aas-index-test -basyx.cdrepository.feature.search.enabled=true -basyx.cdrepository.feature.search.indexname=cd-index-test +basyx.aasrepository.feature.search.indexname=aas-index basyx.submodelrepository.feature.search.enabled=true -basyx.submodelrepository.feature.search.indexname=sm-index-test +basyx.submodelrepository.feature.search.indexname=sm-index +basyx.cdrepository.feature.search.enabled=true +basyx.cdrepository.feature.search.indexname=cd-index +spring.elasticsearch.uris=http://elasticsearch:9200 +spring.elasticsearch.username=elastic +spring.elasticsearch.password=vtzJFt1b From 97dc90c2fa17ccb71785f820b6dfcb49581b6e72 Mon Sep 17 00:00:00 2001 From: Jannik Fried Date: Fri, 22 Aug 2025 10:58:30 +0200 Subject: [PATCH 3/5] Update aas-env.properties --- examples/BaSyxQueryLanguage/basyx/aas-env.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/BaSyxQueryLanguage/basyx/aas-env.properties b/examples/BaSyxQueryLanguage/basyx/aas-env.properties index dbddc9591..abd6c7fac 100644 --- a/examples/BaSyxQueryLanguage/basyx/aas-env.properties +++ b/examples/BaSyxQueryLanguage/basyx/aas-env.properties @@ -14,12 +14,12 @@ spring.data.mongodb.authentication-database=admin spring.data.mongodb.username=mongoAdmin spring.data.mongodb.password=mongoPassword # Elasticsearch configuration +spring.elasticsearch.uris=http://elasticsearch:9200 +spring.elasticsearch.username=elastic +spring.elasticsearch.password=vtzJFt1b basyx.aasrepository.feature.search.enabled=true basyx.aasrepository.feature.search.indexname=aas-index basyx.submodelrepository.feature.search.enabled=true basyx.submodelrepository.feature.search.indexname=sm-index basyx.cdrepository.feature.search.enabled=true basyx.cdrepository.feature.search.indexname=cd-index -spring.elasticsearch.uris=http://elasticsearch:9200 -spring.elasticsearch.username=elastic -spring.elasticsearch.password=vtzJFt1b From 846f17637c0541d27aa2385210f10c6fd1a58588 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Fri, 22 Aug 2025 11:03:38 +0200 Subject: [PATCH 4/5] Adapts docker-compose.yml --- examples/BaSyxQueryLanguage/docker-compose.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/BaSyxQueryLanguage/docker-compose.yml b/examples/BaSyxQueryLanguage/docker-compose.yml index 16afb96cb..7de4fef15 100644 --- a/examples/BaSyxQueryLanguage/docker-compose.yml +++ b/examples/BaSyxQueryLanguage/docker-compose.yml @@ -19,6 +19,8 @@ services: condition: service_healthy mongo: condition: service_healthy + elasticsearch: + condition: service_healthy aas-registry: image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-SNAPSHOT container_name: aas-registry @@ -32,6 +34,8 @@ services: depends_on: mongo: condition: service_healthy + elasticsearch: + condition: service_healthy sm-registry: image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-SNAPSHOT container_name: sm-registry @@ -45,6 +49,8 @@ services: depends_on: mongo: condition: service_healthy + elasticsearch: + condition: service_healthy aas-discovery: image: eclipsebasyx/aas-discovery:2.0.0-SNAPSHOT container_name: aas-discovery @@ -85,6 +91,6 @@ services: CD_REPO_PATH: http://localhost:8081/concept-descriptions AAS_DISCOVERY_PATH: http://localhost:8084/lookup/shells restart: always - # depends_on: + # depends_on: # aas-env: # condition: service_healthy From 4628eea33a9e4191e90419bfb139e2facf2ef06c Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Fri, 22 Aug 2025 11:09:44 +0200 Subject: [PATCH 5/5] Adapts docker-compose.yml --- examples/BaSyxQueryLanguage/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/BaSyxQueryLanguage/docker-compose.yml b/examples/BaSyxQueryLanguage/docker-compose.yml index 7de4fef15..dfaaf6933 100644 --- a/examples/BaSyxQueryLanguage/docker-compose.yml +++ b/examples/BaSyxQueryLanguage/docker-compose.yml @@ -91,6 +91,6 @@ services: CD_REPO_PATH: http://localhost:8081/concept-descriptions AAS_DISCOVERY_PATH: http://localhost:8084/lookup/shells restart: always - # depends_on: - # aas-env: - # condition: service_healthy + depends_on: + aas-env: + condition: service_healthy