From 19b1824573c5eceddd6164c7d59e8e6c16200b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Fri, 13 May 2016 00:04:02 +0200
Subject: [PATCH 1/9] Changed the project description.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed744ea..bbe7df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <packaging>war</packaging>
 
     <name>Spring Web Services WS-Security Example</name>
-    <description>An example showing how to configure Spring-WS Security for a SOAP web service</description>
+    <description>An example showing how to set up secured SOAP web services in Spring</description>
     <url>https://github.com/bernardo-mg/spring-ws-security-soap-example</url>
     <inceptionYear>2015</inceptionYear>
 

From 52f28a0d1aaceec998939a62dbb74c082ea6cc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Sun, 15 May 2016 23:33:11 +0200
Subject: [PATCH 2/9] Updated dependencies.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbe7df4..3063a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
         <plugin.buildhelp.version>1.10</plugin.buildhelp.version>
         <plugin.changes.version>2.12</plugin.changes.version>
         <plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
-        <plugin.jetty.version>9.1.5.v20140505</plugin.jetty.version>
+        <plugin.jetty.version>9.3.8.v20160314</plugin.jetty.version>
         <plugin.site.velocity.version>1.7</plugin.site.velocity.version>
         <plugin.war.version>2.6</plugin.war.version>
         <!-- Maven Site -->

From 05b9c5dcfd6545a06344af41996585cc1f5e110d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Sun, 15 May 2016 23:59:50 +0200
Subject: [PATCH 3/9] Reverted version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3063a69..bbe7df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
         <plugin.buildhelp.version>1.10</plugin.buildhelp.version>
         <plugin.changes.version>2.12</plugin.changes.version>
         <plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
-        <plugin.jetty.version>9.3.8.v20160314</plugin.jetty.version>
+        <plugin.jetty.version>9.1.5.v20140505</plugin.jetty.version>
         <plugin.site.velocity.version>1.7</plugin.site.velocity.version>
         <plugin.war.version>2.6</plugin.war.version>
         <!-- Maven Site -->

From 437396fc7e5bfe6bba36dfbf05a611a790224907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 17 May 2016 00:01:08 +0200
Subject: [PATCH 4/9] Formatted context files and removed unused namespaces.

---
 .../context/client/client-unsecure.xml        |  48 ++++---
 src/main/resources/context/client/client.xml  |  66 +++++-----
 .../wss4j/client-encryption-wss4j.xml         |  37 +++---
 .../xwss/client-encryption-xwss.xml           |  35 +++---
 .../wss4j/client-password-digest-wss4j.xml    |  29 ++---
 .../xwss/client-password-digest-xwss.xml      |  29 ++---
 .../wss4j/client-password-plain-wss4j.xml     |  29 ++---
 .../plain/xwss/client-password-plain-xwss.xml |  29 ++---
 .../wss4j/client-signature-wss4j.xml          |  35 +++---
 .../signature/xwss/client-signature-xwss.xml  |  38 +++---
 .../wss4j/endpoint-encryption-wss4j.xml       |  41 +++---
 .../xwss/endpoint-encryption-xwss.xml         |  41 +++---
 .../context/endpoint/endpoint-unsecure.xml    |  32 +++--
 .../resources/context/endpoint/endpoint.xml   |  44 ++++---
 .../wss4j/endpoint-password-digest-wss4j.xml  |  37 +++---
 .../xwss/endpoint-password-digest-xwss.xml    |  37 +++---
 .../wss4j/endpoint-password-plain-wss4j.xml   |  37 +++---
 .../xwss/endpoint-password-plain-xwss.xml     |  37 +++---
 .../wss4j/endpoint-signature-wss4j.xml        |  42 +++----
 .../xwss/endpoint-signature-xwss.xml          |  41 +++---
 src/main/resources/context/endpoint/wsdl.xml  |  30 ++---
 .../wss4j/interceptor-encryption-wss4j.xml    |  57 ++++-----
 .../xwss/interceptor-encryption-xwss.xml      |  59 ++++-----
 .../interceptor-password-digest-wss4j.xml     |  55 ++++----
 .../xwss/interceptor-password-digest-xwss.xml |  51 ++++----
 .../interceptor-password-plain-wss4j.xml      |  55 ++++----
 .../xwss/interceptor-password-plain-xwss.xml  |  89 +++++++------
 .../wss4j/interceptor-signature-wss4j.xml     |  55 ++++----
 .../xwss/interceptor-signature-xwss.xml       | 119 +++++++++---------
 .../context/keystore/keystore-wss4j.xml       |  33 ++---
 .../resources/context/keystore/keystore.xml   |  43 +++----
 src/main/resources/context/persistence.xml    | 117 ++++++++---------
 src/main/resources/context/service.xml        |  24 ++--
 .../wss4j/servlet-encryption-wss4j.xml        |  27 ++--
 .../xwss/servlet-encryption-xwss.xml          |  27 ++--
 .../wss4j/servlet-password-digest-wss4j.xml   |  27 ++--
 .../xwss/servlet-password-digest-xwss.xml     |  27 ++--
 .../wss4j/servlet-password-plain-wss4j.xml    |  27 ++--
 .../xwss/servlet-password-plain-xwss.xml      |  27 ++--
 .../context/servlet/servlet-unsecure.xml      |  26 ++--
 .../wss4j/servlet-signature-wss4j.xml         |  27 ++--
 .../signature/xwss/servlet-signature-xwss.xml |  27 ++--
 src/main/resources/context/webService.xml     |  29 ++---
 43 files changed, 880 insertions(+), 942 deletions(-)

diff --git a/src/main/resources/context/client/client-unsecure.xml b/src/main/resources/context/client/client-unsecure.xml
index a9c6dd7..7bd48da 100644
--- a/src/main/resources/context/client/client-unsecure.xml
+++ b/src/main/resources/context/client/client-unsecure.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the unsecured client. This is the most basic
-        client possible.
-    </description>
+   <description>
+      Context for the unsecured client. This is the most basic
+      client possible.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/client/client.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/client/client.xml" />
 
-    <!-- Client -->
-    <bean id="unsecureClient" class="${client.class}" scope="prototype">
-        <property name="marshaller" ref="marshaller" />
-        <property name="unmarshaller" ref="marshaller" />
-        <property name="interceptors">
-            <list>
-                <ref bean="payloadValidatingInterceptor" />
-            </list>
-        </property>
-    </bean>
+   <!-- Client -->
+   <bean id="unsecureClient" class="${client.class}" scope="prototype">
+      <property name="marshaller" ref="marshaller" />
+      <property name="unmarshaller" ref="marshaller" />
+      <property name="interceptors">
+         <list>
+            <ref bean="payloadValidatingInterceptor" />
+         </list>
+      </property>
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/client.xml b/src/main/resources/context/client/client.xml
index 53061c5..14cdf91 100644
--- a/src/main/resources/context/client/client.xml
+++ b/src/main/resources/context/client/client.xml
@@ -1,42 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   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">
 
-    <description>
-        Base context for the web service clients.
+   <description>
+      Base context for the web service clients.
 
-        This is to be extended for each client, which should define the security
-        interceptor to use.
-    </description>
+      This is to be extended for each client, which should define the security
+      interceptor to use.
+   </description>
 
-    <!-- Client -->
-    <bean id="baseClient" class="${client.class}" scope="prototype" abstract="true">
-        <property name="marshaller" ref="marshaller" />
-        <property name="unmarshaller" ref="marshaller" />
-        <property name="interceptors">
-            <list>
-                <ref bean="payloadValidatingInterceptor" />
-                <ref bean="securityInterceptor" />
-            </list>
-        </property>
-    </bean>
+   <!-- Client -->
+   <bean id="baseClient" class="${client.class}" scope="prototype"
+      abstract="true">
+      <property name="marshaller" ref="marshaller" />
+      <property name="unmarshaller" ref="marshaller" />
+      <property name="interceptors">
+         <list>
+            <ref bean="payloadValidatingInterceptor" />
+            <ref bean="securityInterceptor" />
+         </list>
+      </property>
+   </bean>
 
