stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2015-07-30 15:22:50 -07:00
commit a544dd4e3d
6 changed files with 5 additions and 1827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java
View File

@ -117,14 +117,6 @@ public abstract class Repository {
} catch(ClassNotFoundException ex) { return null; }
}
/** @return class file object for given Java class.
*/
public static ClassPath.ClassFile lookupClassFile(String class_name) {
try {
return ClassPath.SYSTEM_CLASS_PATH.getClassFile(class_name);
} catch(IOException e) { return null; }
}
/** Clear the repository.
*/
public static void clearCache() {

365
jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java
View File

@ -1,365 +0,0 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
package com.sun.org.apache.bcel.internal.util;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache BCEL" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache BCEL", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.util.*;
import java.util.zip.*;
import java.io.*;
/**
* Responsible for loading (class) files from the CLASSPATH. Inspired by
* sun.tools.ClassPath.
*
* @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
*/
public class ClassPath implements Serializable {
public static final ClassPath SYSTEM_CLASS_PATH = new ClassPath();
private PathEntry[] paths;
private String class_path;
/**
* Search for classes in given path.
*/
public ClassPath(String class_path) {
this.class_path = class_path;
ArrayList vec = new ArrayList();
for(StringTokenizer tok=new StringTokenizer(class_path,
SecuritySupport.getSystemProperty("path.separator"));
tok.hasMoreTokens();)
{
String path = tok.nextToken();
if(!path.equals("")) {
File file = new File(path);
try {
if(SecuritySupport.getFileExists(file)) {
if(file.isDirectory())
vec.add(new Dir(path));
else
vec.add(new Zip(new ZipFile(file)));
}
} catch(IOException e) {
System.err.println("CLASSPATH component " + file + ": " + e);
}
}
}
paths = new PathEntry[vec.size()];
vec.toArray(paths);
}
/**
* Search for classes in CLASSPATH.
* @deprecated Use SYSTEM_CLASS_PATH constant
*/
public ClassPath() {
// this(getClassPath());
this("");
}
/** @return used class path string
*/
public String toString() {
return class_path;
}
public int hashCode() {
return class_path.hashCode();
}
public boolean equals(Object o) {
if(o instanceof ClassPath) {
return class_path.equals(((ClassPath)o).class_path);
}
return false;
}
private static final void getPathComponents(String path, ArrayList list) {
if(path != null) {
StringTokenizer tok = new StringTokenizer(path, File.pathSeparator);
while(tok.hasMoreTokens()) {
String name = tok.nextToken();
File file = new File(name);
if(SecuritySupport.getFileExists(file)) {
list.add(name);
}
}
}
}
/** Checks for class path components in the following properties:
* "java.class.path", "sun.boot.class.path"
*
* @return class path as used by default by BCEL
*/
public static final String getClassPath() {
String class_path, boot_path;
try {
class_path = SecuritySupport.getSystemProperty("java.class.path");
boot_path = SecuritySupport.getSystemProperty("sun.boot.class.path");
}
catch (SecurityException e) {
return "";
}
ArrayList list = new ArrayList();
getPathComponents(class_path, list);
getPathComponents(boot_path, list);
StringBuffer buf = new StringBuffer();
for(Iterator e = list.iterator(); e.hasNext(); ) {
buf.append((String)e.next());
if(e.hasNext())
buf.append(File.pathSeparatorChar);
}
return buf.toString().intern();
}
/**
* @param name fully qualified class name, e.g. java.lang.String
* @return input stream for class
*/
public InputStream getInputStream(String name) throws IOException {
return getInputStream(name, ".class");
}
/**
* Return stream for class or resource on CLASSPATH.
*
* @param name fully qualified file name, e.g. java/lang/String
* @param suffix file name ends with suff, e.g. .java
* @return input stream for file on class path
*/
public InputStream getInputStream(String name, String suffix) throws IOException {
InputStream is = null;
try {
is = getClass().getClassLoader().getResourceAsStream(name + suffix);
} catch(Exception e) { }
if(is != null)
return is;
return getClassFile(name, suffix).getInputStream();
}
/**
* @param name fully qualified file name, e.g. java/lang/String
* @param suffix file name ends with suff, e.g. .java
* @return class file for the java class
*/
public ClassFile getClassFile(String name, String suffix) throws IOException {
for(int i=0; i < paths.length; i++) {
ClassFile cf;
if((cf = paths[i].getClassFile(name, suffix)) != null)
return cf;
}
throw new IOException("Couldn't find: " + name + suffix);
}
/**
* @param name fully qualified class name, e.g. java.lang.String
* @return input stream for class
*/
public ClassFile getClassFile(String name) throws IOException {
return getClassFile(name, ".class");
}
/**
* @param name fully qualified file name, e.g. java/lang/String
* @param suffix file name ends with suffix, e.g. .java
* @return byte array for file on class path
*/
public byte[] getBytes(String name, String suffix) throws IOException {
InputStream is = getInputStream(name, suffix);
if(is == null)
throw new IOException("Couldn't find: " + name + suffix);
DataInputStream dis = new DataInputStream(is);
byte[] bytes = new byte[is.available()];
dis.readFully(bytes);
dis.close(); is.close();
return bytes;
}
/**
* @return byte array for class
*/
public byte[] getBytes(String name) throws IOException {
return getBytes(name, ".class");
}
/**
* @param name name of file to search for, e.g. java/lang/String.java
* @return full (canonical) path for file
*/
public String getPath(String name) throws IOException {
int index = name.lastIndexOf('.');
String suffix = "";
if(index > 0) {
suffix = name.substring(index);
name = name.substring(0, index);
}
return getPath(name, suffix);
}
/**
* @param name name of file to search for, e.g. java/lang/String
* @param suffix file name suffix, e.g. .java
* @return full (canonical) path for file, if it exists
*/
public String getPath(String name, String suffix) throws IOException {
return getClassFile(name, suffix).getPath();
}
private static abstract class PathEntry implements Serializable {
abstract ClassFile getClassFile(String name, String suffix) throws IOException;
}
/** Contains information about file/ZIP entry of the Java class.
*/
public interface ClassFile {
/** @return input stream for class file.
*/
public abstract InputStream getInputStream() throws IOException;
/** @return canonical path to class file.
*/
public abstract String getPath();
/** @return base path of found class, i.e. class is contained relative
* to that path, which may either denote a directory, or zip file
*/
public abstract String getBase();
/** @return modification time of class file.
*/
public abstract long getTime();
/** @return size of class file.
*/
public abstract long getSize();
}
private static class Dir extends PathEntry {
private String dir;
Dir(String d) { dir = d; }
ClassFile getClassFile(String name, String suffix) throws IOException {
final File file = new File(dir + File.separatorChar +
name.replace('.', File.separatorChar) + suffix);
return SecuritySupport.getFileExists(file)? new ClassFile() {
public InputStream getInputStream() throws IOException { return new FileInputStream(file); }
public String getPath() { try {
return file.getCanonicalPath();
} catch(IOException e) { return null; }
}
public long getTime() { return file.lastModified(); }
public long getSize() { return file.length(); }
public String getBase() { return dir; }
} : null;
}
public String toString() { return dir; }
}
private static class Zip extends PathEntry {
private ZipFile zip;
Zip(ZipFile z) { zip = z; }
ClassFile getClassFile(String name, String suffix) throws IOException {
final ZipEntry entry = zip.getEntry(name.replace('.', '/') + suffix);
return (entry != null)? new ClassFile() {
public InputStream getInputStream() throws IOException { return zip.getInputStream(entry); }
public String getPath() { return entry.toString(); }
public long getTime() { return entry.getTime(); }
public long getSize() { return entry.getSize(); }
public String getBase() {
return zip.getName();
}
} : null;
}
}
}

28
jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
View File

@ -60,7 +60,6 @@ package com.sun.org.apache.bcel.internal.util;
import java.io.*;
import java.util.Map;
import java.util.HashMap;
import com.sun.org.apache.bcel.internal.classfile.*;
@ -86,30 +85,16 @@ import com.sun.org.apache.bcel.internal.classfile.*;
* @author David Dixon-Peugh
*/
public class SyntheticRepository implements Repository {
private static final String DEFAULT_PATH = ClassPath.getClassPath();
private static HashMap _instances = new HashMap(); // CLASSPATH X REPOSITORY
private ClassPath _path = null;
private HashMap _loadedClasses = new HashMap(); // CLASSNAME X JAVACLASS
private SyntheticRepository(ClassPath path) {
_path = path;
}
public static SyntheticRepository getInstance() {
return getInstance(ClassPath.SYSTEM_CLASS_PATH);
}
public static SyntheticRepository getInstance(ClassPath classPath) {
SyntheticRepository rep = (SyntheticRepository)_instances.get(classPath);
if(rep == null) {
rep = new SyntheticRepository(classPath);
_instances.put(classPath, rep);
private SyntheticRepository() {
}
return rep;
public static SyntheticRepository getInstance() {
return new SyntheticRepository();
}
/**
@ -147,12 +132,9 @@ public class SyntheticRepository implements Repository {
className = className.replace('/', '.'); // Just in case, canonical form
try {
return loadClass(_path.getInputStream(className), className);
} catch(IOException e) {
throw new ClassNotFoundException("Exception while looking for class " +
IOException e = new IOException("Couldn't find: " + className + ".class");
throw new ClassNotFoundException("Exception while looking for class " +
className + ": " + e.toString());
}
}
/**

1285
jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
View File

File diff suppressed because it is too large Load Diff

142
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
View File

@ -1,142 +0,0 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
/*
* Copyright 2002-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
/*
* $Id: Hashtree2Node.java,v 1.2.4.1 2005/09/15 08:15:45 suresh_emailid Exp $
*/
package com.sun.org.apache.xml.internal.utils;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
/**
* Simple static utility to convert Hashtable to a Node.
*
* Please maintain JDK 1.1.x compatibility; no Collections!
*
* @see com.sun.org.apache.xalan.internal.xslt.EnvironmentCheck
* @see com.sun.org.apache.xalan.internal.lib.Extensions
* @author shane_curcuru@us.ibm.com
* @xsl.usage general
*/
public abstract class Hashtree2Node
{
/**
* Convert a Hashtable into a Node tree.
*
* <p>The hash may have either Hashtables as values (in which
* case we recurse) or other values, in which case we print them
* as &lt;item> elements, with a 'key' attribute with the value
* of the key, and the element contents as the value.</p>
*
* <p>If args are null we simply return without doing anything.
* If we encounter an error, we will attempt to add an 'ERROR'
* Element with exception info; if that doesn't work we simply
* return without doing anything else byt printStackTrace().</p>
*
* @param hash to get info from (may have sub-hashtables)
* @param name to use as parent element for appended node
* futurework could have namespace and prefix as well
* @param container Node to append our report to
* @param factory Document providing createElement, etc. services
*/
public static void appendHashToNode(Hashtable hash, String name,
Node container, Document factory)
{
// Required arguments must not be null
if ((null == container) || (null == factory) || (null == hash))
{
return;
}
// name we will provide a default value for
String elemName = null;
if ((null == name) || ("".equals(name)))
elemName = "appendHashToNode";
else
elemName = name;
try
{
Element hashNode = factory.createElement(elemName);
container.appendChild(hashNode);
Enumeration keys = hash.keys();
Vector v = new Vector();
while (keys.hasMoreElements())
{
Object key = keys.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
if (item instanceof Hashtable)
{
// Ensure a pre-order traversal; add this hashes
// items before recursing to child hashes
// Save name and hash in two steps
v.addElement(keyStr);
v.addElement((Hashtable) item);
}
else
{
try
{
// Add item to node
Element node = factory.createElement("item");
node.setAttribute("key", keyStr);
node.appendChild(factory.createTextNode((String)item));
hashNode.appendChild(node);
}
catch (Exception e)
{
Element node = factory.createElement("item");
node.setAttribute("key", keyStr);
node.appendChild(factory.createTextNode("ERROR: Reading " + key + " threw: " + e.toString()));
hashNode.appendChild(node);
}
}
}
// Now go back and do the saved hashes
keys = v.elements();
while (keys.hasMoreElements())
{
// Retrieve name and hash in two steps
String n = (String) keys.nextElement();
Hashtable h = (Hashtable) keys.nextElement();
appendHashToNode(h, n, hashNode, factory);
}
}
catch (Exception e2)
{
// Ooops, just bail (suggestions for a safe thing
// to do in this case appreciated)
e2.printStackTrace();
}
}
}

4
jaxp/test/javax/xml/jaxp/internaltest/javax/xml/common/bug6979306/Bug6979306Test.java
View File

@ -25,21 +25,17 @@
* @test
* @modules java.xml/com.sun.org.apache.xerces.internal.impl
* java.xml/com.sun.org.apache.xalan.internal
* java.xml/com.sun.org.apache.xalan.internal.xslt
* @bug 6979306
* @summary Test JAXP component version.
*/
import org.testng.annotations.Test;
import com.sun.org.apache.xalan.internal.xslt.EnvironmentCheck;
public class Bug6979306Test {
@Test
public void test() {
String[] input = {};
EnvironmentCheck.main(input);
com.sun.org.apache.xerces.internal.impl.Version.main(input);
com.sun.org.apache.xalan.internal.Version._main(input);
}