Committed latest examples

Fraunhofer-AISEC · Nov 27, 2023 · 3ff5fe1 · 3ff5fe1
1 parent a2a4943
commit 3ff5fe1
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 26 deletions.
diff --git a/examples/src/main/resources/etc/application.yml b/examples/src/main/resources/etc/application.yml
@@ -1,6 +1,18 @@
-#logging:
-#  level:
+logging:
+  level:
 #    root: debug
+    de.fhg.aisec.ids.idscp2: trace
+    de.fhg.aisec.ids.camel: trace
 
 ids-multipart:
-  daps-bean-name: rootDaps
+  daps-bean-name: rootDaps
+
+connector:
+  daps-url: https://daps-dev.aisec.fraunhofer.de/v4
+
+# For example-getting-started
+key-stores:
+  server-resource: etc/server-keystore.p12
+  client-resource: etc/client-keystore.p12
+  truststore-resource: etc/truststore.p12
+  password: password
diff --git a/examples/src/main/resources/example-getting-started/example-idscp2-localloop.xml b/examples/src/main/resources/example-getting-started/example-idscp2-localloop.xml
@@ -7,19 +7,22 @@
           http://camel.apache.org/schema/spring
           http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-    <bean class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer" id="springProperties">
-        <property name="location" value="etc/tls.properties"/>
-    </bean>
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 
+    <bean class="org.apache.camel.support.jsse.TrustManagersParameters" id="routeTrustManagers">
+        <property name="keyStore">
+            <camel:keyStoreParameters password="${key-stores.password}" resource="${key-stores.truststore-resource}"/>
+        </property>
+    </bean>
     <!-- Define TLS configuration for data consumer -->
     <bean class="org.apache.camel.support.jsse.SSLContextParameters" id="serverSslContext">
         <property name="keyManagers">
             <bean class="org.apache.camel.support.jsse.KeyManagersParameters">
                 <property name="keyStore">
-                    <camel:keyStoreParameters password="${server.keyStorePassword}"
-                                              resource="${server.keyStoreResource}"/>
+                    <camel:keyStoreParameters password="${key-stores.password}"
+                                              resource="${key-stores.server-resource}"/>
                 </property>
-                <property name="keyPassword" value="${server.keyStorePassword}"/>
+                <property name="keyPassword" value="${key-stores.password}"/>
             </bean>
         </property>
         <property name="trustManagers" ref="routeTrustManagers"/>
@@ -29,19 +32,14 @@
         <property name="keyManagers">
             <bean class="org.apache.camel.support.jsse.KeyManagersParameters">
                 <property name="keyStore">
-                    <camel:keyStoreParameters password="${client.keyStorePassword}"
-                                              resource="${client.keyStoreResource}"/>
+                    <camel:keyStoreParameters password="${key-stores.password}"
+                                              resource="${key-stores.client-resource}"/>
                 </property>
-                <property name="keyPassword" value="${client.keyStorePassword}"/>
+                <property name="keyPassword" value="${key-stores.password}"/>
             </bean>
         </property>
         <property name="trustManagers" ref="routeTrustManagers"/>
     </bean>
-    <bean class="org.apache.camel.support.jsse.TrustManagersParameters" id="routeTrustManagers">
-        <property name="keyStore">
-            <camel:keyStoreParameters password="${trustStorePassword}" resource="${trustStoreResource}"/>
-        </property>
-    </bean>
 
     <!-- Routes -->
     <camelContext xmlns="http://camel.apache.org/schema/spring">
@@ -52,7 +50,7 @@
                 <simple>Message at $simple{date:now:yyyy-MM-dd HH:mm:ss}</simple>
             </setBody>
             <log message="Sending message body &quot;${body}&quot;..."/>
-            <to uri="idscp2client://tc-core-server:9292/?sslContextParameters=#clientSslContext" />
+            <to uri="idscp2client://provider-core:9292/?sslContextParameters=#clientSslContext" />
         </route>
 
         <route id="receiveTime">

diff --git a/examples/src/main/resources/example-ids-multipart-uc/example-multipart-uc-client.xml b/examples/src/main/resources/example-ids-multipart-uc/example-multipart-uc-client.xml
@@ -5,6 +5,8 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="rootClientSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password" />
@@ -15,7 +17,7 @@
     </camel:sslContextParameters>
 
     <bean id="rootDaps" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4" />
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="rootClientSslContext" />
         <property name="transportCertificatesParameters" ref="rootClientSslContext" />
     </bean>