-    <!-- Marshaller -->
-    <bean id="marshaller" class="${marshaller.class}">
-        <property name="packagesToScan" value="${marshaller.packagesToScan}" />
-    </bean>
+   <!-- Marshaller -->
+   <bean id="marshaller" class="${marshaller.class}">
+      <property name="packagesToScan" value="${marshaller.packagesToScan}" />
+   </bean>
 
-    <!-- Payload validator interceptor -->
-    <bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
-        <property name="schema" value="${schema.path}" />
-        <property name="validateRequest"
-            value="${interceptor.payloadValidator.validateRequest}" />
-        <property name="validateResponse"
-            value="${interceptor.payloadValidator.validateResponse}" />
-    </bean>
+   <!-- Payload validator interceptor -->
+   <bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
+      <property name="schema" value="${schema.path}" />
+      <property name="validateRequest"
+         value="${interceptor.payloadValidator.validateRequest}" />
+      <property name="validateResponse"
+         value="${interceptor.payloadValidator.validateResponse}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/encryption/wss4j/client-encryption-wss4j.xml b/src/main/resources/context/client/encryption/wss4j/client-encryption-wss4j.xml
index e387783..001114b 100644
--- a/src/main/resources/context/client/encryption/wss4j/client-encryption-wss4j.xml
+++ b/src/main/resources/context/client/encryption/wss4j/client-encryption-wss4j.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the WSS4J encrypted client.
+   <description>
+      Context for the WSS4J encrypted client.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the ones provided by the key stores context files.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        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" />
+   <!-- Properties -->
+   <context:property-placeholder
+      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" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/keystore/keystore.xml" />
-    <import resource="classpath:context/keystore/keystore-wss4j.xml" />
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/keystore/keystore.xml" />
+   <import resource="classpath:context/keystore/keystore-wss4j.xml" />
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
 
-    <!-- Extends client -->
-    <bean id="encryptionWss4jClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="encryptionWss4jClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/encryption/xwss/client-encryption-xwss.xml b/src/main/resources/context/client/encryption/xwss/client-encryption-xwss.xml
index 65498a8..7ca7033 100644
--- a/src/main/resources/context/client/encryption/xwss/client-encryption-xwss.xml
+++ b/src/main/resources/context/client/encryption/xwss/client-encryption-xwss.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the XWSS encrypted client.
+   <description>
+      Context for the XWSS encrypted client.
 
-        A key store is required for this to work, such as the ones provided by the key
-        stores context file.
-    </description>
+      A key store is required for this to work, such as the ones provided by
+      the key stores context file.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        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" />
+   <!-- Properties -->
+   <context:property-placeholder
+      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" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/keystore/keystore.xml" />
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/keystore/keystore.xml" />
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
 
-    <!-- Extends client -->
-    <bean id="encryptionXwssClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="encryptionXwssClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/password/digest/wss4j/client-password-digest-wss4j.xml b/src/main/resources/context/client/password/digest/wss4j/client-password-digest-wss4j.xml
index aba2178..353dc1b 100644
--- a/src/main/resources/context/client/password/digest/wss4j/client-password-digest-wss4j.xml
+++ b/src/main/resources/context/client/password/digest/wss4j/client-password-digest-wss4j.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the WSS4J digested password secured client.
-    </description>
+   <description>
+      Context for the WSS4J digested password secured client.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
 
-    <!-- Extends client -->
-    <bean id="passDigestWss4jClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="passDigestWss4jClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/password/digest/xwss/client-password-digest-xwss.xml b/src/main/resources/context/client/password/digest/xwss/client-password-digest-xwss.xml
index 2016d5e..9fff67f 100644
--- a/src/main/resources/context/client/password/digest/xwss/client-password-digest-xwss.xml
+++ b/src/main/resources/context/client/password/digest/xwss/client-password-digest-xwss.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the XWSS digested password protected client.
-    </description>
+   <description>
+      Context for the XWSS digested password protected client.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        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" />
+   <!-- Properties -->
+   <context:property-placeholder
+      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" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
 
-    <!-- Extends client -->
-    <bean id="passDigestXwssClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="passDigestXwssClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/password/plain/wss4j/client-password-plain-wss4j.xml b/src/main/resources/context/client/password/plain/wss4j/client-password-plain-wss4j.xml
index 80cbb00..2eaeb2a 100644
--- a/src/main/resources/context/client/password/plain/wss4j/client-password-plain-wss4j.xml
+++ b/src/main/resources/context/client/password/plain/wss4j/client-password-plain-wss4j.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the WSS4J plain password secured client.
-    </description>
+   <description>
+      Context for the WSS4J plain password secured client.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties, classpath:config/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties, classpath:config/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml" />
 
-    <!-- Extends client -->
-    <bean id="passPlainWss4jClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="passPlainWss4jClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/password/plain/xwss/client-password-plain-xwss.xml b/src/main/resources/context/client/password/plain/xwss/client-password-plain-xwss.xml
index f208688..7b57860 100644
--- a/src/main/resources/context/client/password/plain/xwss/client-password-plain-xwss.xml
+++ b/src/main/resources/context/client/password/plain/xwss/client-password-plain-xwss.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the XWSS plain password secured WS client.
-    </description>
+   <description>
+      Context for the XWSS plain password secured WS client.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties, classpath:config/interceptor/password/plain/xwss/interceptor-password-plain-xwss.properties, classpath:config/client/password/plain/xwss/client-password-plain-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties, classpath:config/interceptor/password/plain/xwss/interceptor-password-plain-xwss.properties, classpath:config/client/password/plain/xwss/client-password-plain-xwss.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml" />
 
-    <!-- Extends client -->
-    <bean id="passPlainXwssClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="passPlainXwssClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/signature/wss4j/client-signature-wss4j.xml b/src/main/resources/context/client/signature/wss4j/client-signature-wss4j.xml
index 5d1c6bd..03f4dbe 100644
--- a/src/main/resources/context/client/signature/wss4j/client-signature-wss4j.xml
+++ b/src/main/resources/context/client/signature/wss4j/client-signature-wss4j.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the WSS4J signature secured client.
+   <description>
+      Context for the WSS4J signature secured client.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the ones provided by the key stores context files.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/signature/wss4j/interceptor-signature-wss4j.properties, classpath:config/keystore/keystore-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/signature/wss4j/interceptor-signature-wss4j.properties, classpath:config/keystore/keystore-wss4j.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/keystore/keystore-wss4j.xml" />
-    <import resource="classpath:context/client/client.xml" />
-    <import resource="classpath:context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/keystore/keystore-wss4j.xml" />
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml" />
 
-    <!-- Extends client -->
-    <bean id="signatureWss4jClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="signatureWss4jClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/client/signature/xwss/client-signature-xwss.xml b/src/main/resources/context/client/signature/xwss/client-signature-xwss.xml
index 8839117..e5c884f 100644
--- a/src/main/resources/context/client/signature/xwss/client-signature-xwss.xml
+++ b/src/main/resources/context/client/signature/xwss/client-signature-xwss.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the XWSS signature secured client.
+   <description>
+      Context for the XWSS signature secured client.
 
-        A key store is
-        required for this to work, such as the ones provided by the key
-        stores
-        context file.
-    </description>
+      A key store is required for this to work, such as the ones provided by the key
+      stores context file.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/signature/xwss/interceptor-signature-xwss.properties, classpath:config/client/signature/xwss/client-signature-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/client/client.properties, config/keystore/keystore.properties, classpath:config/interceptor/signature/xwss/interceptor-signature-xwss.properties, classpath:config/client/signature/xwss/client-signature-xwss.properties" />
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/keystore/keystore.xml" />
-    <import resource="classpath:context/client/client.xml" />
-    <import
-        resource="classpath:context/interceptor/signature/xwss/interceptor-signature-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/keystore/keystore.xml" />
+   <import resource="classpath:context/client/client.xml" />
+   <import
+      resource="classpath:context/interceptor/signature/xwss/interceptor-signature-xwss.xml" />
 
