svn commit: r1079497 - in /cxf/branches/2.3.x-fixes: ./ 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/cx...

[dkulp]

Author: dkulp
Date: Tue Mar  8 19:27:36 2011
New Revision: 1079497

URL: http://svn.apache.org/viewvc?rev=1079497&view=rev
Log:
Merged revisions 1078921 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1078921 | dkulp | 2011-03-07 15:26:34 -0500 (Mon, 07 Mar 2011) | 2 lines
  
  Allow access to the Bus that was used to create the client
  Register more policies that we do handle to reduce warnings
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
    
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
    
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java?rev=1079497&r1=1079496&r2=1079497&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java 
(original)
+++ 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java 
Tue Mar  8 19:27:36 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/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1079497&r1=1079496&r2=1079497&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 Tue Mar  8 19:27:36 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/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1079497&r1=1079496&r2=1079497&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 Tue Mar  8 19:27:36 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/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1079497&r1=1079496&r2=1079497&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Tue Mar  8 19:27:36 2011
@@ -266,6 +266,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);
@@ -278,10 +281,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;