diff --git a/examples/src/main/resources/example-ids-multipart-uc/example-multipart-uc-server.xml b/examples/src/main/resources/example-ids-multipart-uc/example-multipart-uc-server.xml
@@ -5,6 +5,8 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="rootServerSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password"/>
@@ -16,7 +18,7 @@
     </camel:sslContextParameters>
 
     <bean name="rootDaps" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="rootServerSslContext"/>
         <property name="transportCertificatesParameters" ref="rootServerSslContext"/>
     </bean>

diff --git a/examples/src/main/resources/example-ids-multipart/example-multipart-client.xml b/examples/src/main/resources/example-ids-multipart/example-multipart-client.xml
@@ -7,6 +7,8 @@
           http://camel.apache.org/schema/spring
           http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="rootClientSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password"/>
@@ -17,7 +19,7 @@
     </camel:sslContextParameters>
 
     <bean id="rootDaps" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="rootClientSslContext"/>
         <property name="transportCertificatesParameters" ref="rootClientSslContext"/>
     </bean>

diff --git a/examples/src/main/resources/example-ids-multipart/example-multipart-server.xml b/examples/src/main/resources/example-ids-multipart/example-multipart-server.xml
@@ -5,6 +5,8 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="rootServerSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password"/>
@@ -16,7 +18,7 @@
     </camel:sslContextParameters>
 
     <bean name="rootDaps" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="rootServerSslContext"/>
         <property name="transportCertificatesParameters" ref="rootServerSslContext"/>
     </bean>

diff --git a/examples/src/main/resources/example-idscp2/compose-broadcast.yaml b/examples/src/main/resources/example-idscp2/compose-broadcast.yaml
@@ -10,7 +10,7 @@ services:
       - ../etc/application.yml:/root/etc/application.yml
       - ../deploy/allow-all-flows.pl:/root/deploy/allow-all-flows.pl
       - ../etc/settings.mapdb:/root/etc/settings.mapdb
-      - ../etc/consumer-keystore.p12:/root/etc/keystore.p12
+      - ../etc/server-keystore.p12:/root/etc/keystore.p12
       - ../etc/truststore.p12:/root/etc/truststore.p12
       - ./example-idscp2-server-broadcast.xml:/root/deploy/example-idscp2-server-broadcast.xml
     ports:
@@ -29,7 +29,7 @@ services:
       - ../etc/application.yml:/root/etc/application.yml
       - ../deploy/allow-all-flows.pl:/root/deploy/allow-all-flows.pl
       - ../etc/settings2.mapdb:/root/etc/settings.mapdb
-      - ../etc/provider-keystore.p12:/root/etc/keystore.p12
+      - ../etc/client-keystore.p12:/root/etc/keystore.p12
       - ../etc/truststore.p12:/root/etc/truststore.p12
       - ./example-idscp2-client-broadcast.xml:/root/deploy/example-idscp2-client-broadcast.xml
     ports:

diff --git a/examples/src/main/resources/example-idscp2/example-idscp2-client.xml b/examples/src/main/resources/example-idscp2/example-idscp2-client.xml
@@ -7,6 +7,8 @@
           http://camel.apache.org/schema/spring
           http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="clientSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password"/>
@@ -17,7 +19,7 @@
     </camel:sslContextParameters>
 
     <bean name="dapsDriver" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="clientSslContext"/>
         <property name="transportCertificatesParameters" ref="clientSslContext"/>
     </bean>

diff --git a/examples/src/main/resources/example-idscp2/example-idscp2-server.xml b/examples/src/main/resources/example-idscp2/example-idscp2-server.xml
@@ -7,6 +7,8 @@
           http://camel.apache.org/schema/spring
           http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
     <camel:sslContextParameters id="serverSslContext" certAlias="1">
         <camel:keyManagers keyPassword="password">
             <camel:keyStore resource="etc/keystore.p12" password="password"/>
@@ -17,7 +19,7 @@
     </camel:sslContextParameters>
 
     <bean name="dapsDriver" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps-dev.aisec.fraunhofer.de/v4"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="serverSslContext"/>
         <property name="transportCertificatesParameters" ref="serverSslContext"/>
     </bean>