Merge pull request #1521 from OSGP/feature/FDP-2849-renaming-protocol…

…-adapter-properties-cherry Feature FDP-2849: renaming protocol adapter properties
OSGP · Feb 6, 2025 · ff516fb · ff516fb
2 parents 38811a7 + cae4c91
commit ff516fb
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 20 deletions.
diff --git a/integration-tests/cucumber-tests-platform-common/Dockerfile b/integration-tests/cucumber-tests-platform-common/Dockerfile
@@ -1,7 +1,6 @@
 FROM eclipse-temurin:17
 WORKDIR /
 COPY cucumber-tests-platform-common/target/cucumber-*-test-jar-with-dependencies.jar /
-COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\
@@ -10,4 +9,4 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
      -Dtimeout=30\
      -DskipITCoverage=false\
      -DrunHeadless=true\
-     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output
+     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-common
diff --git a/integration-tests/cucumber-tests-platform-publiclighting/Dockerfile b/integration-tests/cucumber-tests-platform-publiclighting/Dockerfile
@@ -1,7 +1,6 @@
 FROM eclipse-temurin:17
 WORKDIR /
 COPY cucumber-tests-platform-publiclighting/target/cucumber-*-test-jar-with-dependencies.jar /
-COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\
@@ -10,4 +9,4 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
      -Dtimeout=30\
      -DskipITCoverage=false\
      -DrunHeadless=true\
-     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output
+     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-publiclighting
diff --git a/integration-tests/cucumber-tests-platform-smartmetering/Dockerfile b/integration-tests/cucumber-tests-platform-smartmetering/Dockerfile
@@ -1,7 +1,6 @@
 FROM eclipse-temurin:17
 WORKDIR /
 COPY cucumber-tests-platform-smartmetering/target/cucumber-*-test-jar-with-dependencies.jar /
-COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\
@@ -10,4 +9,4 @@ CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-co
      -Dtimeout=30\
      -DskipITCoverage=false\
      -DrunHeadless=true\
-     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output
+     -jar cucumber-*-test-jar-with-dependencies.jar -report /target/output/osgp-cucumber-tests-platform-smartmetering
diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/context.xml b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/context.xml
@@ -35,10 +35,10 @@
 
   <!-- App config files -->
   <Environment name="osgp/AdapterProtocolIec60870/config"
-    value="/etc/osp/osgp-adapter-protocol-iec60870.properties" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-iec60870.properties" type="java.lang.String"
     override="true" />
   <Environment name="osgp/AdapterProtocolIec60870/log-config"
-    value="/etc/osp/osgp-adapter-protocol-iec60870-logback.xml" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-iec60870-logback.xml" type="java.lang.String"
     override="true" />
 
 </Context>
diff --git a/...pensmartgridplatform/adapter/protocol/iec60870/application/config/ApplicationContext.java b/...pensmartgridplatform/adapter/protocol/iec60870/application/config/ApplicationContext.java
@@ -29,7 +29,7 @@
     })
 @EnableTransactionManagement()
 @Import({Iec60870MessagingConfig.class, Iec60870Config.class, MetricsConfig.class})
