Merge pull request #33 from Bernardo-MG/merge_master

Merge master

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>
 
     <!-- ********************************************** -->
@@ -20,11 +20,11 @@
 
     <groupId>com.wandrell.example</groupId>
     <artifactId>swss-soap-example</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <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>
 
@@ -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,11 +248,11 @@
         <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 -->
-        <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>

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>

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>

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>

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>

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>

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>

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>