Skip to content

Commit 0c20e76

Browse files
Bernardo-MGBernardo-MG
committed
Merge pull request #33 from Bernardo-MG/merge_master
Merge master
2 parents 9d11b67 + a37a888 commit 0c20e76

45 files changed

Lines changed: 893 additions & 950 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.wandrell.maven</groupId>
1313
<artifactId>base-pom</artifactId>
14-
<version>1.0.0</version>
14+
<version>1.0.1</version>
1515
</parent>
1616

1717
<!-- ********************************************** -->
@@ -20,11 +20,11 @@
2020

2121
<groupId>com.wandrell.example</groupId>
2222
<artifactId>swss-soap-example</artifactId>
23-
<version>1.1.1</version>
23+
<version>1.1.2</version>
2424
<packaging>war</packaging>
2525

2626
<name>Spring Web Services WS-Security Example</name>
27-
<description>An example showing how to configure Spring-WS Security for a SOAP web service</description>
27+
<description>An example showing how to set up secured SOAP web services in Spring</description>
2828
<url>https://github.com/bernardo-mg/spring-ws-security-soap-example</url>
2929
<inceptionYear>2015</inceptionYear>
3030

@@ -217,7 +217,7 @@
217217
<ehcache.version>2.10.2</ehcache.version>
218218
<freemarker.version>2.3.23</freemarker.version>
219219
<guava.version>19.0</guava.version>
220-
<h2.version>1.4.191</h2.version>
220+
<h2.version>1.4.192</h2.version>
221221
<hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
222222
<hibernate.version>5.1.0.Final</hibernate.version>
223223
<hikari.version>2.4.6</hikari.version>
@@ -226,8 +226,8 @@
226226
<javax.stax.api.version>1.0-2</javax.stax.api.version>
227227
<jaxb.api.version>2.2.12</jaxb.api.version>
228228
<jaxb.version>2.2.11</jaxb.version>
229-
<joda.time.version>2.9.3</joda.time.version>
230-
<log4j.version>2.5</log4j.version>
229+
<joda.time.version>2.9.4</joda.time.version>
230+
<log4j.version>2.6</log4j.version>
231231
<mockito.version>1.10.19</mockito.version>
232232
<saaj.api.version>1.3.5</saaj.api.version>
233233
<saaj.impl.version>1.3.25</saaj.impl.version>
@@ -248,11 +248,11 @@
248248
<plugin.buildhelp.version>1.10</plugin.buildhelp.version>
249249
<plugin.changes.version>2.12</plugin.changes.version>
250250
<plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
251-
<plugin.jetty.version>9.1.5.v20140505</plugin.jetty.version>
251+
<plugin.jetty.version>9.1.6.v20160112</plugin.jetty.version>
252252
<plugin.site.velocity.version>1.7</plugin.site.velocity.version>
253253
<plugin.war.version>2.6</plugin.war.version>
254254
<!-- Maven Site -->
255-
<site.skin.version>0.2.4</site.skin.version>
255+
<site.skin.version>0.3.0</site.skin.version>
256256
<!-- Testing server -->
257257
<server.test.path>/swss</server.test.path>
258258
</properties>

‎src/changes/changes.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,10 @@
7070
The readme description has been rewritten.
7171
</action>
7272
</release>
73+
<release version="1.1.2" date="2016-05-31" description="Updated Maven Skin">
74+
<action dev="bmg" type="update">
75+
Updated the Maven Skin.
76+
</action>
77+
</release>
7378
</body>
7479
</document>

‎src/main/resources/context/client/client-unsecure.xml‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
5-
http://www.springframework.org/schema/beans/spring-beans.xsd
6-
http://www.springframework.org/schema/context
7-
http://www.springframework.org/schema/context/spring-context.xsd">
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
5+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
86

9-
<description>
10-
Context for the unsecured client. This is the most basic
11-
client possible.
12-
</description>
7+
<description>
8+
Context for the unsecured client. This is the most basic
9+
client possible.
10+
</description>
1311

14-
<!-- Properties -->
15-
<context:property-placeholder
16-
location="classpath:config/client/client.properties" />
12+
<!-- Properties -->
13+
<context:property-placeholder
14+
location="classpath:config/client/client.properties" />
1715

18-
<!-- Imports base context -->
19-
<import resource="classpath:context/client/client.xml" />
16+
<!-- Imports base context -->
17+
<import resource="classpath:context/client/client.xml" />
2018

