cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [cxf] branch master updated: Minor cleanup of the WS-Security samples
Date Mon, 18 Jun 2018 14:13:19 GMT
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 3cb6221  Minor cleanup of the WS-Security samples
3cb6221 is described below

commit 3cb6221c06f18c573b8942aa68c14e335eb6a528
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Mon Jun 18 15:12:59 2018 +0100

    Minor cleanup of the WS-Security samples
---
 .../java/demo/wssec/client/UTPasswordCallback.java |  3 +--
 .../java/demo/wssec/server/UTPasswordCallback.java |  3 +--
 .../samples/ws_security/sign_enc_policy/pom.xml    | 28 ----------------------
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../java/demo/wssec/client/UTPasswordCallback.java |  3 +--
 .../java/demo/wssec/server/UTPasswordCallback.java |  3 +--
 .../java/demo/wssec/client/UTPasswordCallback.java |  3 +--
 .../java/demo/wssec/server/UTPasswordCallback.java |  3 +--
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../java/demo/wssec/client/UTPasswordCallback.java |  3 +--
 .../java/demo/wssec/server/UTPasswordCallback.java |  3 +--
 11 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
index 608981e..90a5385 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
index 8eb0453..3c23a30 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
index 9c7f368..a41c977 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
@@ -164,34 +164,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>client.unauthenticated</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>demo.wssec.client.Client</mainClass>
-                                    <arguments>
-                                        <argument>${basedir}/src/main/config/hello_world_no_policy.wsdl</argument>
-                                        <argument>${basedir}/src/main/resources/ClientConfig.xml</argument>
-                                        <argument>secure</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
index bf3464e..a0496fe 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
@@ -64,7 +64,7 @@ public final class Client {
             busURL = new URL(args[1]);
         }
 
-        Bus bus = bf.createBus(busFile.toString());
+        Bus bus = bf.createBus(busURL);
         BusFactory.setDefaultBus(bus);
 
         System.out.println(wsdlURL);
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
index 91031f6..ccc1fa7 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
index 8eb0453..3c23a30 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
index 91031f6..ccc1fa7 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
index a73ec2a..b5c6539 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
index bf3464e..a0496fe 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
@@ -64,7 +64,7 @@ public final class Client {
             busURL = new URL(args[1]);
         }
 
-        Bus bus = bf.createBus(busFile.toString());
+        Bus bus = bf.createBus(busURL);
         BusFactory.setDefaultBus(bus);
 
         System.out.println(wsdlURL);
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
index 91031f6..ccc1fa7 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
index a73ec2a..b5c6539 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java
@@ -33,8 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UTPasswordCallback implements CallbackHandler {
 
-    private Map<String, String> passwords =
-        new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UTPasswordCallback() {
         passwords.put("Alice", "ecilA");

-- 
To stop receiving notification emails like this one, please contact
coheigea@apache.org.

Mime
View raw message