-    <!-- Extends client -->
-    <bean id="signatureXwssClient" parent="baseClient" />
+   <!-- Extends client -->
+   <bean id="signatureXwssClient" parent="baseClient" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml b/src/main/resources/context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml
index 6cac050..347187c 100644
--- a/src/main/resources/context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml
+++ b/src/main/resources/context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the WSS4J encrypted endpoint.
+   <description>
+      Context for the WSS4J encrypted endpoint.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the ones provided by the key stores context files.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <!-- <ref bean="payloadValidatingInterceptor" /> -->
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <!-- <ref bean="payloadValidatingInterceptor" /> -->
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml b/src/main/resources/context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml
index e8482d2..d683bc2 100644
--- a/src/main/resources/context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml
+++ b/src/main/resources/context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the XWSS encrypted endpoint.
+   <description>
+      Context for the XWSS encrypted endpoint.
 
-        A key store is required for this to work, such as the ones provided by the key
-        stores context file.
-    </description>
+      A key store is required for this to work, such as the ones provided by
+      the key stores context file.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <!-- <ref bean="payloadValidatingInterceptor" /> -->
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <!-- <ref bean="payloadValidatingInterceptor" /> -->
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/endpoint-unsecure.xml b/src/main/resources/context/endpoint/endpoint-unsecure.xml
index 5e63c0c..78eaf1d 100644
--- a/src/main/resources/context/endpoint/endpoint-unsecure.xml
+++ b/src/main/resources/context/endpoint/endpoint-unsecure.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the unsecured endpoint. This is the most basic endpoint possible.
-    </description>
+   <description>
+      Context for the unsecured endpoint. This is the most basic endpoint possible.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/endpoint.xml b/src/main/resources/context/endpoint/endpoint.xml
index b7df596..aee255f 100644
--- a/src/main/resources/context/endpoint/endpoint.xml
+++ b/src/main/resources/context/endpoint/endpoint.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Base context for the web service endpoints.
+   <description>
+      Base context for the web service endpoints.
 
-        This is to be extended for each WS, which will register all the required
-        interceptors, including the security interceptor to use.
-    </description>
+      This is to be extended for each WS, which will register all the required
+      interceptors, including the security interceptor to use.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/wsdl.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/wsdl.xml" />
 
-    <!-- SOAP logger interceptor -->
-    <bean id="soapEnvelopeLoggingInterceptor" class="${interceptor.soapLogger.class}" />
+   <!-- SOAP logger interceptor -->
+   <bean id="soapEnvelopeLoggingInterceptor" class="${interceptor.soapLogger.class}" />
 
-    <!-- Payload validator interceptor -->
-    <bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
-        <property name="schema" value="${schema.path}" />
-        <property name="validateRequest" value="${interceptor.payloadValidator.validateRequest}" />
-        <property name="validateResponse" value="${interceptor.payloadValidator.validateResponse}" />
-    </bean>
+   <!-- Payload validator interceptor -->
+   <bean id="payloadValidatingInterceptor" class="${interceptor.payloadValidator.class}">
+      <property name="schema" value="${schema.path}" />
+      <property name="validateRequest"
+         value="${interceptor.payloadValidator.validateRequest}" />
+      <property name="validateResponse"
+         value="${interceptor.payloadValidator.validateResponse}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml b/src/main/resources/context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml
index 05fbd0a..94544d5 100644
--- a/src/main/resources/context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml
+++ b/src/main/resources/context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the WSS4J digested password secured endpoint.
-    </description>
+   <description>
+      Context for the WSS4J digested password secured endpoint.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml b/src/main/resources/context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml
index eda9a04..17929ce 100644
--- a/src/main/resources/context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml
+++ b/src/main/resources/context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the XWSS digested password protected endpoint.
-    </description>
+   <description>
+      Context for the XWSS digested password protected endpoint.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml b/src/main/resources/context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml
index b0cdd0c..da9b5ef 100644
--- a/src/main/resources/context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml
+++ b/src/main/resources/context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the WSS4J plain password secured endpoint.
-    </description>
+   <description>
+      Context for the WSS4J plain password secured endpoint.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml b/src/main/resources/context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml
index 38e660c..fd1b935 100644
--- a/src/main/resources/context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml
+++ b/src/main/resources/context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the XWSS plain password secured endpoint.
-    </description>
+   <description>
+      Context for the XWSS plain password secured endpoint.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml b/src/main/resources/context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml
index 7b0f9ad..45b1c90 100644
--- a/src/main/resources/context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml
+++ b/src/main/resources/context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the WSS4J signature secured endpoint.
+   <description>
+      Context for the WSS4J signature secured endpoint.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the
+      ones provided by the key stores context files.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/signature/xwss/endpoint-signature-xwss.xml b/src/main/resources/context/endpoint/signature/xwss/endpoint-signature-xwss.xml
index f8630fe..514ba37 100644
--- a/src/main/resources/context/endpoint/signature/xwss/endpoint-signature-xwss.xml
+++ b/src/main/resources/context/endpoint/signature/xwss/endpoint-signature-xwss.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for the XWSS signature secured endpoint.
+   <description>
+      Context for the XWSS signature secured endpoint.
 
-        A key store is required for this to work, such as the ones provided by the key
-        stores context file.
-    </description>
+      A key store is required for this to work, such as the ones provided by
+      the key stores context file.
+   </description>
 
-    <!-- Imports base context -->
-    <import resource="classpath:context/endpoint/endpoint.xml" />
-    <import resource="classpath:context/interceptor/signature/xwss/interceptor-signature-xwss.xml" />
+   <!-- Imports base context -->
+   <import resource="classpath:context/endpoint/endpoint.xml" />
+   <import
+      resource="classpath:context/interceptor/signature/xwss/interceptor-signature-xwss.xml" />
 
-    <!-- Registers interceptors -->
-    <sws:interceptors>
-        <ref bean="soapEnvelopeLoggingInterceptor" />
-        <ref bean="payloadValidatingInterceptor" />
-        <ref bean="securityInterceptor" />
-    </sws:interceptors>
+   <!-- Registers interceptors -->
+   <sws:interceptors>
+      <ref bean="soapEnvelopeLoggingInterceptor" />
+      <ref bean="payloadValidatingInterceptor" />
+      <ref bean="securityInterceptor" />
+   </sws:interceptors>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/endpoint/wsdl.xml b/src/main/resources/context/endpoint/wsdl.xml
index e30d6da..be03819 100644
--- a/src/main/resources/context/endpoint/wsdl.xml
+++ b/src/main/resources/context/endpoint/wsdl.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        WSDL configuration context.
+   <description>
+      WSDL configuration context.
 
-        This will create the WSDL for an endpoint.
-    </description>
+      This will create the WSDL for an endpoint.
+   </description>
 
-    <!-- WSDL -->
-    <sws:dynamic-wsdl id="entities" portTypeName="${wsdl.portTypeName}"
-        locationUri="${wsdl.locationUri}" targetNamespace="${wsdl.targetNamespace}">
-        <sws:xsd location="${wsdl.path}" />
-    </sws:dynamic-wsdl>
+   <!-- WSDL -->
+   <sws:dynamic-wsdl id="entities" portTypeName="${wsdl.portTypeName}"
+      locationUri="${wsdl.locationUri}" targetNamespace="${wsdl.targetNamespace}">
+      <sws:xsd location="${wsdl.path}" />
+   </sws:dynamic-wsdl>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml b/src/main/resources/context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml
index 98132f2..5f0c53d 100644
--- a/src/main/resources/context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml
+++ b/src/main/resources/context/interceptor/encryption/wss4j/interceptor-encryption-wss4j.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for WSS4J encrypted SOAP interceptor to be used on both the endpoint and the
-        client.
+   <description>
+      Context for WSS4J encrypted SOAP interceptor to be used on both the endpoint
+      and the client.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the ones provided by the key stores context files.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="securementActions" value="${security.actions}" />
-        <property name="securementEncryptionUser" value="${symmetricstore.alias}" />
-        <property name="securementEncryptionCrypto" ref="keyStoreWSS4J" />
-        <property name="securementEncryptionKeyIdentifier" value="${security.encryptionKeyIdentifier}" />
-        <property name="validationActions" value="${security.actions}" />
-        <property name="validationCallbackHandler" ref="keystoreCallbackHandler" />
-        <property name="validationDecryptionCrypto" ref="keyStoreWSS4J" />
-        <property name="secureResponse" value="false" />
-        <property name="validateResponse" value="false" />
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="securementActions" value="${security.actions}" />
+      <property name="securementEncryptionUser" value="${symmetricstore.alias}" />
+      <property name="securementEncryptionCrypto" ref="keyStoreWSS4J" />
+      <property name="securementEncryptionKeyIdentifier" value="${security.encryptionKeyIdentifier}" />
+      <property name="validationActions" value="${security.actions}" />
+      <property name="validationCallbackHandler" ref="keystoreCallbackHandler" />
+      <property name="validationDecryptionCrypto" ref="keyStoreWSS4J" />
+      <property name="secureResponse" value="false" />
+      <property name="validateResponse" value="false" />
+   </bean>
 