21-
<!-- Client -->
22-
<bean id="unsecureClient" class="${client.class}" scope="prototype">
23-
<property name="marshaller" ref="marshaller" />
24-
<property name="unmarshaller" ref="marshaller" />
25-
<property name="interceptors">
26-
<list>
27-
<ref bean="payloadValidatingInterceptor" />
28-
</list>
29-
</property>
30-
</bean>
19+
<!-- Client -->
20+
<bean id="unsecureClient" class="${client.class}" scope="prototype">
21+
<property name="marshaller" ref="marshaller" />
22+
<property name="unmarshaller" ref="marshaller" />
23+
<property name="interceptors">
24+
<list>
25+
<ref bean="payloadValidatingInterceptor" />
26+
</list>
27+
</property>
28+
</bean>
3129

3230
</beans>

‎src/main/resources/context/client/client.xml‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
5-
http://www.springframework.org/schema/beans/spring-beans.xsd
6-
http://www.springframework.org/schema/context
7-
http://www.springframework.org/schema/context/spring-context.xsd">
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
85

9-
<description>
10-
Base context for the web service clients.
6+
<description>
7+
Base context for the web service clients.
118

12-
This is to be extended for each client, which should define the security
13-
interceptor to use.
14-
</description>
9+
This is to be extended for each client, which should define the security
10+
interceptor to use.
11+
</description>
1512

16-
<!-- Client -->
17-
<bean id="baseClient" class="${client.class}" scope="prototype" abstract="true">
18-
<property name="marshaller" ref="marshaller" />
19-
<property name="unmarshaller" ref="marshaller" />
20-
<property name="interceptors">
21-
<list>
22-
<ref bean="payloadValidatingInterceptor" />
23-
<ref bean="securityInterceptor" />
24-
</list>
25-
</property>
26-
</bean>
13+
<!-- Client -->
14+
<bean id="baseClient" class="${client.class}" scope="prototype"
15+
abstract="true">
16+
<property name="marshaller" ref="marshaller" />
17+
<property name="unmarshaller" ref="marshaller" />
18+
<property name="interceptors">
19+
<list>
20+
<ref bean="payloadValidatingInterceptor" />
21+
<ref bean="securityInterceptor" />
22+
</list>
23+
</property>
24+
</bean>
2725

28-
<!-- Marshaller -->
29-
<bean id="marshaller" class="${marshaller.class}">
30-
<property name="packagesToScan" value="${marshaller.packagesToScan}" />
31-
</bean>
26+
<!-- Marshaller -->
27+
<bean id="marshaller" class="${marshaller.class}">
28+
<property name="packagesToScan" value="${marshaller.packagesToScan}" />
29+
</bean>
3230

33-
<!-- Payload validator interceptor -->
34-
<bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
35-
<property name="schema" value="${schema.path}" />
36-
<property name="validateRequest"
37-
value="${interceptor.payloadValidator.validateRequest}" />
38-
<property name="validateResponse"
39-
value="${interceptor.payloadValidator.validateResponse}" />
40-
</bean>
31+
<!-- Payload validator interceptor -->
32+
<bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
33+
<property name="schema" value="${schema.path}" />
34+
<property name="validateRequest"
35+
value="${interceptor.payloadValidator.validateRequest}" />
36+
<property name="validateResponse"
37+
value="${interceptor.payloadValidator.validateResponse}" />
38+
</bean>
4139

4240
</beans>

‎src/main/resources/context/client/encryption/wss4j/client-encryption-wss4j.xml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
55
http://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/context
77
http://www.springframework.org/schema/context/spring-context.xsd">
88

9-
<description>
10-
Context for the WSS4J encrypted client.
9+
<description>
10+
Context for the WSS4J encrypted client.
1111

12-
A normal key store and a WSS4J one are required for this to work, such as the
13-
ones provided by the key stores context files.
14-
</description>
12+
A normal key store and a WSS4J one are required for this to work, such
13+
as the ones provided by the key stores context files.
14+
</description>
1515

16-
<!-- Properties -->
17-
<context:property-placeholder
18-
location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/encryption/wss4j/interceptor-encryption-wss4j.properties, classpath:config/keystore/keystore-wss4j.properties" />
16+
<!-- Properties -->
17+
<context:property-placeholder
18+
location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/encryption/wss4j/interceptor-encryption-wss4j.properties, classpath:config/keystore/keystore-wss4j.properties" />
1919

