svn commit: r1078921 - in /cxf/trunk: api/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/

[dk...@apache.org]

Author: dkulp
Date: Mon Mar  7 20:26:34 2011
New Revision: 1078921

URL: http://svn.apache.org/viewvc?rev=1078921&view=rev
Log:
Allow access to the Bus that was used to create the client
Register more policies that we do handle to reduce warnings

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java?rev=1078921&r1=1078920&r2=1078921&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java Mon Mar  7 20:26:34 2011
@@ -24,6 +24,7 @@ import java.util.concurrent.Executor;
 
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.interceptor.InterceptorProvider;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -275,4 +276,11 @@ public interface Client extends Intercep
      * @param executor
      */
     void setExecutor(Executor executor);
+    
+    
+    /**
+     * Retrieves the Bus that was used to create the Client
+     * @return the Bus
+     */
+    Bus getBus();
 }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1078921&r1=1078920&r2=1078921&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Mon Mar  7 20:26:34 2011
@@ -166,6 +166,10 @@ public class ClientImpl
         }
         notifyLifecycleManager();
     }
+    
+    public Bus getBus() {
+        return bus;
+    }
 
     public void destroy() {
         ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1078921&r1=1078920&r2=1078921&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java Mon Mar  7 20:26:34 2011
@@ -142,6 +142,10 @@ public final class WSSecurityPolicyLoade
             SP11Constants.REQUIRE_THUMBPRINT_REFERENCE,
             SP12Constants.REQUIRE_DERIVED_KEYS,
             SP11Constants.REQUIRE_DERIVED_KEYS,
+            SP12Constants.REQUIRE_INTERNAL_REFERENCE,
+            SP11Constants.REQUIRE_INTERNAL_REFERENCE,
+            SP12Constants.REQUIRE_ISSUER_SERIAL_REFERENCE,
+            SP11Constants.REQUIRE_ISSUER_SERIAL_REFERENCE,
             new QName(SP12Constants.SP_NS, SP12Constants.ENCRYPT_BEFORE_SIGNING),
             new QName(SP11Constants.SP_NS, SP11Constants.ENCRYPT_BEFORE_SIGNING),
         });

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1078921&r1=1078920&r2=1078921&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Mon Mar  7 20:26:34 2011
@@ -265,6 +265,9 @@ public class STSClient implements Config
     public void setWsdlLocation(String wsdl) {
         wsdlLocation = wsdl;
     }
+    public String getWsdlLocation() {
+        return wsdlLocation;
+    }
 
     public void setServiceName(String qn) {
         serviceName = QName.valueOf(qn);
@@ -277,10 +280,16 @@ public class STSClient implements Config
     public void setServiceQName(QName qn) {
         serviceName = qn;
     }
+    public QName getServiceQName() {
+        return serviceName;
+    }
 
     public void setEndpointQName(QName qn) {
         endpointName = qn;
     }
+    public QName getEndpointQName() {
+        return endpointName;
+    }
     
     public void setActAs(Object actAs) {
         this.actAs = actAs;