Skip to content

Commit

Permalink
Merge pull request #20 from Bernardo-MG/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
Bernardo-MG authored Feb 7, 2017
2 parents 10090d3 + 29245cf commit 0543d0b
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 251 deletions.
92 changes: 0 additions & 92 deletions .scripts/create-maven-settings.sh

This file was deleted.

42 changes: 0 additions & 42 deletions .scripts/deploy-site.sh

This file was deleted.

36 changes: 0 additions & 36 deletions .scripts/deploy.sh

This file was deleted.

54 changes: 0 additions & 54 deletions .scripts/load-travis-environment.sh

This file was deleted.

17 changes: 1 addition & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,7 @@ jdk:
- oraclejdk8
- oraclejdk7
- openjdk7

before_install:
# Scripts are set as executable
- chmod +x ./.scripts/load-travis-environment.sh
- chmod +x ./.scripts/create-maven-settings.sh
- chmod +x ./.scripts/deploy.sh
- chmod +x ./.scripts/deploy-site.sh
# Prepares CI environment
- source ./.scripts/load-travis-environment.sh
# Creates Maven settings
- ./.scripts/create-maven-settings.sh

script:
# Unit and integration tests are run
- mvn clean verify
after_success:
# Documentation deployment script
- ./.scripts/deploy-site.sh
# Code artifacts deployment script
- ./.scripts/deploy.sh
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.wandrell.example</groupId>
<artifactId>mule-ws-security-soap-example</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<packaging>mule</packaging>