20-
<!-- Imports base context -->
21-
<import resource="classpath:context/keystore/keystore.xml" />
22-
<import resource="classpath:context/keystore/keystore-wss4j.xml" />
23-
<import resource="classpath:context/client/client.xml" />
24-
<import resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
20+
<!-- Imports base context -->
21+
<import resource="classpath:context/keystore/keystore.xml" />
22+
<import resource="classpath:context/keystore/keystore-wss4j.xml" />
23+
<import resource="classpath:context/client/client.xml" />
24+
<import
25+
resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
2526

26-
<!-- Extends client -->
27-
<bean id="encryptionWss4jClient" parent="baseClient" />
27+
<!-- Extends client -->
28+
<bean id="encryptionWss4jClient" parent="baseClient" />
2829

2930
</beans>

‎src/main/resources/context/client/encryption/xwss/client-encryption-xwss.xml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
55
http://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/context
77
http://www.springframework.org/schema/context/spring-context.xsd">
88

9-
<description>
10-
Context for the XWSS encrypted client.
9+
<description>
10+
Context for the XWSS encrypted client.
1111

12-
A key store is required for this to work, such as the ones provided by the key
13-
stores context file.
14-
</description>
12+
A key store is required for this to work, such as the ones provided by
13+
the key stores context file.
14+
</description>
1515

16-
<!-- Properties -->
17-
<context:property-placeholder
18-
location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/encryption/xwss/interceptor-encryption-xwss.properties, classpath:config/client/encryption/xwss/client-encryption-xwss.properties" />
16+
<!-- Properties -->
17+
<context:property-placeholder
18+
location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/encryption/xwss/interceptor-encryption-xwss.properties, classpath:config/client/encryption/xwss/client-encryption-xwss.properties" />
1919

20-
<!-- Imports base context -->
21-
<import resource="classpath:context/keystore/keystore.xml" />
22-
<import resource="classpath:context/client/client.xml" />
23-
<import resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
20+
<!-- Imports base context -->
21+
<import resource="classpath:context/keystore/keystore.xml" />
22+
<import resource="classpath:context/client/client.xml" />
23+
<import
24+
resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
2425

25-
<!-- Extends client -->
26-
<bean id="encryptionXwssClient" parent="baseClient" />
26+
<!-- Extends client -->
27+
<bean id="encryptionXwssClient" parent="baseClient" />
2728

2829
</beans>

‎src/main/resources/context/client/password/digest/wss4j/client-password-digest-wss4j.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
55
http://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/context
77
http://www.springframework.org/schema/context/spring-context.xsd">
88

9-
<description>
10-
Context for the WSS4J digested password secured client.
11-
</description>
9+
<description>
10+
Context for the WSS4J digested password secured client.
11+
</description>
1212

13-
<!-- Properties -->
14-
<context:property-placeholder
15-
location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties" />
13+
<!-- Properties -->
14+
<context:property-placeholder
15+
location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties" />
1616

17-
<!-- Imports base context -->
18-
<import resource="classpath:context/client/client.xml" />
19-
<import resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
17+
<!-- Imports base context -->
18+
<import resource="classpath:context/client/client.xml" />
19+
<import
20+
resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
2021

21-
<!-- Extends client -->
22-
<bean id="passDigestWss4jClient" parent="baseClient" />
22+
<!-- Extends client -->
23+
<bean id="passDigestWss4jClient" parent="baseClient" />
2324

2425
</beans>

‎src/main/resources/context/client/password/digest/xwss/client-password-digest-xwss.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
55
http://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/context
77
http://www.springframework.org/schema/context/spring-context.xsd">
88

9-
<description>
10-
Context for the XWSS digested password protected client.
11-
</description>
9+
<description>
10+
Context for the XWSS digested password protected client.
11+
</description>
1212

13-
<!-- Properties -->
14-
<context:property-placeholder
15-
location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/xwss/interceptor-password-digest-xwss.properties, classpath:config/client/password/digest/xwss/client-password-digest-xwss.properties" />
13+
<!-- Properties -->
14+
<context:property-placeholder
15+
location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/xwss/interceptor-password-digest-xwss.properties, classpath:config/client/password/digest/xwss/client-password-digest-xwss.properties" />
1616

17-
<!-- Imports base context -->
18-
<import resource="classpath:context/client/client.xml" />
19-
<import resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
17+
<!-- Imports base context -->
18+
<import resource="classpath:context/client/client.xml" />
19+
<import
20+
resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
2021

21-
<!-- Extends client -->
22-
<bean id="passDigestXwssClient" parent="baseClient" />
22+
<!-- Extends client -->
23+
<bean id="passDigestXwssClient" parent="baseClient" />
2324

2425
</beans>

0 commit comments

Comments
 (0)