jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import javax.jws.WebParam.Mode;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-import com.sun.xml.internal.org.jvnet.ws.databinding.DatabindingModeFeature;
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 databindingInfo.setSEIModel(this);
 }
 void postProcess() {
 // should be called only once.
-if (jaxbContext != null)
+if (jaxbContext != null) {
 return;
+}
 populateMaps();
 createJAXBContext();
 }
 /**
 for (JavaMethodImpl m : javaMethods) {
 m.freeze(port);
 putOp(m.getOperationQName(),m);
 }
-if (databinding != null) ((com.sun.xml.internal.ws.db.DatabindingImpl)databinding).freeze(port);
+if (databinding != null) {
+((com.sun.xml.internal.ws.db.DatabindingImpl)databinding).freeze(port);
+}
 }
 /**
 * Populate methodToJM and nameToJM maps.
 */
 abstract protected void populateMaps();
+@Override
 public Pool.Marshaller getMarshallerPool() {
 return marshallers;
 }
 /**
 * @return the <code>JAXBRIContext</code>
 * @deprecated
 */
+@Override
 public JAXBContext getJAXBContext() {
 JAXBContext jc = bindingContext.getJAXBContext();
-if (jc != null) return jc;
+if (jc != null) {
-if (jaxbContext == null && jc instanceof JAXBRIContext) jaxbContext = (JAXBRIContext) bindingContext.getJAXBContext();
+return jc;
+}
 return jaxbContext;
 }
 public BindingContext getBindingContext() {
 return bindingContext;
 private void /*JAXBRIContext*/ createJAXBContext() {
 final List<TypeInfo> types = getAllTypeInfos();
 final List<Class> cls = new ArrayList<Class>(types.size() + additionalClasses.size());
 cls.addAll(additionalClasses);
-for (TypeInfo type : types)
+for (TypeInfo type : types) {
 cls.add((Class) type.type);
+}
 try {
 //jaxbContext = JAXBRIContext.newInstance(cls, types, targetNamespace, false);
 // Need to avoid doPriv block once JAXB is fixed. Afterwards, use the above
 bindingContext = AccessController.doPrivileged(new PrivilegedExceptionAction<BindingContext>() {
 public BindingContext run() throws Exception {
 if(LOGGER.isLoggable(Level.FINEST)) {
-LOGGER.log(Level.FINEST,"Creating JAXBContext with classes="+cls+" and types="+types);
+LOGGER.log(Level.FINEST, "Creating JAXBContext with classes={0} and types={1}", new Object[]{cls, types});
 }
 UsesJAXBContextFeature f = features.get(UsesJAXBContextFeature.class);
-DatabindingModeFeature dbf = features.get(DatabindingModeFeature.class);
+com.oracle.webservices.internal.api.databinding.DatabindingModeFeature dmf =
+features.get(com.oracle.webservices.internal.api.databinding.DatabindingModeFeature.class);
 JAXBContextFactory factory = f!=null ? f.getFactory() : null;
 if(factory==null)   factory=JAXBContextFactory.DEFAULT;
 //                    return factory.createJAXBContext(AbstractSEIModelImpl.this,cls,types);
 databindingInfo.properties().put(JAXBContextFactory.class.getName(), factory);
-if (dbf != null) {
+if (dmf != null) {
 if (LOGGER.isLoggable(Level.FINE))
-LOGGER.fine("DatabindingModeFeature in SEI specifies mode: "
+LOGGER.log(Level.FINE, "DatabindingModeFeature in SEI specifies mode: {0}", dmf.getMode());
-+ dbf.getMode());
+databindingInfo.setDatabindingMode(dmf
-databindingInfo.setDatabindingMode(dbf
 .getMode());
 }
 if (f!=null) databindingInfo.setDatabindingMode(BindingContextFactory.DefaultDatabindingMode);
 databindingInfo.setClassLoader(classLoader);
 databindingInfo.contentClasses().addAll(cls);
 databindingInfo.typeInfos().addAll(types);
 databindingInfo.properties().put("c14nSupport", Boolean.FALSE);
-databindingInfo.setDefaultNamespace(AbstractSEIModelImpl.this.getTargetNamespace());
+databindingInfo.setDefaultNamespace(AbstractSEIModelImpl.this.getDefaultSchemaNamespace());
 BindingContext bc =  BindingContextFactory.create(databindingInfo);
 if (LOGGER.isLoggable(Level.FINE))
 LOGGER.log(Level.FINE,
 "Created binding context: "
 + bc.getClass().getName());
 if (jm != null)
 javaMethods.add(jm);
 }
 /**
-* Applies binding related information to the RpcLitPayload. The payload map is populated correctl
+* Applies binding related information to the RpcLitPayload. The payload map is populated correctly
 * @return
 * Returns attachment parameters if/any.
 */
 private List<ParameterImpl> applyRpcLitParamBinding(JavaMethodImpl method, WrapperParameter wrapperParameter, WSDLBoundPortType boundPortType, Mode mode) {
 QName opName = new QName(boundPortType.getPortTypeName().getNamespaceURI(), method.getOperationName());
 */
 public String getTargetNamespace() {
 return targetNamespace;
 }
+String getDefaultSchemaNamespace() {
+String defaultNamespace = getTargetNamespace();
+if (defaultSchemaNamespaceSuffix == null) return defaultNamespace;
+if (!defaultNamespace.endsWith("/")) {
+defaultNamespace += "/";
+}
+return (defaultNamespace + defaultSchemaNamespaceSuffix);
+}
 @NotNull
 public QName getBoundPortTypeName() {
 assert portName != null;
 return new QName(portName.getNamespaceURI(), portName.getLocalPart()+"Binding");
 }
 protected Class contractClass;
 protected Class endpointClass;
 protected ClassLoader classLoader = null;
 protected WSBinding wsBinding;
 protected BindingInfo databindingInfo;
+protected String defaultSchemaNamespaceSuffix;
 private static final Logger LOGGER = Logger.getLogger(AbstractSEIModelImpl.class.getName());
 }

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java

src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java