-@PropertySource("classpath:osgp-adapter-protocol-iec60870.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec60870.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec60870/config}",

diff --git a/...rg/opensmartgridplatform/adapter/protocol/iec60870/application/config/Iec60870Config.java b/...rg/opensmartgridplatform/adapter/protocol/iec60870/application/config/Iec60870Config.java
@@ -15,7 +15,7 @@
 
 @Configuration
 @EnableTransactionManagement()
-@PropertySource("classpath:osgp-adapter-protocol-iec60870.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec60870.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec60870/config}",

diff --git a/...artgridplatform/adapter/protocol/iec60870/application/config/Iec60870MessagingConfig.java b/...artgridplatform/adapter/protocol/iec60870/application/config/Iec60870MessagingConfig.java
@@ -16,7 +16,7 @@
 
 /** An application context Java configuration class. */
 @Configuration
-@PropertySource("classpath:osgp-adapter-protocol-iec60870.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec60870.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec60870/config}",

diff --git a/...osgp-adapter-protocol-iec60870.properties → ...osgp-protocol-adapter-iec60870.properties b/...osgp-adapter-protocol-iec60870.properties → ...osgp-protocol-adapter-iec60870.properties
diff --git a/...pter-protocol-iec60870.properties.license → ...tocol-adapter-iec60870.properties.license b/...pter-protocol-iec60870.properties.license → ...tocol-adapter-iec60870.properties.license
diff --git a/...ocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/main/webapp/META-INF/context.xml b/...ocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/main/webapp/META-INF/context.xml
@@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0
   <Environment name="osgp/Global/config" value="/etc/osp/global.properties"
     type="java.lang.String" override="false" />
   <Environment name="osgp/AdapterProtocolIec60870/config"
-    value="/etc/osp/osgp-adapter-protocol-iec60870.properties" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-iec60870.properties" type="java.lang.String"
     override="true" />
   <Environment name="osgp/AdapterProtocolIec60870/log-config"
     value="/etc/osp/osgp-adapter-protocol-iec60870-logback.xml" type="java.lang.String"

diff --git a/...pensmartgridplatform/adapter/protocol/iec61850/application/config/ApplicationContext.java b/...pensmartgridplatform/adapter/protocol/iec61850/application/config/ApplicationContext.java
@@ -30,7 +30,7 @@
   Iec61850Config.class,
   MetricsConfig.class
 })
-@PropertySource("classpath:osgp-adapter-protocol-iec61850.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec61850.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec61850/config}",

diff --git a/...rg/opensmartgridplatform/adapter/protocol/iec61850/application/config/Iec61850Config.java b/...rg/opensmartgridplatform/adapter/protocol/iec61850/application/config/Iec61850Config.java
@@ -30,7 +30,7 @@
 
 @Configuration
 @EnableTransactionManagement()
-@PropertySource("classpath:osgp-adapter-protocol-iec61850.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec61850.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec61850/config}",

diff --git a/...g/opensmartgridplatform/adapter/protocol/iec61850/application/config/MessagingConfig.java b/...g/opensmartgridplatform/adapter/protocol/iec61850/application/config/MessagingConfig.java
@@ -20,7 +20,7 @@
 /** An application context Java configuration class. */
 @Configuration
 @EnableTransactionManagement()
-@PropertySource("classpath:osgp-adapter-protocol-iec61850.properties")
+@PropertySource("classpath:osgp-protocol-adapter-iec61850.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolIec61850/config}",

diff --git a/...osgp-adapter-protocol-iec61850.properties → ...osgp-protocol-adapter-iec61850.properties b/...osgp-adapter-protocol-iec61850.properties → ...osgp-protocol-adapter-iec61850.properties
diff --git a/...pter-protocol-iec61850.properties.license → ...tocol-adapter-iec61850.properties.license b/...pter-protocol-iec61850.properties.license → ...tocol-adapter-iec61850.properties.license
diff --git a/...ocol-adapter-iec61850/osgp-protocol-adapter-iec61850/src/main/webapp/META-INF/context.xml b/...ocol-adapter-iec61850/osgp-protocol-adapter-iec61850/src/main/webapp/META-INF/context.xml
@@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0
   <Environment name="osgp/Global/config" value="/etc/osp/global.properties"
     type="java.lang.String" override="false" />
   <Environment name="osgp/AdapterProtocolIec61850/config"
-    value="/etc/osp/osgp-adapter-protocol-iec61850.properties" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-iec61850.properties" type="java.lang.String"
     override="true" />
   <Environment name="osgp/AdapterProtocolIec61850/log-config"
     value="/etc/osp/osgp-adapter-protocol-iec61850-logback.xml" type="java.lang.String"

diff --git a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/context.xml b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/context.xml
@@ -38,10 +38,10 @@
     type="java.lang.String" override="true" />
 
   <Environment name="osgp/AdapterProtocolOslpElster/config"
-    value="/etc/osp/osgp-adapter-protocol-oslp-elster.properties" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-oslp-elster.properties" type="java.lang.String"
     override="true" />
   <Environment name="osgp/AdapterProtocolOslpElster/log-config"
-    value="/etc/osp/osgp-adapter-protocol-oslp-elster-logback.xml" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-oslp-elster-logback.xml" type="java.lang.String"
     override="true" />
 
 </Context>
diff --git a/...smartgridplatform/adapter/protocol/oslp/elster/application/config/ApplicationContext.java b/...smartgridplatform/adapter/protocol/oslp/elster/application/config/ApplicationContext.java
@@ -32,7 +32,7 @@
     })
 @Import({MetricsConfig.class})
 @EnableTransactionManagement()
-@PropertySource("classpath:osgp-adapter-protocol-oslp-elster.properties")
+@PropertySource("classpath:osgp-protocol-adapter-oslp-elster.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(
     value = "file:${osgp/AdapterProtocolOslpElster/config}",

diff --git a/...p-adapter-protocol-oslp-elster.properties → ...p-protocol-adapter-oslp-elster.properties b/...p-adapter-protocol-oslp-elster.properties → ...p-protocol-adapter-oslp-elster.properties
diff --git a/...r-protocol-oslp-elster.properties.license → ...ol-adapter-oslp-elster.properties.license b/...r-protocol-oslp-elster.properties.license → ...ol-adapter-oslp-elster.properties.license
diff --git a/...tocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/src/main/webapp/META-INF/context.xml b/...tocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/src/main/webapp/META-INF/context.xml
@@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0
     type="java.lang.String" override="true" />
 
   <Environment name="osgp/AdapterProtocolOslpElster/config"
-    value="/etc/osp/osgp-adapter-protocol-oslp-elster.properties" type="java.lang.String"
+    value="/etc/osp/osgp-protocol-adapter-oslp-elster.properties" type="java.lang.String"
     override="true" />
   <Environment name="osgp/AdapterProtocolOslpElster/log-config"
     value="/etc/osp/osgp-adapter-protocol-oslp-elster-logback.xml" type="java.lang.String"