Merge pull request #34 from Bernardo-MG/merge_master

Merge master
Bernardo-MG · Jun 3, 2016 · 0996e4f · 0996e4f
2 parents 0c20e76 + eac4d7a
commit 0996e4f
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>com.wandrell.example</groupId>
     <artifactId>swss-soap-example</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <packaging>war</packaging>
 
     <name>Spring Web Services WS-Security Example</name>

diff --git a/readme.md b/readme.md
@@ -93,25 +93,15 @@ With this, by running the project the following endpoints are mapped each to the
 
 |Authentication method|WSS Implementation|URL|
 |:-:|:-:|:-:|
-|None|None|[http://localhost:8080/swss/unsecure/entities](http://localhost:8080/swss/unsecure/entities)|
-|Plain Password|XWSS|[http://localhost:8080/swss/password/plain/xwss/entities](http://localhost:8080/swss/password/plain/xwss/entities)|
-|Plain Password|WSS4J|[http://localhost:8080/swss/password/plain/wss4j/entities](http://localhost:8080/swss/password/plain/wss4j/entities)|
-|Digested Password|XWSS|[http://localhost:8080/swss/password/digest/xwss/entities](http://localhost:8080/swss/password/digest/xwss/entities)|
-|Digested Password|WSS4J|[http://localhost:8080/swss/password/digest/wss4j/entities](http://localhost:8080/swss/password/digest/wss4j/entities)|
-|Signature|XWSS|[http://localhost:8080/swss/signature/xwss/entities](http://localhost:8080/swss/signature/xwss/entities)|
-|Signature|WSS4J|[http://localhost:8080/wss4j/signature/xwss/entities](http://localhost:8080/wss4j/signature/xwss/entities)|
-|Encryption|XWSS|[http://localhost:8080/swss/encryption/xwss/entities](http://localhost:8080/swss/encryption/xwss/entities)|
-|Encryption|WSS4J|[http://localhost:8080/wss4j/encryption/xwss/entities](http://localhost:8080/wss4j/encryption/xwss/entities)|
-
-#### WSDL
-
-Each endpoint has their own WSDL file, which can be accessed by just adding the ".wsdl" suffix to the URL.
-
-For example, for the unsecured web service the WSDL URL is as follows:
-
-```
-http://localhost:8080/swss/unsecure/entities.wsdl
-```
+|None|None|[http://localhost:8080/swss/unsecure/entities.wsdl](http://localhost:8080/swss/unsecure/entities.wsdl)|
+|Plain Password|XWSS|[http://localhost:8080/swss/password/plain/xwss/entities.wsdl](http://localhost:8080/swss/password/plain/xwss/entities.wsdl)|
+|Plain Password|WSS4J|[http://localhost:8080/swss/password/plain/wss4j/entities.wsdl](http://localhost:8080/swss/password/plain/wss4j/entities.wsdl)|
+|Digested Password|XWSS|[http://localhost:8080/swss/password/digest/xwss/entities.wsdl](http://localhost:8080/swss/password/digest/xwss/entities.wsdl)|
+|Digested Password|WSS4J|[http://localhost:8080/swss/password/digest/wss4j/entities.wsdl](http://localhost:8080/swss/password/digest/wss4j/entities.wsdl)|
+|Signature|XWSS|[http://localhost:8080/swss/signature/xwss/entities.wsdl](http://localhost:8080/swss/signature/xwss/entities.wsdl)|
+|Signature|WSS4J|[http://localhost:8080/swss/signature/wss4j/entities.wsdl](http://localhost:8080/swss/signature/wss4j/entities.wsdl)|
+|Encryption|XWSS|[http://localhost:8080/swss/encryption/xwss/entities.wsdl](http://localhost:8080/swss/encryption/xwss/entities.wsdl)|
+|Encryption|WSS4J|[http://localhost:8080/swss/encryption/wss4j/entities.wsdl](http://localhost:8080/swss/encryption/wss4j/entities.wsdl)|
 
 ## Collaborate
 

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -75,5 +75,10 @@
             Updated the Maven Skin.
          </action>
       </release>
+      <release version="1.1.3" date="2016-06-03" description="Corrected readme">
+         <action dev="bmg" type="fix">
+            Corrected links in the readme.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/main/java/com/wandrell/example/swss/client/DefaultEntityClient.java b/src/main/java/com/wandrell/example/swss/client/DefaultEntityClient.java
@@ -141,7 +141,8 @@ public final ExampleEntity getEntity(final String uri,
         request.setId(identifier);
 
         // Prepares callback
-        callback = new SoapActionCallback(ExampleEntityEndpointConstants.ACTION);
+        callback = new SoapActionCallback(
+                ExampleEntityEndpointConstants.ACTION);
 
         // Sends request and receives response
         response = (GetEntityResponse) getWebServiceTemplate()

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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" />

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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" />

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
@@ -12,7 +12,8 @@
 
    <!-- Properties -->
    <context:property-placeholder
-      location="classpath:config/client/client.properties, classpath:config/interceptor/password/digest/wss4j/interceptor-password-digest-wss4j.properties" />
+      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" />

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
@@ -12,7 +12,9 @@
 
    <!-- 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" />
+      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" />

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
@@ -12,7 +12,8 @@
 
    <!-- Properties -->
    <context:property-placeholder
-      location="classpath:config/client/client.properties, classpath:config/interceptor/password/plain/wss4j/interceptor-password-plain-wss4j.properties" />
+      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" />

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
@@ -12,7 +12,9 @@
 
    <!-- 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" />
+      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" />

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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" />

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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" />

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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

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
@@ -15,7 +15,9 @@
 
    <!-- 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" />
+      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

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
@@ -15,7 +15,9 @@
 
    <!-- 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" />
+      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

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
@@ -15,7 +15,9 @@
 
    <!-- 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" />
+      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

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
@@ -15,7 +15,9 @@
 
    <!-- 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" />
+      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

diff --git a/src/main/resources/context/servlet/servlet-unsecure.xml b/src/main/resources/context/servlet/servlet-unsecure.xml
@@ -15,7 +15,8 @@
 
    <!-- Properties -->
    <context:property-placeholder
-      location="classpath:config/endpoint/endpoint.properties, classpath:config/endpoint/endpoint-unsecure.properties" />
+      location="classpath:config/endpoint/endpoint.properties, 
+         classpath:config/endpoint/endpoint-unsecure.properties" />
 
    <!-- Imports -->
    <import resource="classpath:context/endpoint/endpoint-unsecure.xml" />

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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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

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
@@ -1,6 +1,6 @@
 <?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"
+<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
@@ -15,7 +15,10 @@
 
    <!-- 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" />
+      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

diff --git a/src/main/resources/context/webService.xml → src/main/resources/context/web-service.xml b/src/main/resources/context/webService.xml → src/main/resources/context/web-service.xml
@@ -1,6 +1,6 @@
 <?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"
+<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
@@ -14,7 +14,9 @@
 
    <!-- Properties -->
    <context:property-placeholder
-      location="classpath:config/persistence.properties, classpath:config/keystore/keystore.properties, classpath:config/keystore/keystore-wss4j.properties" />
+      location="classpath:config/persistence.properties, 
+         classpath:config/keystore/keystore.properties, 
+         classpath:config/keystore/keystore-wss4j.properties" />
 
    <!-- Imports -->
    <import resource="classpath:context/persistence.xml" />

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -12,7 +12,7 @@
 
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:/context/webService.xml</param-value>
+        <param-value>classpath:/context/web-service.xml</param-value>
     </context-param>
 
     <!-- ********************************************** -->

diff --git a/src/test/java/com/wandrell/example/swss/test/util/config/context/ServletContextPaths.java b/src/test/java/com/wandrell/example/swss/test/util/config/context/ServletContextPaths.java
@@ -43,7 +43,7 @@ public final class ServletContextPaths {
      * This is the application context used for real web services, and shared by
      * all the servlets.
      */
-    public static final String APPLICATION        = "classpath:context/webService.xml";
+    public static final String APPLICATION        = "classpath:context/web-service.xml";
 
     /**
      * Mocked application context configuration.