-    <!-- Key store callback handler -->
-    <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
-        <property name="keyStore" ref="keyStore" />
-        <property name="privateKeyPassword" value="${keystore.password}" />
-    </bean>
+   <!-- Key store callback handler -->
+   <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
+      <property name="keyStore" ref="keyStore" />
+      <property name="privateKeyPassword" value="${keystore.password}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml b/src/main/resources/context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml
index a005b16..6b8b8a6 100644
--- a/src/main/resources/context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml
+++ b/src/main/resources/context/interceptor/encryption/xwss/interceptor-encryption-xwss.xml
@@ -1,39 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for XWSS encrypted SOAP interceptor to be used on both the endpoint and the
-        client.
+   <description>
+      Context for XWSS encrypted SOAP interceptor to be used on both the endpoint
+      and the client.
 
-        A key store is required for this to work, such as the ones provided by the key
-        stores context file.
-    </description>
+      A key store is required for this to work, such as the ones provided by
+      the key stores context file.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="policyConfiguration" value="${security.file.path}" />
-        <property name="callbackHandlers">
-            <list>
-                <ref bean="keystoreCallbackHandler" />
-            </list>
-        </property>
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="policyConfiguration" value="${security.file.path}" />
+      <property name="callbackHandlers">
+         <list>
+            <ref bean="keystoreCallbackHandler" />
+         </list>
+      </property>
+   </bean>
 
-    <!-- Key store callback handler -->
-    <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
-        <property name="keyStore" ref="keyStore" />
-        <property name="trustStore" ref="trustStore" />
-        <property name="symmetricStore" ref="symmetricStore" />
-        <property name="privateKeyPassword" value="${symmetricstore.password}" />
-        <property name="symmetricKeyPassword" value="${symmetricstore.password}" />
-        <property name="defaultAlias" value="${symmetricstore.alias}" />
-    </bean>
+   <!-- Key store callback handler -->
+   <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
+      <property name="keyStore" ref="keyStore" />
+      <property name="trustStore" ref="trustStore" />
+      <property name="symmetricStore" ref="symmetricStore" />
+      <property name="privateKeyPassword" value="${symmetricstore.password}" />
+      <property name="symmetricKeyPassword" value="${symmetricstore.password}" />
+      <property name="defaultAlias" value="${symmetricstore.alias}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml b/src/main/resources/context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml
index 710c621..12f19cd 100644
--- a/src/main/resources/context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml
+++ b/src/main/resources/context/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for WSS4J password digest interceptor to be used on both the endpoint and the
-        client.
+   <description>
+      Context for WSS4J password digest interceptor to be used on both the endpoint
+      and the client.
 
-         A user details service is used for validating the credentials.
-    </description>
+      A user details service is used for validating the credentials.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="securementActions" value="${security.actions}" />
-        <property name="securementUsername" value="${security.credentials.user}" />
-        <property name="securementPassword" value="${security.credentials.password}" />
-        <property name="securementPasswordType" value="${security.credentials.password.type}" />
-        <property name="validationActions" value="${security.actions}" />
-        <property name="validationCallbackHandler" ref="validationCallbackHandler" />
-        <property name="secureResponse" value="false" />
-        <property name="validateResponse" value="false" />
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="securementActions" value="${security.actions}" />
+      <property name="securementUsername" value="${security.credentials.user}" />
+      <property name="securementPassword" value="${security.credentials.password}" />
+      <property name="securementPasswordType" value="${security.credentials.password.type}" />
+      <property name="validationActions" value="${security.actions}" />
+      <property name="validationCallbackHandler" ref="validationCallbackHandler" />
+      <property name="secureResponse" value="false" />
+      <property name="validateResponse" value="false" />
+   </bean>
 
-    <!-- Password validation callback handler -->
-    <bean id="validationCallbackHandler" class="${callbackHandler.validation.password.class}">
-        <property name="userDetailsService" ref="userDetailsService" />
-    </bean>
+   <!-- Password validation callback handler -->
+   <bean id="validationCallbackHandler" class="${callbackHandler.validation.password.class}">
+      <property name="userDetailsService" ref="userDetailsService" />
+   </bean>
 
-    <!-- Security service -->
-    <bean id="userDetailsService" class="${service.userDetails.class}" />
+   <!-- Security service -->
+   <bean id="userDetailsService" class="${service.userDetails.class}" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml b/src/main/resources/context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml
index 0265f20..5e176f8 100644
--- a/src/main/resources/context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml
+++ b/src/main/resources/context/interceptor/password/digest/xwss/interceptor-password-digest-xwss.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for XWSS password digest authentication interceptor to be used on both
-        the endpoint and the client.
+   <description>
+      Context for XWSS password digest authentication interceptor to be used on
+      both the endpoint and the client.
 
-        A user details service is used for validating the credentials.
-    </description>
+      A user details service is used for validating the credentials.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="policyConfiguration" value="${security.file.path}" />
-        <property name="callbackHandlers">
-            <list>
-                <ref bean="validationCallbackHandler" />
-            </list>
-        </property>
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="policyConfiguration" value="${security.file.path}" />
+      <property name="callbackHandlers">
+         <list>
+            <ref bean="validationCallbackHandler" />
+         </list>
+      </property>
+   </bean>
 
-    <!-- Validation callback handler -->
-    <bean id="validationCallbackHandler" class="${callbackHandler.validation.password.class}">
-        <property name="userDetailsService" ref="userDetailsService" />
-    </bean>
+   <!-- Validation callback handler -->
+   <bean id="validationCallbackHandler" class="${callbackHandler.validation.password.class}">
+      <property name="userDetailsService" ref="userDetailsService" />
+   </bean>
 
-    <!-- Security service -->
-    <bean id="userDetailsService" class="${service.userDetails.class}" />
+   <!-- Security service -->
+   <bean id="userDetailsService" class="${service.userDetails.class}" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml b/src/main/resources/context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml
index 9e4f3c0..087475c 100644
--- a/src/main/resources/context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml
+++ b/src/main/resources/context/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for WSS4J plain password interceptor to be used on both the endpoint and the
-        client.
+   <description>
+      Context for WSS4J plain password interceptor to be used on both the endpoint
+      and the client.
 
-        A user details service is used for validating the credentials.
-    </description>
+      A user details service is used for validating the credentials.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="securementActions" value="${security.actions}" />
-        <property name="securementUsername" value="${security.credentials.user}" />
-        <property name="securementPassword" value="${security.credentials.password}" />
-        <property name="securementPasswordType" value="${security.credentials.password.type}" />
-        <property name="validationActions" value="${security.actions}" />
-        <property name="validationCallbackHandler" ref="validationHandler" />
-        <property name="secureResponse" value="false" />
-        <property name="validateResponse" value="false" />
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="securementActions" value="${security.actions}" />
+      <property name="securementUsername" value="${security.credentials.user}" />
+      <property name="securementPassword" value="${security.credentials.password}" />
+      <property name="securementPasswordType" value="${security.credentials.password.type}" />
+      <property name="validationActions" value="${security.actions}" />
+      <property name="validationCallbackHandler" ref="validationHandler" />
+      <property name="secureResponse" value="false" />
+      <property name="validateResponse" value="false" />
+   </bean>
 
-    <!-- Password validation callback handler -->
-    <bean id="validationHandler" class="${callbackHandler.validation.password.class}">
-        <property name="userDetailsService" ref="userDetailsService" />
-    </bean>
+   <!-- Password validation callback handler -->
+   <bean id="validationHandler" class="${callbackHandler.validation.password.class}">
+      <property name="userDetailsService" ref="userDetailsService" />
+   </bean>
 
