Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -25,7 +25,6 @@
    1.11  
    1.12  package com.sun.xml.internal.ws.db;
    1.13  
    1.14 -import java.io.File;
    1.15  import java.io.InputStream;
    1.16  import java.net.URL;
    1.17  import java.util.HashMap;
    1.18 @@ -38,19 +37,17 @@
    1.19  import javax.xml.ws.WebServiceException;
    1.20  import javax.xml.ws.WebServiceFeature;
    1.21  
    1.22 -import com.sun.xml.internal.org.jvnet.ws.databinding.Databinding;
    1.23 -import com.sun.xml.internal.org.jvnet.ws.databinding.DatabindingModeFeature;
    1.24 -import com.sun.xml.internal.org.jvnet.ws.databinding.Databinding.Builder;
    1.25 -import com.sun.xml.internal.org.jvnet.ws.databinding.Databinding.WSDLGenerator;
    1.26  import org.xml.sax.EntityResolver;
    1.27  
    1.28 +import com.oracle.webservices.internal.api.databinding.Databinding;
    1.29 +import com.oracle.webservices.internal.api.databinding.Databinding.Builder;
    1.30 +import com.oracle.webservices.internal.api.databinding.WSDLGenerator;
    1.31  import com.sun.xml.internal.ws.api.BindingID;
    1.32  import com.sun.xml.internal.ws.api.WSBinding;
    1.33  import com.sun.xml.internal.ws.api.databinding.DatabindingConfig;
    1.34  import com.sun.xml.internal.ws.api.databinding.DatabindingFactory;
    1.35 -import com.sun.xml.internal.ws.api.databinding.WSDLGenInfo;
    1.36 +import com.sun.xml.internal.ws.api.databinding.MetadataReader;
    1.37  import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
    1.38 -import com.sun.xml.internal.ws.spi.db.DatabindingException;
    1.39  import com.sun.xml.internal.ws.spi.db.DatabindingProvider;
    1.40  import com.sun.xml.internal.ws.util.ServiceFinder;
    1.41  
    1.42 @@ -115,7 +112,7 @@
    1.43                  return provider.create(config);
    1.44          }
    1.45  
    1.46 -    public Databinding.WSDLGenerator createWsdlGen(DatabindingConfig config) {
    1.47 +    public WSDLGenerator createWsdlGen(DatabindingConfig config) {
    1.48          DatabindingProvider provider = provider(config);
    1.49          return provider.wsdlGen(config);
    1.50      }
    1.51 @@ -145,8 +142,8 @@
    1.52                       config.getMappingInfo().getDatabindingMode() != null)
    1.53                          return config.getMappingInfo().getDatabindingMode();
    1.54          if ( config.getFeatures() != null) for (WebServiceFeature f : config.getFeatures()) {
    1.55 -            if (f instanceof DatabindingModeFeature) {
    1.56 -                DatabindingModeFeature dmf = (DatabindingModeFeature) f;
    1.57 +            if (f instanceof com.oracle.webservices.internal.api.databinding.DatabindingModeFeature) {
    1.58 +                com.oracle.webservices.internal.api.databinding.DatabindingModeFeature dmf = (com.oracle.webservices.internal.api.databinding.DatabindingModeFeature) f;
    1.59                  return dmf.getMode();
    1.60              }
    1.61          }
    1.62 @@ -235,16 +232,19 @@
    1.63              if (isfor(WSDLPort.class, name, value)) {
    1.64                  config.setWsdlPort((WSDLPort)value);
    1.65              }
    1.66 +            if (isfor(MetadataReader.class, name, value)) {
    1.67 +                config.setMetadataReader((MetadataReader)value);
    1.68 +            }
    1.69              return this;
    1.70          }
    1.71          boolean isfor(Class<?> type, String name, Object value) {
    1.72              return type.getName().equals(name) && type.isInstance(value);
    1.73          }
    1.74  
    1.75 -        public com.sun.xml.internal.org.jvnet.ws.databinding.Databinding build() {
    1.76 +        public com.oracle.webservices.internal.api.databinding.Databinding build() {
    1.77              return factory.createRuntime(config);
    1.78          }
    1.79 -        public WSDLGenerator createWSDLGenerator() {
    1.80 +        public com.oracle.webservices.internal.api.databinding.WSDLGenerator createWSDLGenerator() {
    1.81              return factory.createWsdlGen(config);
    1.82          }
    1.83      }