cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1417168 - in /cxf/branches/2.6.x-fixes/distribution/src/main/release/samples: jax_rs/spring_security/src/main/java/demo/jaxrs/service/ restful_dispatch/src/main/java/demo/restful/client/ ws_security/sign_enc/src/main/java/demo/wssec/client...
Date Tue, 04 Dec 2012 20:56:23 GMT
Author: dkulp
Date: Tue Dec  4 20:56:22 2012
New Revision: 1417168

URL: http://svn.apache.org/viewvc?rev=1417168&view=rev
Log:
Merged revisions 1414817 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1414817 | dkulp | 2012-11-28 12:07:45 -0500 (Wed, 28 Nov 2012) | 2 lines

  Fix a few eclipse warnings

........

Modified:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
Tue Dec  4 20:56:22 2012
@@ -46,15 +46,8 @@ public class CustomerServiceImpl impleme
         if (c == null || c.getId() != customer.getId()) {
             throw new WebApplicationException();
         }
-        Response r;
-        if (c != null) {
-            customers.put(customer.getId(), customer);
-            r = Response.ok(customer).build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
+        customers.put(customer.getId(), customer);
+        return Response.ok(customer).build();
     }
 
     public Response addCustomer(Customer customer) {

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
Tue Dec  4 20:56:22 2012
@@ -40,15 +40,8 @@ public class CustomerServiceSecuredImpl 
         if (c == null || c.getId() != customer.getId()) {
             throw new WebApplicationException();
         }
-        Response r;
-        if (c != null) {
-            customers.put(customer.getId(), customer);
-            r = Response.ok(customer).build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
+        customers.put(customer.getId(), customer);
+        return Response.ok(customer).build();
     }
 
     public Response addCustomer(Customer customer) {

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
Tue Dec  4 20:56:22 2012
@@ -21,7 +21,6 @@ package demo.restful.client;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.net.URI;
 import java.net.URL;
 import java.util.Map;
 import java.util.Properties;
@@ -69,13 +68,6 @@ public final class Client {
         source = new StreamSource(in);
         printSource(source);
 
-        // Sent HTTP POST request to update customer info using JAX-WS Dispatch
-        URI endpointURI = new URI(endpointAddress.toString());
-        String path = null;
-        if (endpointURI != null) {
-            path = endpointURI.getPath();
-        }
-
         Service service = Service.create(serviceName);
         service.addPort(portName, HTTPBinding.HTTP_BINDING,  endpointAddress);
         Dispatch<DOMSource> dispatcher = service.createDispatch(portName,

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
Tue Dec  4 20:56:22 2012
@@ -39,7 +39,6 @@ import org.apache.cxf.ws.security.wss4j.
 
 public final class Client {
 
-    private static final String USER_NAME = System.getProperty("user.name");
     private static final String WSU_NS
         = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Tue Dec  4 20:56:22 2012
@@ -44,7 +44,7 @@ public class Server {
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/GreeterPort";
-        Endpoint e = Endpoint.publish(address, implementor);
+        Endpoint.publish(address, implementor);
     }
 
     public static void main(String args[]) throws Exception {

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
Tue Dec  4 20:56:22 2012
@@ -38,8 +38,6 @@ import org.apache.cxf.ws.security.wss4j.
 
 public final class Client {
 
-    private static final String USER_NAME = System.getProperty("user.name");
-
     private Client() {
     }
 

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
Tue Dec  4 20:56:22 2012
@@ -41,7 +41,7 @@ public class Server {
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/GreeterPort";
-        Endpoint e = Endpoint.publish(address, implementor);
+        Endpoint.publish(address, implementor);
     }
 
     public static void main(String args[]) throws Exception {

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
Tue Dec  4 20:56:22 2012
@@ -38,7 +38,6 @@ import org.apache.cxf.ws.security.wss4j.
 
 public final class Client {
 
-    private static final String USER_NAME = System.getProperty("user.name");
     private static final String WSU_NS
         = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java?rev=1417168&r1=1417167&r2=1417168&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
Tue Dec  4 20:56:22 2012
@@ -44,7 +44,7 @@ public class Server {
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/GreeterPort";
-        Endpoint e = Endpoint.publish(address, implementor);
+        Endpoint.publish(address, implementor);
     }
 
     public static void main(String args[]) throws Exception {



Mime
View raw message