/hg/release/icedtea7-forest-2.3/jaxws: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Apr 16 14:16:19 PDT 2013
changeset a0026b9ad761 in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=a0026b9ad761
author: mkos
date: Fri Feb 01 15:56:12 2013 +0100
8003543: Improve processing of MTOM attachments
Summary: old File API replaced by NIO API; fix reviewed also by Alexander Fomin
Reviewed-by: mullan, skoivu
changeset b1877762d45c in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=b1877762d45c
author: mkos
date: Wed Feb 20 22:42:04 2013 +0100
8005432: Update access to JAX-WS
Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin
Reviewed-by: mullan, skoivu
diffstat:
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java | 13 +-
src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java | 24 +-
src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java | 144 +++++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java | 46 ++-
src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java | 157 ++++++---
src/share/jaxws_classes/javax/xml/soap/MessageFactory.java | 13 +-
src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java | 4 +-
src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java | 4 +-
src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java | 10 +-
9 files changed, 328 insertions(+), 87 deletions(-)
diffs (truncated from 694 to 500 lines):
diff -r 8eb0bc947ad4 -r b1877762d45c src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Fri Mar 08 16:04:54 2013 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Wed Feb 20 22:42:04 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -235,7 +235,7 @@
String pkg = nav.getPackageName(ci.getClazz());
if(!registries.containsKey(pkg)) {
// insert the package's object factory
- C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz());
+ C c = loadObjectFactory(ci, pkg);
if(c!=null)
addRegistry(c,(Locatable)p);
}
@@ -264,6 +264,15 @@
return r;
}
+ private C loadObjectFactory(ClassInfoImpl<T, C, F, M> ci, String pkg) {
+ try {
+ return nav.findClass(pkg + ".ObjectFactory", ci.getClazz());
+ } catch (SecurityException ignored) {
+ // treat SecurityException in same way as ClassNotFoundException in this case
+ return null;
+ }
+ }
+
/**
* Checks the uniqueness of the type name.
*/
diff -r 8eb0bc947ad4 -r b1877762d45c src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Fri Mar 08 16:04:54 2013 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Wed Feb 20 22:42:04 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -28,6 +28,7 @@
import java.nio.ByteBuffer;
import java.io.File;
import java.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -50,41 +51,45 @@
}
// size of the chunk given by the parser
+ @Override
public int size() {
return len;
}
+ @Override
public byte[] read() {
return data;
}
+ @Override
public long writeTo(DataFile file) {
return file.writeTo(data, 0, len);
}
/**
- *
* @param dataHead
* @param buf
* @return
*/
+ @Override
public Data createNext(DataHead dataHead, ByteBuffer buf) {
if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) {
try {
String prefix = config.getTempFilePrefix();
String suffix = config.getTempFileSuffix();
- File dir = config.getTempDir();
- File tempFile = (dir == null)
- ? File.createTempFile(prefix, suffix)
- : File.createTempFile(prefix, suffix, dir);
- LOGGER.fine("Created temp file = "+tempFile);
+ File tempFile = TempFiles.createTempFile(prefix, suffix, config.getTempDir());
+ // delete the temp file when VM exits as a last resort for file clean up
+ tempFile.deleteOnExit();
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Created temp file = {0}", tempFile);
+ }
dataHead.dataFile = new DataFile(tempFile);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
throw new MIMEParsingException(ioe);
}
if (dataHead.head != null) {
- for(Chunk c=dataHead.head; c != null; c=c.next) {
+ for (Chunk c = dataHead.head; c != null; c = c.next) {
long pointer = c.data.writeTo(dataHead.dataFile);
c.data = new FileData(dataHead.dataFile, pointer, len);
}
@@ -94,4 +99,5 @@
return new MemoryData(buf, config);
}
}
+
}
diff -r 8eb0bc947ad4 -r b1877762d45c src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java Wed Feb 20 22:42:04 2013 +0100
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Helper utility to support jdk <= jdk1.6. After jdk1.6 EOL reflection can be removed and API can be used directly.
+ */
+class TempFiles {
+
+ private static final Logger LOGGER = Logger.getLogger(TempFiles.class.getName());
+
+ private static final Class<?> CLASS_FILES;
+ private static final Class<?> CLASS_PATH;
+ private static final Class<?> CLASS_FILE_ATTRIBUTE;
+ private static final Class<?> CLASS_FILE_ATTRIBUTES;
+ private static final Method METHOD_FILE_TO_PATH;
+ private static final Method METHOD_FILES_CREATE_TEMP_FILE;
+ private static final Method METHOD_FILES_CREATE_TEMP_FILE_WITHPATH;
+
+ private static final Method METHOD_PATH_TO_FILE;
+
+ private static boolean useJdk6API;
+
+ static {
+ useJdk6API = isJdk6();
+
+ CLASS_FILES = safeGetClass("java.nio.file.Files");
+ CLASS_PATH = safeGetClass("java.nio.file.Path");
+ CLASS_FILE_ATTRIBUTE = safeGetClass("java.nio.file.attribute.FileAttribute");
+ CLASS_FILE_ATTRIBUTES = safeGetClass("[Ljava.nio.file.attribute.FileAttribute;");
+ METHOD_FILE_TO_PATH = safeGetMethod(File.class, "toPath");
+ METHOD_FILES_CREATE_TEMP_FILE = safeGetMethod(CLASS_FILES, "createTempFile", String.class, String.class, CLASS_FILE_ATTRIBUTES);
+ METHOD_FILES_CREATE_TEMP_FILE_WITHPATH = safeGetMethod(CLASS_FILES, "createTempFile", CLASS_PATH, String.class, String.class, CLASS_FILE_ATTRIBUTES);
+ METHOD_PATH_TO_FILE = safeGetMethod(CLASS_PATH, "toFile");
+ }
+
+ private static boolean isJdk6() {
+ String javaVersion = System.getProperty("java.version");
+ LOGGER.log(Level.FINEST, "Detected java version = {0}", javaVersion);
+ return javaVersion.startsWith("1.6.");
+ }
+
+ private static Class<?> safeGetClass(String className) {
+ // it is jdk 6 or something failed already before
+ if (useJdk6API) return null;
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ LOGGER.log(Level.SEVERE, "Exception cought", e);
+ LOGGER.log(Level.WARNING, "Class {0} not found. Temp files will be created using old java.io API.", className);
+ useJdk6API = true;
+ return null;
+ }
+ }
+
+ private static Method safeGetMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
+ // it is jdk 6 or something failed already before
+ if (useJdk6API) return null;
+ try {
+ return clazz.getMethod(methodName, parameterTypes);
+ } catch (NoSuchMethodException e) {
+ LOGGER.log(Level.SEVERE, "Exception cought", e);
+ LOGGER.log(Level.WARNING, "Method {0} not found. Temp files will be created using old java.io API.", methodName);
+ useJdk6API = true;
+ return null;
+ }
+ }
+
+
+ static Object toPath(File f) throws InvocationTargetException, IllegalAccessException {
+ return METHOD_FILE_TO_PATH.invoke(f);
+ }
+
+ static File toFile(Object path) throws InvocationTargetException, IllegalAccessException {
+ return (File) METHOD_PATH_TO_FILE.invoke(path);
+ }
+
+ static File createTempFile(String prefix, String suffix, File dir) throws IOException {
+
+ if (useJdk6API) {
+ LOGGER.log(Level.FINEST, "Jdk6 detected, temp file (prefix:{0}, suffix:{1}) being created using old java.io API.", new Object[]{prefix, suffix});
+ return File.createTempFile(prefix, suffix, dir);
+
+ } else {
+
+ try {
+ if (dir != null) {
+ Object path = toPath(dir);
+ LOGGER.log(Level.FINEST, "Temp file (path: {0}, prefix:{1}, suffix:{2}) being created using NIO API.", new Object[]{dir.getAbsolutePath(), prefix, suffix});
+ return toFile(METHOD_FILES_CREATE_TEMP_FILE_WITHPATH.invoke(null, path, prefix, suffix, Array.newInstance(CLASS_FILE_ATTRIBUTE, 0)));
+ } else {
+ LOGGER.log(Level.FINEST, "Temp file (prefix:{0}, suffix:{1}) being created using NIO API.", new Object[]{prefix, suffix});
+ return toFile(METHOD_FILES_CREATE_TEMP_FILE.invoke(null, prefix, suffix, Array.newInstance(CLASS_FILE_ATTRIBUTE, 0)));
+ }
+
+ } catch (IllegalAccessException e) {
+ LOGGER.log(Level.SEVERE, "Exception caught", e);
+ LOGGER.log(Level.WARNING, "Error invoking java.nio API, temp file (path: {0}, prefix:{1}, suffix:{2}) being created using old java.io API.",
+ new Object[]{dir != null ? dir.getAbsolutePath() : null, prefix, suffix});
+ return File.createTempFile(prefix, suffix, dir);
+
+ } catch (InvocationTargetException e) {
+ LOGGER.log(Level.SEVERE, "Exception caught", e);
+ LOGGER.log(Level.WARNING, "Error invoking java.nio API, temp file (path: {0}, prefix:{1}, suffix:{2}) being created using old java.io API.",
+ new Object[]{dir != null ? dir.getAbsolutePath() : null, prefix, suffix});
+ return File.createTempFile(prefix, suffix, dir);
+ }
+ }
+
+ }
+
+
+}
diff -r 8eb0bc947ad4 -r b1877762d45c src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Fri Mar 08 16:04:54 2013 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Wed Feb 20 22:42:04 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -22,7 +22,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package com.sun.xml.internal.ws.client;
import com.sun.istack.internal.NotNull;
@@ -30,13 +29,11 @@
import com.sun.xml.internal.ws.Closeable;
import com.sun.xml.internal.ws.api.BindingID;
import com.sun.xml.internal.ws.api.EndpointAddress;
-import com.sun.xml.internal.ws.api.WSBinding;
import com.sun.xml.internal.ws.api.WSService;
import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
import com.sun.xml.internal.ws.api.client.ServiceInterceptor;
import com.sun.xml.internal.ws.api.client.ServiceInterceptorFactory;
-import com.sun.xml.internal.ws.api.model.SEIModel;
-import com.sun.xml.internal.ws.api.pipe.*;
+import com.sun.xml.internal.ws.api.pipe.Stubs;
import com.sun.xml.internal.ws.api.server.Container;
import com.sun.xml.internal.ws.api.server.ContainerResolver;
import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
@@ -45,8 +42,8 @@
import com.sun.xml.internal.ws.client.HandlerConfigurator.AnnotationConfigurator;
import com.sun.xml.internal.ws.client.HandlerConfigurator.HandlerResolverImpl;
import com.sun.xml.internal.ws.client.sei.SEIStub;
+import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature;
import com.sun.xml.internal.ws.developer.WSBindingProvider;
-import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature;
import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
import com.sun.xml.internal.ws.model.RuntimeModeler;
import com.sun.xml.internal.ws.model.SOAPSEIModel;
@@ -59,7 +56,6 @@
import com.sun.xml.internal.ws.util.JAXWSUtils;
import com.sun.xml.internal.ws.util.ServiceConfigurationError;
import com.sun.xml.internal.ws.util.ServiceFinder;
-import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver;
import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
import org.xml.sax.SAXException;
@@ -74,16 +70,17 @@
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.soap.AddressingFeature;
import java.io.IOException;
+import java.lang.RuntimePermission;
import java.lang.reflect.Proxy;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.security.*;
import java.util.*;
import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
+import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver;
+
/**
* <code>Service</code> objects provide the client view of a Web service.
*
@@ -578,7 +575,7 @@
}
}
- private <T> T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, Class<T> portInterface,
+ private <T> T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, final Class<T> portInterface,
WebServiceFeature[] webServiceFeatures, SEIPortInfo eif) {
//fail if service doesnt have WSDL
if (wsdlService == null)
@@ -592,14 +589,37 @@
BindingImpl binding = eif.createBinding(webServiceFeatures,portInterface);
SEIStub pis = new SEIStub(eif, binding, eif.model, epr);
- T proxy = portInterface.cast(Proxy.newProxyInstance(portInterface.getClassLoader(),
- new Class[]{portInterface, WSBindingProvider.class, Closeable.class}, pis));
+ T proxy = createProxy(portInterface, pis);
+
if (serviceInterceptor != null) {
serviceInterceptor.postCreateProxy((WSBindingProvider)proxy, portInterface);
}
return proxy;
}
+ private <T> T createProxy(final Class<T> portInterface, final SEIStub pis) {
+
+ // accessClassInPackage privilege needs to be granted ...
+ RuntimePermission perm = new RuntimePermission("accessClassInPackage.com.sun." + "xml.internal.*");
+ PermissionCollection perms = perm.newPermissionCollection();
+ perms.add(perm);
+
+ return AccessController.doPrivileged(
+ new PrivilegedAction<T>() {
+ @Override
+ public T run() {
+ Object proxy = Proxy.newProxyInstance(portInterface.getClassLoader(),
+ new Class[]{portInterface, WSBindingProvider.class, Closeable.class}, pis);
+ return portInterface.cast(proxy);
+ }
+ },
+ new AccessControlContext(
+ new ProtectionDomain[]{
+ new ProtectionDomain(null, perms)
+ })
+ );
+ }
+
/**
* Lists up the port names in WSDL. For error diagnostics.
*/
diff -r 8eb0bc947ad4 -r b1877762d45c src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java
--- a/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java Fri Mar 08 16:04:54 2013 +0000
+++ b/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java Wed Feb 20 22:42:04 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -43,20 +43,12 @@
throws SOAPException
{
try {
- Class spiClass;
- if (classLoader == null) {
- spiClass = Class.forName(className);
- } else {
- spiClass = classLoader.loadClass(className);
- }
+ Class spiClass = safeLoadClass(className, classLoader);
return spiClass.newInstance();
} catch (ClassNotFoundException x) {
- throw new SOAPException(
- "Provider " + className + " not found", x);
+ throw new SOAPException("Provider " + className + " not found", x);
} catch (Exception x) {
- throw new SOAPException(
- "Provider " + className + " could not be instantiated: " + x,
- x);
+ throw new SOAPException("Provider " + className + " could not be instantiated: " + x, x);
}
}
@@ -73,11 +65,65 @@
* a system property
* @exception SOAPException if there is a SOAP error
*/
- static Object find(String factId)
+ static Object find(String factoryId)
throws SOAPException
{
- final ClassLoader classLoader;
- final String factoryId = factId;
+ return find(factoryId, null, false);
+ }
+
+ /**
+ * Finds the implementation <code>Class</code> object for the given
+ * factory name, or if that fails, finds the <code>Class</code> object
+ * for the given fallback class name. The arguments supplied must be
+ * used in order. If using the first argument is successful, the second
+ * one will not be used.
+ * <P>
+ * This method is package private so that this code can be shared.
+ *
+ * @return the <code>Class</code> object of the specified message factory;
+ * may be <code>null</code>
+ *
+ * @param factoryId the name of the factory to find, which is
+ * a system property
+ * @param fallbackClassName the implementation class name, which is
+ * to be used only if nothing else
+ * is found; <code>null</code> to indicate that
+ * there is no fallback class name
+ * @exception SOAPException if there is a SOAP error
+ */
+ static Object find(String factoryId, String fallbackClassName)
+ throws SOAPException
+ {
+ return find(factoryId, fallbackClassName, true);
+ }
+
+ /**
+ * Finds the implementation <code>Class</code> object for the given
+ * factory name, or if that fails, finds the <code>Class</code> object
+ * for the given default class name, but only if <code>tryFallback</code>
+ * is <code>true</code>. The arguments supplied must be used in order
+ * If using the first argument is successful, the second one will not
+ * be used. Note the default class name may be needed even if fallback
+ * is not to be attempted, so certain error conditions can be handled.
+ * <P>
+ * This method is package private so that this code can be shared.
+ *
+ * @return the <code>Class</code> object of the specified message factory;
+ * may not be <code>null</code>
+ *
+ * @param factoryId the name of the factory to find, which is
+ * a system property
+ * @param defaultClassName the implementation class name, which is
+ * to be used only if nothing else
+ * is found; <code>null</code> to indicate
+ * that there is no default class name
+ * @param tryFallback whether to try the default class as a
+ * fallback
+ * @exception SOAPException if there is a SOAP error
+ */
+ static Object find(String factoryId, String defaultClassName,
+ boolean tryFallback) throws SOAPException {
+ ClassLoader classLoader;
try {
classLoader = Thread.currentThread().getContextClassLoader();
} catch (Exception x) {
@@ -99,7 +145,7 @@
String javah=System.getProperty( "java.home" );
String configFile = javah + File.separator +
"lib" + File.separator + "jaxm.properties";
- final File f=new File( configFile );
+ File f=new File( configFile );
if( f.exists()) {
Properties props=new Properties();
props.load( new FileInputStream(f));
@@ -134,49 +180,56 @@
} catch( Exception ex ) {
}
- return null;
+ // If not found and fallback should not be tried, return a null result.
More information about the distro-pkg-dev
mailing list