<name>Mule SOAP Web Services WS-Security Example</name>
Expand Down Expand Up @@ -267,7 +267,7 @@
<jaxen.version>1.1.1</jaxen.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
<jcodings.version>1.0.17</jcodings.version>
<jffi.version>1.2.12</jffi.version>
<jffi.version>1.2.14</jffi.version>
<jnr.ffi.version>1.0.4</jnr.ffi.version>
<junit.version>4.12</junit.version>
<log4j.version>2.6.1</log4j.version>
Expand Down
4 changes: 1 addition & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ The endpoint consumer does not support querying for the WSDL, and only accepts t
|Password with SAML|WSDL-First|[http://localhost:8080/mule-wss/cxf/password/saml/wsdl_first?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/wsdl_first?wsdl)|
|Password with SAML|Simple|[http://localhost:8080/mule-wss/cxf/password/saml/simple?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/simple?wsdl)|
|Password with SAML|Proxy|[http://localhost:8080/mule-wss/cxf/password/saml/proxy?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/proxy?wsdl)|
|Password with SAML|Consumer|[http://localhost:8080/mule-wss/consumer/password/saml](http://localhost:8080/mule-wss/consumer/password/saml)|
|Signature|Code-First|[http://localhost:8080/mule-wss/cxf/signature/code_first?wsdl](http://localhost:8080/mule-wss/cxf/signature/code_first?wsdl)|
|Signature|WSDL-First|[http://localhost:8080/mule-wss/cxf/signature/wsdl_first?wsdl](http://localhost:8080/mule-wss/cxf/signature/wsdl_first?wsdl)|
|Signature|Simple|[http://localhost:8080/mule-wss/cxf/signature/simple?wsdl](http://localhost:8080/mule-wss/cxf/signature/simple?wsdl)|
Expand Down Expand Up @@ -116,7 +115,6 @@ To change the entity queried just change the id value on the URL.
|Password with SAML|WSDL-First|[http://localhost:8080/mule-wss/client/cxf/password/saml/wsdl_first?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/wsdl_first?id=1)|
|Password with SAML|Simple|[http://localhost:8080/mule-wss/client/cxf/password/saml/simple?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/simple?id=1)|
|Password with SAML|Proxy|[http://localhost:8080/mule-wss/client/cxf/password/saml/proxy?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/proxy?id=1)|
|Password with SAML|Consumer|[http://localhost:8080/mule-wss/client/consumer/password/saml?id=1](http://localhost:8080/mule-wss/client/consumer/password/saml?id=1)|
|Signature|Code-First|[http://localhost:8080/mule-wss/client/signature/cxf/code_first?id=1](http://localhost:8080/mule-wss/client/cxf/signature/code_first?id=1)|
|Signature|WSDL-First|[http://localhost:8080/mule-wss/client/signature/cxf/wsdl_first?id=1](http://localhost:8080/mule-wss/client/cxf/signature/wsdl_first?id=1)|
|Signature|Simple|[http://localhost:8080/mule-wss/client/signature/cxf/simple?id=1](http://localhost:8080/mule-wss/client/cxf/signature/simple?id=1)|
Expand Down Expand Up @@ -149,6 +147,6 @@ The project has been released under the [MIT License][license].

[issues]: https://github.com/bernardo-mg/mule-ws-security-soap-example/issues
[license]: http://www.opensource.org/licenses/mit-license.php
[scm]: https://github.com/bernardo-mg/spring-ws-security-soap-example
[scm]: https://github.com/bernardo-mg/mule-ws-security-soap-example

[mule]: https://www.mulesoft.com
16 changes: 15 additions & 1 deletion src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,19 @@
Added more MUnit tests.
</action>
</release>
<release version="2.3.1" date="2017-02-06" description="Various small fixes">
<action dev="bmg" type="update">
Consumers now use digested passwords.
</action>
<action dev="bmg" type="add">
Added console appender to logger config.
</action>
<action dev="bmg" type="fix">
Corrected CSF proxy endpoints names.
</action>
<action dev="bmg" type="remove">
Removed SAML password consumer URLs, as they no longer exist.
</action>
</release>
</body>
</document>
</document>
6 changes: 3 additions & 3 deletions src/main/app/consumer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch
serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.password.codeFirst.path}">
<ws:security>
<ws:wss-username-token username="${security.credentials.user}"
password="${security.credentials.password}" passwordType="TEXT" />
password="${security.credentials.password}" passwordType="DIGEST" />
</ws:security>
</ws:consumer-config>

Expand All @@ -37,7 +37,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch
serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.signature.codeFirst.path}">
<ws:security>
<ws:wss-username-token username="${keystore.alias}"
password="${keystore.password}" passwordType="TEXT" />
password="${keystore.password}" passwordType="DIGEST" />
<ws:wss-sign tlsContext-ref="keystoreContext" />
</ws:security>
</ws:consumer-config>
Expand All @@ -48,7 +48,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch
serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.encryption.codeFirst.path}">
<ws:security>
<ws:wss-username-token username="${keystore.alias}"
password="${keystore.password}" passwordType="TEXT" />
password="${keystore.password}" passwordType="DIGEST" />
<ws:wss-encrypt tlsContext-ref="truststoreContext"
alias="${keystore.alias}" />
</ws:security>
Expand Down
2 changes: 1 addition & 1 deletion src/main/app/ws-cxf-encryption.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ http://www.mulesoft.org/schema/mule/ws http://www.mulesoft.org/schema/mule/ws/cu
<flow-ref doc:name="Copy HTTP Headers" name="Copy-Headers" />
<cxf:proxy-client doc:name="Proxy client"
enableMuleSoapHeaders="false" payload="envelope" />
<outbound-endpoint doc:name="Password protected code-first endpoint"
<outbound-endpoint doc:name="Encrypted code-first endpoint"
ref="Endpoint-CXF-Encryption-CodeFirst" exchange-pattern="request-response" />
<flow-ref doc:name="Copy HTTP Headers" name="Copy-Headers" />
<logger message="Ends the encrypted proxy endpoint flow" level="INFO"
Expand Down
2 changes: 1 addition & 1 deletion src/main/app/ws-cxf-signature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ http://www.mulesoft.org/schema/mule/ws http://www.mulesoft.org/schema/mule/ws/cu
<flow-ref doc:name="Copy HTTP Headers" name="Copy-Headers" />
<cxf:proxy-client doc:name="Proxy client"
enableMuleSoapHeaders="false" payload="envelope" />
<outbound-endpoint doc:name="Password protected code-first endpoint"
<outbound-endpoint doc:name="Signed code-first endpoint"
ref="Endpoint-CXF-Signature-CodeFirst" exchange-pattern="request-response" />
<flow-ref doc:name="Copy HTTP Headers" name="Copy-Headers" />
<logger message="Ends the signed proxy endpoint flow" level="INFO"
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<SizeBasedTriggeringPolicy size="10 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n" />
</Console>
</Appenders>
<Loggers>
<!-- CXF is used heavily by Mule for web services -->
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/security/wssecurity.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=123456
org.apache.ws.security.crypto.merlin.keystore.private.password=123456
org.apache.ws.security.crypto.merlin.keystore.alias=swss-cert
org.apache.ws.security.crypto.merlin.file=keystore/keystore.jks

0 comments on commit 0543d0b

Please sign in to comment.