Cont: upgrading cxf client to 3.0.1

Please some advice on the following cxf client config:

After upgrading to 3.0.1. The security isn't included as it should.
To solve this I currently try to use WS-SecurityPolicy auto config such that
it's automatically included.
Before I did this manual as I have optional filled fields that needed to be
included in the signature, I used the solution as explained in:
http://davidvaleri.wordpress.com/2010/09/15/signing-ws-addressing-headers-in
-apache-cxf/
I want to use the new WSS4J 2.0 OPTIONAL_SIGNATURE_PARTS as an alternative.

Anyway: for some reason the policy info isn't used from the wsdl, as such
not used/included in the soap message.
I think because the wsdl location isn't known, so I added the wsdLocation to
the client, but then it complaints it can't find the service definition.
How do I solve this? See the config below.

Note: I define the serviceClass and address manually in the config below as
the Service and Port name in the wsdl are the same and CXF didn't like that
(at least not with version 2.X).
In the past I dropped a question about it in SO:
http://stackoverflow.com/questions/13591514/how-to-deal-with-same-service-an
d-port-name-in-cxf

The client config snippet:

<jaxws:client id="preProductionClient"
serviceClass="com.bla.service.DeliveryServiceV12"

address="https://preprod.bla.nl/wus/2.0/deliveryservice/1.2"
wsdlLocation="/wsdl/DeliverPreProd_1.2.wsdl">

The exception:

Caused by: org.apache.cxf.service.factory.ServiceConstructionException:
Could not find definition for service {http://
https://preprod.bla.nl/wus/2.0/deliveryservice/1.2/}DeliveryServiceV12.

- Ed