comparison src/share/vm/prims/jvmtiGen.java @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents f2110083203d
children
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
1 /* 1 /*
2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
29 29
30 import org.xml.sax.SAXException; 30 import org.xml.sax.SAXException;
31 import org.xml.sax.SAXParseException; 31 import org.xml.sax.SAXParseException;
32 import org.w3c.dom.Document; 32 import org.w3c.dom.Document;
33 import org.w3c.dom.DOMException; 33 import org.w3c.dom.DOMException;
34
35 // For write operation 34 // For write operation
36 import javax.xml.transform.Transformer; 35 import javax.xml.transform.Transformer;
37 import javax.xml.transform.TransformerException; 36 import javax.xml.transform.TransformerException;
38 import javax.xml.transform.TransformerFactory; 37 import javax.xml.transform.TransformerFactory;
39 import javax.xml.transform.TransformerConfigurationException; 38 import javax.xml.transform.TransformerConfigurationException;
127 DocumentBuilderFactory factory = 126 DocumentBuilderFactory factory =
128 DocumentBuilderFactory.newInstance(); 127 DocumentBuilderFactory.newInstance();
129 128
130 factory.setNamespaceAware(true); 129 factory.setNamespaceAware(true);
131 factory.setValidating(true); 130 factory.setValidating(true);
131 factory.setXIncludeAware(true);
132 132
133 try { 133 try {
134 File datafile = new File(inFileName); 134 File datafile = new File(inFileName);
135 File stylesheet = new File(xslFileName); 135 File stylesheet = new File(xslFileName);
136 136