-    <!-- Security service -->
-    <bean id="userDetailsService" class="${service.userDetails.class}" />
+   <!-- Security service -->
+   <bean id="userDetailsService" class="${service.userDetails.class}" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml b/src/main/resources/context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml
index e2b84e3..f40fb62 100644
--- a/src/main/resources/context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml
+++ b/src/main/resources/context/interceptor/password/plain/xwss/interceptor-password-plain-xwss.xml
@@ -1,50 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
-
-    <description>
-        Context for XWSS plain password interceptor to be used on both the endpoint and the
-        client.
-
-        A user details service is used for validating the credentials.
-    </description>
-
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="policyConfiguration" value="${security.file.path}" />
-        <property name="callbackHandlers">
-            <list>
-                <ref bean="validationHandler" />
-            </list>
-        </property>
-    </bean>
-
-    <!-- Validation callback handler -->
-    <bean id="validationHandler" class="${callbackHandler.validation.password.class}">
-        <property name="authenticationManager" ref="authenticationManager"/>
-    </bean>
-
-    <!-- Provider manager -->
-    <bean id="authenticationManager" class="${authentication.manager.class}">
-        <constructor-arg>
-            <list>
-                <ref bean="authenticationProvider" />
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <!-- Authentication Provider -->
-    <bean id="authenticationProvider" class="${authentication.provider.class}">
-        <property name="userDetailsService" ref="userDetailsService" />
-    </bean>
-
-    <!-- Security service -->
-    <bean id="userDetailsService" class="${service.userDetails.class}" />
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+   <description>
+      Context for XWSS plain password interceptor to be used on both the endpoint
+      and the client.
+
+      A user details service is used for validating the credentials.
+   </description>
+
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="policyConfiguration" value="${security.file.path}" />
+      <property name="callbackHandlers">
+         <list>
+            <ref bean="validationHandler" />
+         </list>
+      </property>
+   </bean>
+
+   <!-- Validation callback handler -->
+   <bean id="validationHandler" class="${callbackHandler.validation.password.class}">
+      <property name="authenticationManager" ref="authenticationManager" />
+   </bean>
+
+   <!-- Provider manager -->
+   <bean id="authenticationManager" class="${authentication.manager.class}">
+      <constructor-arg>
+         <list>
+            <ref bean="authenticationProvider" />
+         </list>
+      </constructor-arg>
+   </bean>
+
+   <!-- Authentication Provider -->
+   <bean id="authenticationProvider" class="${authentication.provider.class}">
+      <property name="userDetailsService" ref="userDetailsService" />
+   </bean>
+
+   <!-- Security service -->
+   <bean id="userDetailsService" class="${service.userDetails.class}" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml b/src/main/resources/context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml
index ebb3eba..b9a36ce 100644
--- a/src/main/resources/context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml
+++ b/src/main/resources/context/interceptor/signature/wss4j/interceptor-signature-wss4j.xml
@@ -1,37 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <description>
-        Context for WSS4J signature-based interceptor to be used on both the endpoint and the
-        client.
+   <description>
+      Context for WSS4J signature-based interceptor to be used on both the endpoint
+      and the client.
 
-        A normal key store and a WSS4J one are required for this to work, such as the
-        ones provided by the key stores context files.
-    </description>
+      A normal key store and a WSS4J one are required for this to work, such
+      as the ones provided by the key stores context files.
+   </description>
 
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="securementActions" value="${security.actions}" />
-        <property name="securementUsername" value="${keystore.alias}" />
-        <property name="securementPassword" value="${keystore.password}" />
-        <property name="securementSignatureCrypto" ref="keyStoreWSS4J" />
-        <property name="validationActions" value="${security.actions}" />
-        <property name="validationSignatureCrypto" ref="keyStoreWSS4J" />
-        <property name="validationCallbackHandler" ref="keystoreCallbackHandler" />
-        <property name="secureResponse" value="false" />
-        <property name="validateResponse" value="false" />
-    </bean>
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="securementActions" value="${security.actions}" />
+      <property name="securementUsername" value="${keystore.alias}" />
+      <property name="securementPassword" value="${keystore.password}" />
+      <property name="securementSignatureCrypto" ref="keyStoreWSS4J" />
+      <property name="validationActions" value="${security.actions}" />
+      <property name="validationSignatureCrypto" ref="keyStoreWSS4J" />
+      <property name="validationCallbackHandler" ref="keystoreCallbackHandler" />
+      <property name="secureResponse" value="false" />
+      <property name="validateResponse" value="false" />
+   </bean>
 
-    <!-- Key store callback handler -->
-    <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
-        <property name="privateKeyPassword" value="${keystore.password}" />
-    </bean>
+   <!-- Key store callback handler -->
+   <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
+      <property name="privateKeyPassword" value="${keystore.password}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/interceptor/signature/xwss/interceptor-signature-xwss.xml b/src/main/resources/context/interceptor/signature/xwss/interceptor-signature-xwss.xml
index 617a60e..1cb7863 100644
--- a/src/main/resources/context/interceptor/signature/xwss/interceptor-signature-xwss.xml
+++ b/src/main/resources/context/interceptor/signature/xwss/interceptor-signature-xwss.xml
@@ -1,65 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/web-services
-                        http://www.springframework.org/schema/web-services/web-services.xsd">
-
-    <description>
-        Context for XWSS signature-based interceptor to be used on both the endpoint and the
-        client.
-
-        A key store is required for this to work, such as the ones provided by the key
-        stores context file.
-    </description>
-
-    <!-- Security interceptor -->
-    <bean id="securityInterceptor" class="${interceptor.security.class}">
-        <property name="policyConfiguration" value="${security.file.path}" />
-        <property name="callbackHandlers">
-            <list>
-                <ref bean="keystoreCallbackHandler" />
-                <!-- <ref bean="certificateHandler" /> -->
-            </list>
-        </property>
-    </bean>
-
-    <!-- Key store callback handler -->
-    <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
-        <property name="keyStore" ref="keyStore" />
-        <property name="trustStore" ref="trustStore" />
-        <property name="privateKeyPassword" value="${keystore.password}" />
-        <property name="defaultAlias" value="${keystore.alias}" />
-    </bean>
-
-    <!-- Certificate callback handler -->
-    <bean id="certificateHandler" class="${callbackHandler.validation.certificate.class}">
-        <property name="authenticationManager" ref="authenticationManager" />
-    </bean>
-
-    <!-- Authentication Manager -->
-    <bean id="authenticationManager" class="${authentication.manager.class}">
-        <constructor-arg>
-            <list>
-                <ref bean="authenticationProvider" />
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <!-- Authentication Provider -->
-    <bean id="authenticationProvider" class="${authentication.provider.class}">
-        <property name="x509AuthoritiesPopulator" ref="authPopulator" />
-    </bean>
-
-    <!-- X509 authorities populator -->
-    <bean id="authPopulator" class="${authentication.provider.populator.class}">
-        <property name="userDetailsService" ref="userDetailsService" />
-    </bean>
-
-    <!-- Security service -->
-    <bean id="userDetailsService" class="${service.userDetails.class}" />
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sws="http://www.springframework.org/schema/web-services"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+   <description>
+      Context for XWSS signature-based interceptor to be used on both the endpoint
+      and the client.
+
+      A key store is required for this to work, such as the ones provided by
+      the key stores context file.
+   </description>
+
+   <!-- Security interceptor -->
+   <bean id="securityInterceptor" class="${interceptor.security.class}">
+      <property name="policyConfiguration" value="${security.file.path}" />
+      <property name="callbackHandlers">
+         <list>
+            <ref bean="keystoreCallbackHandler" />
+            <!-- <ref bean="certificateHandler" /> -->
+         </list>
+      </property>
+   </bean>
+
+   <!-- Key store callback handler -->
+   <bean id="keystoreCallbackHandler" class="${callbackHandler.validation.keystore.class}">
+      <property name="keyStore" ref="keyStore" />
+      <property name="trustStore" ref="trustStore" />
+      <property name="privateKeyPassword" value="${keystore.password}" />
+      <property name="defaultAlias" value="${keystore.alias}" />
+   </bean>
+
+   <!-- Certificate callback handler -->
+   <bean id="certificateHandler" class="${callbackHandler.validation.certificate.class}">
+      <property name="authenticationManager" ref="authenticationManager" />
+   </bean>
+
+   <!-- Authentication Manager -->
+   <bean id="authenticationManager" class="${authentication.manager.class}">
+      <constructor-arg>
+         <list>
+            <ref bean="authenticationProvider" />
+         </list>
+      </constructor-arg>
+   </bean>
+
+   <!-- Authentication Provider -->
+   <bean id="authenticationProvider" class="${authentication.provider.class}">
+      <property name="x509AuthoritiesPopulator" ref="authPopulator" />
+   </bean>
+
+   <!-- X509 authorities populator -->
+   <bean id="authPopulator" class="${authentication.provider.populator.class}">
+      <property name="userDetailsService" ref="userDetailsService" />
+   </bean>
+
+   <!-- Security service -->
+   <bean id="userDetailsService" class="${service.userDetails.class}" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/keystore/keystore-wss4j.xml b/src/main/resources/context/keystore/keystore-wss4j.xml
index fb50edb..ef76fbd 100644
--- a/src/main/resources/context/keystore/keystore-wss4j.xml
+++ b/src/main/resources/context/keystore/keystore-wss4j.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   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">
 
