This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dd64e51e49bbd623ad461ccb5a36e0922326a105 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Fri Nov 14 10:32:03 2025 +0000 Removing keys from STS folder and trying to fix build (cherry picked from commit 7f6e87eb394bea70c00fa53163bd20c843f0c032) (cherry picked from commit 0a41e2f8597d3bc7a7e3746731d1f1fe445f066c) --- distribution/pom.xml | 5 +++++ distribution/src/main/assembly/bin.xml | 3 +++ .../src/main/release/samples/sts/keys/clientstore.jks | Bin 4559 -> 0 bytes .../src/main/release/samples/sts/keys/servicestore.jks | Bin 3475 -> 0 bytes .../src/main/release/samples/sts/keys/stsstore.jks | Bin 4557 -> 0 bytes distribution/src/main/release/samples/sts/pom.xml | 6 ++++++ .../java/demo/wssec/client/ClientCallbackHandler.java | 2 +- .../java/demo/wssec/server/ServerCallbackHandler.java | 2 +- .../src/main/java/demo/wssec/sts/STSCallbackHandler.java | 2 +- .../samples/sts/src/main/resources/wssec-sts-stax.xml | 4 ++-- 10 files changed, 19 insertions(+), 5 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index d8e3cc6fb9..9650b5e248 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -207,6 +207,11 @@ <artifactId>cxf-rt-transports-http-undertow</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cxf-testutils</artifactId> + <version>4.1.5-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml index 30787d10b0..1fc971f7fb 100644 --- a/distribution/src/main/assembly/bin.xml +++ b/distribution/src/main/assembly/bin.xml @@ -135,6 +135,9 @@ <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory> <unpack>false</unpack> <scope>runtime</scope> + <excludes> + <exclude>org.apache.cxf:cxf-testutils</exclude> + </excludes> </dependencySet> </dependencySets> </assembly> diff --git a/distribution/src/main/release/samples/sts/keys/clientstore.jks b/distribution/src/main/release/samples/sts/keys/clientstore.jks deleted file mode 100644 index f734f87b3a..0000000000 Binary files a/distribution/src/main/release/samples/sts/keys/clientstore.jks and /dev/null differ diff --git a/distribution/src/main/release/samples/sts/keys/servicestore.jks b/distribution/src/main/release/samples/sts/keys/servicestore.jks deleted file mode 100644 index 999ee824c3..0000000000 Binary files a/distribution/src/main/release/samples/sts/keys/servicestore.jks and /dev/null differ diff --git a/distribution/src/main/release/samples/sts/keys/stsstore.jks b/distribution/src/main/release/samples/sts/keys/stsstore.jks deleted file mode 100644 index 51f131f223..0000000000 Binary files a/distribution/src/main/release/samples/sts/keys/stsstore.jks and /dev/null differ diff --git a/distribution/src/main/release/samples/sts/pom.xml b/distribution/src/main/release/samples/sts/pom.xml index 7bf75753f2..b7a472484a 100644 --- a/distribution/src/main/release/samples/sts/pom.xml +++ b/distribution/src/main/release/samples/sts/pom.xml @@ -256,6 +256,12 @@ <artifactId>cxf-rt-ws-policy</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>4.1.5-SNAPSHOT</version> + <classifier>keys</classifier> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java index 8b9746f469..f6d33df232 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java @@ -34,7 +34,7 @@ public class ClientCallbackHandler implements CallbackHandler { if (pc.getUsage() == WSPasswordCallback.DECRYPT || pc.getUsage() == WSPasswordCallback.SIGNATURE) { if ("myclientkey".equals(pc.getIdentifier())) { - pc.setPassword("ckpass"); + pc.setPassword("cspass"); } } else if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) { if ("alice".equals(pc.getIdentifier())) { diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java index 87cae59767..32e0c7f2ce 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java @@ -32,7 +32,7 @@ public class ServerCallbackHandler implements CallbackHandler { if (callbacks[i] instanceof WSPasswordCallback) { WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; if ("myservicekey".equals(pc.getIdentifier())) { - pc.setPassword("skpass"); + pc.setPassword("sspass"); break; } } diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java index 8af89debc0..cf6adb0551 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java @@ -34,7 +34,7 @@ public class STSCallbackHandler implements CallbackHandler { if (pc.getUsage() == WSPasswordCallback.DECRYPT || pc.getUsage() == WSPasswordCallback.SIGNATURE) { if ("mystskey".equals(pc.getIdentifier())) { - pc.setPassword("stskpass"); + pc.setPassword("stsspass"); } } else if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) { if ("alice".equals(pc.getIdentifier())) { diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml index 6ebb10a35c..4bdd366306 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml @@ -53,7 +53,7 @@ <value>http://localhost:(\d)*/SoapContext/SoapPort</value> </util:list> <bean id="utSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties"> - <property name="signaturePropertiesFile" value="stsKeystore.properties"/> + <property name="signatureCryptoProperties" value="stsKeystore.properties"/> <property name="signatureUsername" value="mystskey"/> <property name="callbackHandlerClass" value="demo.wssec.sts.STSCallbackHandler"/> <property name="issuer" value="DoubleItSTSIssuer"/> @@ -66,4 +66,4 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> -</beans> \ No newline at end of file +</beans>
