/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.apache.geronimo.cxf;

import java.net.URL;

import javax.xml.namespace.QName;

import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.geronimo.jaxws.PortInfo;

/**
 * Used to overwrite serviceName and portName values of WebService annotation.
 */
public class CXFServiceConfiguration extends AbstractServiceConfiguration {

    private PortInfo portInfo;
    private URL wsdlURL;
    
    public CXFServiceConfiguration(PortInfo portInfo, URL wsdlURL) {
        this.portInfo = portInfo;        
        this.wsdlURL = wsdlURL;
    }
    
    public String getServiceName() {
        if (this.portInfo.getWsdlService() != null) {          
            return this.portInfo.getWsdlService().getLocalPart();
        } else {
            return null;
        }
    }
    
    public String getServiceNamespace() {
        if (this.portInfo.getWsdlService() != null) {
            return this.portInfo.getWsdlService().getNamespaceURI();
        } else {
            return null;
        }
    }
    
    public QName getEndpointName() {
        return this.portInfo.getWsdlPort();
    }
    
    public String getWsdlURL() {
        return this.wsdlURL.toString();
    }
    
}

@@ -1971,24 +1971,56 @@
       return
+ (this.wsdlURL == null) ? null :
  this.wsdlUR

check for null