-    <description>
-        Context for the WSS4J key stores.
-    </description>
+   <description>
+      Context for the WSS4J key stores.
+   </description>
 
-    <!-- Key store -->
-    <bean id="keyStoreWSS4J" class="${keystore.wss4j.class}">
-        <property name="keyStoreLocation" value="${keystore.path}" />
-        <property name="keyStorePassword" value="${keystore.password}" />
-    </bean>
+   <!-- Key store -->
+   <bean id="keyStoreWSS4J" class="${keystore.wss4j.class}">
+      <property name="keyStoreLocation" value="${keystore.path}" />
+      <property name="keyStorePassword" value="${keystore.password}" />
+   </bean>
 
-    <!-- Symmetric store -->
-    <bean id="symmetricStoreWSS4J" class="${keystore.wss4j.class}">
-        <property name="keyStoreLocation" value="${symmetricstore.path}" />
-        <property name="keyStorePassword" value="${symmetricstore.password}" />
-        <property name="keyStoreType" value="${symmetricstore.type}" />
-    </bean>
+   <!-- Symmetric store -->
+   <bean id="symmetricStoreWSS4J" class="${keystore.wss4j.class}">
+      <property name="keyStoreLocation" value="${symmetricstore.path}" />
+      <property name="keyStorePassword" value="${symmetricstore.password}" />
+      <property name="keyStoreType" value="${symmetricstore.type}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/keystore/keystore.xml b/src/main/resources/context/keystore/keystore.xml
index 1fb06ec..7b4d3a1 100644
--- a/src/main/resources/context/keystore/keystore.xml
+++ b/src/main/resources/context/keystore/keystore.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   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">
 
-    <description>
-        Context for the key stores.
-    </description>
+   <description>
+      Context for the key stores.
+   </description>
 
-    <!-- Key store -->
-    <bean id="keyStore" class="${keystore.class}">
-        <property name="location" value="${keystore.path}" />
-        <property name="password" value="${keystore.password}" />
-    </bean>
+   <!-- Key store -->
+   <bean id="keyStore" class="${keystore.class}">
+      <property name="location" value="${keystore.path}" />
+      <property name="password" value="${keystore.password}" />
+   </bean>
 
-    <!-- Trust store -->
-    <bean id="trustStore" class="${keystore.class}">
-        <property name="location" value="${truststore.path}" />
-        <property name="password" value="${truststore.password}" />
-    </bean>
+   <!-- Trust store -->
+   <bean id="trustStore" class="${keystore.class}">
+      <property name="location" value="${truststore.path}" />
+      <property name="password" value="${truststore.password}" />
+   </bean>
 
-    <!-- Symmetric store -->
-    <bean id="symmetricStore" class="${keystore.class}">
-        <property name="location" value="${symmetricstore.path}" />
-        <property name="password" value="${symmetricstore.password}" />
-        <property name="type" value="${symmetricstore.type}" />
-    </bean>
+   <!-- Symmetric store -->
+   <bean id="symmetricStore" class="${keystore.class}">
+      <property name="location" value="${symmetricstore.path}" />
+      <property name="password" value="${symmetricstore.password}" />
+      <property name="type" value="${symmetricstore.type}" />
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/persistence.xml b/src/main/resources/context/persistence.xml
index 35bb83e..b7257d7 100644
--- a/src/main/resources/context/persistence.xml
+++ b/src/main/resources/context/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-    xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/util
                         http://www.springframework.org/schema/util/spring-util.xsd
@@ -11,70 +11,71 @@
                         http://www.springframework.org/schema/data/jpa
                         http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
 
-    <description>
-        Persistence layer context. Contains all the classes which handle the
-        persistence and data access layers for the web services.
+   <description>
+      Persistence layer context. Contains all the classes which handle the
+      persistence and data access layers for the web services.
 
-        Contains all the classes which handle the persistence and data access
-        layers for the web services and is meant to be shared between them.
-    </description>
+      Contains all the classes which handle the persistence and data access
+      layers for the web services and is meant to be shared between them.
+   </description>
 
-    <!-- Scans for repositories -->
-    <jpa:repositories base-package="com.wandrell.example.swss.repository" />
+   <!-- Scans for repositories -->
+   <jpa:repositories base-package="com.wandrell.example.swss.repository" />
 
-    <!-- ================================== JPA ================================== -->
+   <!-- ================================== JPA ================================== -->
 
-    <!-- JPA EntityManagerFactory -->
-    <bean id="entityManagerFactory" class="${jpa.entityManagerFactory.class}">
-        <property name="jpaVendorAdapter" ref="jpaAdapter" />
-        <property name="dataSource" ref="dataSource" />
-        <property name="persistenceUnitName" value="${jpa.persistenceUnitName}" />
-        <property name="packagesToScan" value="${jpa.packagesToScan}" />
-        <property name="jpaProperties" ref="jpaProperties" />
-    </bean>
+   <!-- JPA EntityManagerFactory -->
+   <bean id="entityManagerFactory"
+      class="${jpa.entityManagerFactory.class}">
+      <property name="jpaVendorAdapter" ref="jpaAdapter" />
+      <property name="dataSource" ref="dataSource" />
+      <property name="persistenceUnitName" value="${jpa.persistenceUnitName}" />
+      <property name="packagesToScan" value="${jpa.packagesToScan}" />
+      <property name="jpaProperties" ref="jpaProperties" />
+   </bean>
 
-    <!-- JPA Adapter -->
-    <bean id="jpaAdapter" class="${jpa.adapter.class}">
-        <property name="database" value="${jpa.database}" />
-        <property name="showSql" value="${jpa.showSql}" />
-    </bean>
+   <!-- JPA Adapter -->
+   <bean id="jpaAdapter" class="${jpa.adapter.class}">
+      <property name="database" value="${jpa.database}" />
+      <property name="showSql" value="${jpa.showSql}" />
+   </bean>
 
-    <!-- Entity manager -->
-    <bean id="entityManager" class="${jpa.entityManager.class}">
-        <property name="entityManagerFactory" ref="entityManagerFactory" />
-    </bean>
+   <!-- Entity manager -->
+   <bean id="entityManager" class="${jpa.entityManager.class}">
+      <property name="entityManagerFactory" ref="entityManagerFactory" />
+   </bean>
 
