daps-url property config

Fraunhofer-AISEC · Feb 28, 2023 · dc08d90 · dc08d90
1 parent 3eee7a1
commit dc08d90
Showing 1 changed file with 3 additions and 26 deletions.
diff --git a/clearing-house-processors/src/routes/clearing-house-routes.xml b/clearing-house-processors/src/routes/clearing-house-routes.xml
@@ -7,6 +7,8 @@
           http://camel.apache.org/schema/spring
           https://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"/>
@@ -25,7 +27,7 @@
     </bean>
 
     <bean name="rootDaps" class="de.fhg.aisec.ids.idscp2.beans.AisecDapsDriverFactoryBean">
-        <property name="dapsUrl" value="https://daps.aisec.fraunhofer.de/v3"/>
+        <property name="dapsUrl" value="${connector.daps-url}"/>
         <property name="dapsSslParameters" ref="rootServerSslContext"/>
         <property name="transportCertificatesParameters" ref="rootServerSslContext"/>
     </bean>
@@ -52,9 +54,6 @@
         </restConfiguration>
 
         <rest id="CH_REST">
-            <post path="/selfInformation">
-                <to uri="direct:route-self"/>
-            </post>
             <post path="/messages/query/{pid}" id="CH_QUERY_PID">
                 <to uri="direct:multipart" />
             </post>
@@ -69,28 +68,6 @@
             </post>
         </rest>
 
-        <route id="route-self">
-            <from uri="direct:route-self"/>
-            <process ref="idsMultiPartInputProcessor"/>
-            <process ref="idsMessageTypeExtractionProcessor"/>
-            <choice>
-                <when>
-                    <simple>${exchangeProperty.ids-type} == 'DescriptionRequestMessage'</simple>
-                    <log message="### Received DescriptionRequestMessage ###"/>
-                    <process ref="descriptionRequestProcessor"/>
-                    <process ref="idsMultiPartOutputProcessor"/>
-                </when>
-                <otherwise>
-                    <log loggingLevel="ERROR"
-                         message="### Server received unexpected message (otherwise branch):\n${body}\n### Header: ###\n${headers[ids-header]}"/>
-                    <removeHeader name="ids-header"/>
-                    <setBody>
-                        <simple>${null}</simple>
-                    </setBody>
-                </otherwise>
-            </choice>
-        </route>
-
         <route id="CH_MULTIPART_ROUTE">
             <from uri="direct:multipart"/>
             <onException>