cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1519705 - in /cxf/branches/2.7.x-fixes: services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
Date Tue, 03 Sep 2013 14:55:05 GMT
Author: coheigea
Date: Tue Sep  3 14:55:05 2013
New Revision: 1519705

URL: http://svn.apache.org/r1519705
Log:
Merged revisions 1519700 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1519700 | coheigea | 2013-09-03 15:52:52 +0100 (Tue, 03 Sep 2013) | 2 lines

  Minor XKMS changes

........

Modified:
    cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml

Modified: cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java?rev=1519705&r1=1519704&r2=1519705&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
(original)
+++ cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
Tue Sep  3 14:55:05 2013
@@ -76,10 +76,16 @@ public class XKMSInvoker {
         this.xkmsConsumer = xkmsConsumer;
     }
     
+    public XKMSInvoker(String endpointAddress) {
+        this(endpointAddress, null);
+    }
+    
     public XKMSInvoker(String endpointAddress, Bus bus) {
         
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        if (bus != null) {
+            SpringBusFactory.setDefaultBus(bus);
+            SpringBusFactory.setThreadDefaultBus(bus);
+        }
         
         XKMSService xkmsService = new XKMSService();
         xkmsConsumer = xkmsService.getPort(XKMSPortType.class);

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml?rev=1519705&r1=1519704&r2=1519705&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
Tue Sep  3 14:55:05 2013
@@ -45,20 +45,16 @@
     
     <!-- Begin Symmetric -->
     <!--
+    <bean id="additionalClasses"
+        class="org.apache.cxf.xkms.model.extensions.AdditionalClassesFactory" />
+    
     <jaxws:client id="xkmsClient"
         serviceClass="org.w3._2002._03.xkms_wsdl.XKMSPortType"
         name="{http://www.w3.org/2002/03/xkms#wsdl}XKMSPort" 
         address="https://localhost:${testutil.ports.XKMSServer}/XKMS">
         <jaxws:properties>
             <entry key="jaxb.additionalContextClasses">
-                <bean
-                    class="org.apache.cxf.xkms.model.extensions.ClassArrayFactoryBean">
-                    <property name="classNames">
-                        <list>
-                            <value>org.apache.cxf.xkms.model.extensions.ResultDetails</value>
-                        </list>
-                    </property>
-                </bean>
+                 <bean factory-bean="additionalClasses" factory-method="create" />
             </entry>
         </jaxws:properties>
     </jaxws:client>



Mime
View raw message