-    <!-- JPA Properties -->
-    <util:map id="jpaProperties">
-        <entry key="hibernate.dialect" value="${hibernate.dialect}" />
-        <entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}" />
-        <entry key="hibernate.ejb.naming_strategy" value="${hibernate.namingStrategy}" />
-        <entry key="hibernate.show_sql" value="${jpa.showSql}" />
-        <entry key="hibernate.format_sql" value="${hibernate.format_sql}" />
-        <entry key="hibernate.cache.use_second_level_cache" value="${hibernate.cache.use_second_level_cache}" />
-        <entry key="hibernate.cache.use_query_cache" value="${hibernate.cache.use_query_cache}" />
-        <entry key="hibernate.cache.region.factory_class" value="${hibernate.cache.region.factory_class}" />
-    </util:map>
+   <!-- JPA Properties -->
+   <util:map id="jpaProperties">
+      <entry key="hibernate.dialect" value="${hibernate.dialect}" />
+      <entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}" />
+      <entry key="hibernate.ejb.naming_strategy" value="${hibernate.namingStrategy}" />
+      <entry key="hibernate.show_sql" value="${jpa.showSql}" />
+      <entry key="hibernate.format_sql" value="${hibernate.format_sql}" />
+      <entry key="hibernate.cache.use_second_level_cache" value="${hibernate.cache.use_second_level_cache}" />
+      <entry key="hibernate.cache.use_query_cache" value="${hibernate.cache.use_query_cache}" />
+      <entry key="hibernate.cache.region.factory_class" value="${hibernate.cache.region.factory_class}" />
+   </util:map>
 
-    <!-- Transaction manager -->
-    <bean id="transactionManager" class="${jpa.transactionManager.class}">
-        <property name="entityManagerFactory" ref="entityManagerFactory" />
-    </bean>
+   <!-- Transaction manager -->
+   <bean id="transactionManager" class="${jpa.transactionManager.class}">
+      <property name="entityManagerFactory" ref="entityManagerFactory" />
+   </bean>
 
-    <!-- ============================== DATASOURCE =============================== -->
+   <!-- ============================== DATASOURCE =============================== -->
 
-    <!-- Data source -->
-    <bean id="dataSource" class="${jdbc.dataSource.class}">
-        <property name="driverClassName" value="${jdbc.driver}" />
-        <property name="jdbcUrl" value="${jdbc.url}" />
-        <property name="username" value="${jdbc.username}" />
-        <property name="password" value="${jdbc.password}" />
-    </bean>
+   <!-- Data source -->
+   <bean id="dataSource" class="${jdbc.dataSource.class}">
+      <property name="driverClassName" value="${jdbc.driver}" />
+      <property name="jdbcUrl" value="${jdbc.url}" />
+      <property name="username" value="${jdbc.username}" />
+      <property name="password" value="${jdbc.password}" />
+   </bean>
 
-    <!-- Database initializer -->
-    <jdbc:initialize-database data-source="dataSource">
-        <jdbc:script location="${jdbc.initLocation}" />
-        <jdbc:script location="${jdbc.dataLocation}" />
-    </jdbc:initialize-database>
+   <!-- Database initializer -->
+   <jdbc:initialize-database data-source="dataSource">
+      <jdbc:script location="${jdbc.initLocation}" />
+      <jdbc:script location="${jdbc.dataLocation}" />
+   </jdbc:initialize-database>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/service.xml b/src/main/resources/context/service.xml
index 4da485a..f2ee8f9 100644
--- a/src/main/resources/context/service.xml
+++ b/src/main/resources/context/service.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Service layer context.
+   <description>
+      Service layer context.
 
-        Contains all the services required by the web services and is meant to be shared
-        between them.
-    </description>
+      Contains all the services required by the web services and is meant to be
+      shared between them.
+   </description>
 
-    <!-- Scans for data access services -->
-    <context:component-scan base-package="com.wandrell.example.swss.service.domain" />
+   <!-- Scans for data access services -->
+   <context:component-scan base-package="com.wandrell.example.swss.service.domain" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/encryption/wss4j/servlet-encryption-wss4j.xml b/src/main/resources/context/servlet/encryption/wss4j/servlet-encryption-wss4j.xml
index f23a0ed..7990399 100644
--- a/src/main/resources/context/servlet/encryption/wss4j/servlet-encryption-wss4j.xml
+++ b/src/main/resources/context/servlet/encryption/wss4j/servlet-encryption-wss4j.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the encryption protected servlet using WSS4J.
-    </description>
+   <description>
+      Context for the encryption protected servlet using WSS4J.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/encryption/wss4j/interceptor-encryption-wss4j.properties, classpath:config/endpoint/encryption/wss4j/endpoint-encryption-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/encryption/wss4j/interceptor-encryption-wss4j.properties, classpath:config/endpoint/encryption/wss4j/endpoint-encryption-wss4j.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/encryption/wss4j/endpoint-encryption-wss4j.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/encryption/xwss/servlet-encryption-xwss.xml b/src/main/resources/context/servlet/encryption/xwss/servlet-encryption-xwss.xml
index b4c55a3..85447bb 100644
--- a/src/main/resources/context/servlet/encryption/xwss/servlet-encryption-xwss.xml
+++ b/src/main/resources/context/servlet/encryption/xwss/servlet-encryption-xwss.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the encryption protected servlet using XWSS.
-    </description>
+   <description>
+      Context for the encryption protected servlet using XWSS.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/encryption/xwss/interceptor-encryption-xwss.properties, classpath:config/endpoint/encryption/xwss/endpoint-encryption-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/encryption/xwss/interceptor-encryption-xwss.properties, classpath:config/endpoint/encryption/xwss/endpoint-encryption-xwss.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/encryption/xwss/endpoint-encryption-xwss.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/password/digest/wss4j/servlet-password-digest-wss4j.xml b/src/main/resources/context/servlet/password/digest/wss4j/servlet-password-digest-wss4j.xml
index 7531a70..1c1c59b 100644
--- a/src/main/resources/context/servlet/password/digest/wss4j/servlet-password-digest-wss4j.xml
+++ b/src/main/resources/context/servlet/password/digest/wss4j/servlet-password-digest-wss4j.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the password protected servlet using WSS4J.
-    </description>
+   <description>
+      Context for the password protected servlet using WSS4J.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties, classpath:config/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties, classpath:config/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/password/digest/wss4j/endpoint-password-digest-wss4j.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/password/digest/xwss/servlet-password-digest-xwss.xml b/src/main/resources/context/servlet/password/digest/xwss/servlet-password-digest-xwss.xml
index 62cb6ed..6ceda3f 100644
--- a/src/main/resources/context/servlet/password/digest/xwss/servlet-password-digest-xwss.xml
+++ b/src/main/resources/context/servlet/password/digest/xwss/servlet-password-digest-xwss.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the password protected servlet using XWSS.
-    </description>
+   <description>
+      Context for the password protected servlet using XWSS.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/digest/xwss/interceptor-password-digest-xwss.properties, classpath:config/endpoint/password/digest/xwss/endpoint-password-digest-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/digest/xwss/interceptor-password-digest-xwss.properties, classpath:config/endpoint/password/digest/xwss/endpoint-password-digest-xwss.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/password/digest/xwss/endpoint-password-digest-xwss.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/password/plain/wss4j/servlet-password-plain-wss4j.xml b/src/main/resources/context/servlet/password/plain/wss4j/servlet-password-plain-wss4j.xml
index 0228cc7..f4fd8a3 100644
--- a/src/main/resources/context/servlet/password/plain/wss4j/servlet-password-plain-wss4j.xml
+++ b/src/main/resources/context/servlet/password/plain/wss4j/servlet-password-plain-wss4j.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the password protected servlet using WSS4J.
-    </description>
+   <description>
+      Context for the password protected servlet using WSS4J.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.properties, classpath:config/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.properties, classpath:config/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/password/plain/wss4j/endpoint-password-plain-wss4j.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/password/plain/xwss/servlet-password-plain-xwss.xml b/src/main/resources/context/servlet/password/plain/xwss/servlet-password-plain-xwss.xml
index 0ff99e8..fd50ebc 100644
--- a/src/main/resources/context/servlet/password/plain/xwss/servlet-password-plain-xwss.xml
+++ b/src/main/resources/context/servlet/password/plain/xwss/servlet-password-plain-xwss.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the password protected servlet using XWSS.
-    </description>
+   <description>
+      Context for the password protected servlet using XWSS.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/plain/xwss/interceptor-password-plain-xwss.properties, classpath:config/endpoint/password/plain/xwss/endpoint-password-plain-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/password/plain/xwss/interceptor-password-plain-xwss.properties, classpath:config/endpoint/password/plain/xwss/endpoint-password-plain-xwss.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/password/plain/xwss/endpoint-password-plain-xwss.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/servlet-unsecure.xml b/src/main/resources/context/servlet/servlet-unsecure.xml
index 992ddb6..52aa355 100644
--- a/src/main/resources/context/servlet/servlet-unsecure.xml
+++ b/src/main/resources/context/servlet/servlet-unsecure.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the unsecure servlet.
-    </description>
+   <description>
+      Context for the unsecure servlet.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/endpoint/endpoint.properties, classpath:config/endpoint/endpoint-unsecure.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/endpoint/endpoint.properties, classpath:config/endpoint/endpoint-unsecure.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/endpoint-unsecure.xml" />
+   <!-- Imports -->
+   <import resource="classpath:context/endpoint/endpoint-unsecure.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/signature/wss4j/servlet-signature-wss4j.xml b/src/main/resources/context/servlet/signature/wss4j/servlet-signature-wss4j.xml
index 68f36ea..3231a6b 100644
--- a/src/main/resources/context/servlet/signature/wss4j/servlet-signature-wss4j.xml
+++ b/src/main/resources/context/servlet/signature/wss4j/servlet-signature-wss4j.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the signature protected servlet using WSS4J.
-    </description>
+   <description>
+      Context for the signature protected servlet using WSS4J.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/signature/wss4j/interceptor-signature-wss4j.properties, classpath:config/endpoint/signature/wss4j/endpoint-signature-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/signature/wss4j/interceptor-signature-wss4j.properties, classpath:config/endpoint/signature/wss4j/endpoint-signature-wss4j.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/signature/wss4j/endpoint-signature-wss4j.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/servlet/signature/xwss/servlet-signature-xwss.xml b/src/main/resources/context/servlet/signature/xwss/servlet-signature-xwss.xml
index c8708e0..d3d3cbb 100644
--- a/src/main/resources/context/servlet/signature/xwss/servlet-signature-xwss.xml
+++ b/src/main/resources/context/servlet/signature/xwss/servlet-signature-xwss.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Context for the signature protected servlet using XWSS.
-    </description>
+   <description>
+      Context for the signature protected servlet using XWSS.
+   </description>
 
