You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/21 08:28:21 UTC
[4/4] camel git commit: Fixed stuff. This closes #1478
Fixed stuff. This closes #1478
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0872f911
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0872f911
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0872f911
Branch: refs/heads/master
Commit: 0872f9118b4956cc5351f0289e9982ff83db8459
Parents: 2fd9719
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 21 09:27:43 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 21 09:27:43 2017 +0100
----------------------------------------------------------------------
components/camel-spring-ws/pom.xml | 13 ++--
.../ProducerWss4JSecurityHeaderTest-context.xml | 77 ++++++++++----------
2 files changed, 47 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0872f911/components/camel-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 96bd68d..106bbd7 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -67,19 +67,20 @@
<artifactId>spring-ws-support</artifactId>
<version>${spring-ws-version}</version>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-security</artifactId>
<version>${spring-ws-version}</version>
+ <scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
- <!-- test dependencies -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/0872f911/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest-context.xml
index a8be027..bd308f1 100644
--- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest-context.xml
+++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest-context.xml
@@ -1,17 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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">
@@ -21,19 +27,17 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<dataFormats>
- <jaxb id="jaxb" contextPath="net.javacrumbs.calc.model" />
+ <jaxb id="jaxb" contextPath="net.javacrumbs.calc.model"/>
</dataFormats>
<route>
- <from uri="direct:testHeader" />
- <to
- uri="spring-ws:uri:http://localhost:8080/simple-server-test/soap/calc?webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" />
- <!-- <convertBodyTo type="java.lang.String"/> -->
- <unmarshal ref="jaxb" />
+ <from uri="direct:testHeader"/>
+ <to uri="spring-ws:uri:http://localhost:8080/simple-server-test/soap/calc?webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping"/>
+ <unmarshal ref="jaxb"/>
</route>
</camelContext>
<bean id="endpointMapping"
- class="org.apache.camel.component.spring.ws.bean.CamelEndpointMapping" />
+ class="org.apache.camel.component.spring.ws.bean.CamelEndpointMapping"/>
<!-- ============================== -->
<!-- Supporting Spring-WS beans -->
@@ -41,40 +45,39 @@
<bean id="webServiceTemplate" class="org.springframework.ws.client.core.WebServiceTemplate">
<property name="defaultUri"
- value="http://localhost:8080/simple-server-test/soap/calc" />
+ value="http://localhost:8080/simple-server-test/soap/calc"/>
<property name="interceptors">
<list>
<bean id="wsClientSecurityInterceptor"
- class="org.apache.camel.component.spring.ws.security.ProducerWss4JSecurityHeaderTestInterceptor">
- <property name="securementActions" value="Timestamp Signature Encrypt" />
+ class="org.apache.camel.component.spring.ws.security.ProducerWss4JSecurityHeaderTestInterceptor">
+ <property name="securementActions" value="Timestamp Signature Encrypt"/>
<!-- Key alias for signature -->
- <property name="securementUsername" value="client" />
- <property name="securementPassword" value="onder123" />
- <property name="securementSignatureCrypto" ref="clientCrypto" />
- <property name="securementEncryptionCrypto" ref="clientCrypto" />
- <property name="securementEncryptionParts" value="{Content}{http://javacrumbs.net/calc}a" />
+ <property name="securementUsername" value="client"/>
+ <property name="securementPassword" value="onder123"/>
+ <property name="securementSignatureCrypto" ref="clientCrypto"/>
+ <property name="securementEncryptionCrypto" ref="clientCrypto"/>
+ <property name="securementEncryptionParts" value="{Content}{http://javacrumbs.net/calc}a"/>
<!-- Key alias for encryption -->
- <property name="securementEncryptionUser" value="server" />
+ <property name="securementEncryptionUser" value="server"/>
<!-- Validation config -->
- <property name="validationActions" value="Signature" />
- <property name="validationSignatureCrypto" ref="clientCrypto" />
+ <property name="validationActions" value="Signature"/>
+ <property name="validationSignatureCrypto" ref="clientCrypto"/>
</bean>
</list>
</property>
- <property name="marshaller" ref="marshaller" />
- <property name="unmarshaller" ref="marshaller" />
+ <property name="marshaller" ref="marshaller"/>
+ <property name="unmarshaller" ref="marshaller"/>
</bean>
<bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
- <property name="contextPath" value="net.javacrumbs.calc.model" />
+ <property name="contextPath" value="net.javacrumbs.calc.model"/>
</bean>
-
<bean id="clientCrypto"
- class="org.springframework.ws.soap.security.wss4j.support.CryptoFactoryBean">
- <property name="keyStorePassword" value="onder123" />
- <property name="keyStoreLocation" value="classpath:security/client.jks" />
+ class="org.springframework.ws.soap.security.wss4j.support.CryptoFactoryBean">
+ <property name="keyStorePassword" value="onder123"/>
+ <property name="keyStoreLocation" value="classpath:security/client.jks"/>
</bean>
</beans>
\ No newline at end of file