-    <!-- Scans for endpoints -->
-    <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
+   <!-- Scans for endpoints -->
+   <context:component-scan base-package="com.wandrell.example.swss.endpoint" />
 
-    <!-- Properties -->
-    <context:property-placeholder
-        location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/signature/xwss/interceptor-signature-xwss.properties, classpath:config/endpoint/signature/xwss/endpoint-signature-xwss.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/keystore/keystore.properties, classpath:config/endpoint/endpoint.properties, classpath:config/interceptor/signature/xwss/interceptor-signature-xwss.properties, classpath:config/endpoint/signature/xwss/endpoint-signature-xwss.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/endpoint/signature/xwss/endpoint-signature-xwss.xml" />
+   <!-- Imports -->
+   <import
+      resource="classpath:context/endpoint/signature/xwss/endpoint-signature-xwss.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/context/webService.xml b/src/main/resources/context/webService.xml
index b0a90c7..bf203e7 100644
--- a/src/main/resources/context/webService.xml
+++ b/src/main/resources/context/webService.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <description>
-        Global application context for the web service.
+   <description>
+      Global application context for the web service.
 
-        This is shared by all the servlets.
-    </description>
+      This is shared by all the servlets.
+   </description>
 
-    <!-- Properties -->
-    <context:property-placeholder location="classpath:config/persistence.properties, classpath:config/keystore/keystore.properties, classpath:config/keystore/keystore-wss4j.properties" />
+   <!-- Properties -->
+   <context:property-placeholder
+      location="classpath:config/persistence.properties, classpath:config/keystore/keystore.properties, classpath:config/keystore/keystore-wss4j.properties" />
 
-    <!-- Imports -->
-    <import resource="classpath:context/persistence.xml" />
-    <import resource="classpath:context/service.xml" />
-    <import resource="classpath:context/keystore/keystore.xml" />
-    <import resource="classpath:context/keystore/keystore-wss4j.xml" />
+   <!-- Imports -->
+   <import resource="classpath:context/persistence.xml" />
+   <import resource="classpath:context/service.xml" />
+   <import resource="classpath:context/keystore/keystore.xml" />
+   <import resource="classpath:context/keystore/keystore-wss4j.xml" />
 
 </beans>
\ No newline at end of file

From 4c74b8afc401d79b17c0980f082b731594ce325a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 24 May 2016 16:26:11 +0200
Subject: [PATCH 5/9] Updated base POM.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbe7df4..0325d85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.wandrell.maven</groupId>
         <artifactId>base-pom</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <!-- ********************************************** -->

From 00669a163b89aa67f317be0af82b2d579bf5c1be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 31 May 2016 08:37:45 +0200
Subject: [PATCH 6/9] Updated Maven skin.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0325d85..82952a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,7 +252,7 @@
         <plugin.site.velocity.version>1.7</plugin.site.velocity.version>
         <plugin.war.version>2.6</plugin.war.version>
         <!-- Maven Site -->
-        <site.skin.version>0.2.4</site.skin.version>
+        <site.skin.version>0.3.0</site.skin.version>
         <!-- Testing server -->
         <server.test.path>/swss</server.test.path>
     </properties>

From 7df9ddf78ec4dc5367434b642a5adf003f82136d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 31 May 2016 21:27:36 +0200
Subject: [PATCH 7/9] Raised version.

---
 pom.xml                 | 2 +-
 src/changes/changes.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0325d85..7a197d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>com.wandrell.example</groupId>
     <artifactId>swss-soap-example</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>Spring Web Services WS-Security Example</name>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8f0759c..82f0cc9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -70,5 +70,10 @@
             The readme description has been rewritten.
          </action>
       </release>
+      <release version="1.1.2" date="2016-05-31" description="Updated Maven Skin">
+         <action dev="bmg" type="update">
+            Updated the Maven Skin.
+         </action>
+      </release>
    </body>
 </document>
\ No newline at end of file

From 89b4f09a3134e7e1a1c65fb383f63598b8937c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 31 May 2016 21:30:14 +0200
Subject: [PATCH 8/9] Updated dependencies.

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 512d301..9a9e506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@
         <ehcache.version>2.10.2</ehcache.version>
         <freemarker.version>2.3.23</freemarker.version>
         <guava.version>19.0</guava.version>
-        <h2.version>1.4.191</h2.version>
+        <h2.version>1.4.192</h2.version>
         <hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
         <hibernate.version>5.1.0.Final</hibernate.version>
         <hikari.version>2.4.6</hikari.version>
@@ -226,8 +226,8 @@
         <javax.stax.api.version>1.0-2</javax.stax.api.version>
         <jaxb.api.version>2.2.12</jaxb.api.version>
         <jaxb.version>2.2.11</jaxb.version>
-        <joda.time.version>2.9.3</joda.time.version>
-        <log4j.version>2.5</log4j.version>
+        <joda.time.version>2.9.4</joda.time.version>
+        <log4j.version>2.6</log4j.version>
         <mockito.version>1.10.19</mockito.version>
         <saaj.api.version>1.3.5</saaj.api.version>
         <saaj.impl.version>1.3.25</saaj.impl.version>
@@ -248,7 +248,7 @@
         <plugin.buildhelp.version>1.10</plugin.buildhelp.version>
         <plugin.changes.version>2.12</plugin.changes.version>
         <plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
-        <plugin.jetty.version>9.1.5.v20140505</plugin.jetty.version>
+        <plugin.jetty.version>9.1.6.v20160112</plugin.jetty.version>
         <plugin.site.velocity.version>1.7</plugin.site.velocity.version>
         <plugin.war.version>2.6</plugin.war.version>
         <!-- Maven Site -->

From a37a888bfde7993fd43c1ccf214d683580a8e12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?=
 <programming@wandrell.com>
Date: Tue, 31 May 2016 21:34:50 +0200
Subject: [PATCH 9/9] Release.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a9e506..97a0ee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>com.wandrell.example</groupId>
     <artifactId>swss-soap-example</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <packaging>war</packaging>
 
     <name>Spring Web Services WS-Security Example</name>