";
+
+ visitedObjects.push(arg);
+
+ final String delimiter = ", ";
+ result += "[";
+
+ if (arg instanceof Object[])
+ {
+ Object[] array = (Object[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print_r(visitedObjects, array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof boolean[])
+ {
+ boolean[] array = (boolean[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof byte[])
+ {
+ byte[] array = (byte[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof short[])
+ {
+ short[] array = (short[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof char[])
+ {
+ char[] array = (char[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof int[])
+ {
+ int[] array = (int[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof long[])
+ {
+ long[] array = (long[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof float[])
+ {
+ float[] array = (float[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+ else
+ if (arg instanceof double[])
+ {
+ double[] array = (double[]) arg;
+ for (int i = 0; i < array.length; i++)
+ {
+ result += print(array[i]);
+ if (i < array.length - 1) result += delimiter;
+ }
+ }
+
+ result += "]";
+ visitedObjects.pop();
+
+ } else
+ {
+ result += arg.toString();
+ }
+
+ return result;
+ }
+ }
+}
+
diff --git a/hotspot/test/compiler/6823453/Test.java b/hotspot/test/compiler/6823453/Test.java
new file mode 100644
index 00000000000..531f5302088
--- /dev/null
+++ b/hotspot/test/compiler/6823453/Test.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 6823453
+ * @summary DeoptimizeALot causes fastdebug server jvm to fail with assert(false,"unscheduable graph")
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test -XX:+DeoptimizeALot Test
+ */
+
+public class Test {
+
+ static long vara_1 = 1L;
+
+ static void testa() {
+ short var_2 = (byte) 1.0E10;
+
+ for ( Object temp = new byte[(byte)1.0E10]; true ;
+ var_2 = "1".equals("0") ? ((byte) vara_1) : 1 ) {}
+ }
+
+ static void testb() {
+ long var_1 = -1L;
+
+ short var_2 = (byte) 1.0E10;
+
+ for ( Object temp = new byte[(byte)1.0E10]; true ;
+ var_2 = "1".equals("0") ? ((byte) var_1) : 1 ) {}
+ }
+
+ static void testc() {
+ long var_1 = -1L;
+ if (vara_1 > 0) var_1 = 1L;
+
+ int var_2 = (byte)var_1 - 128;
+
+ for ( Object temp = new byte[var_2]; true ;
+ var_2 = "1".equals("0") ? 2 : 1 ) {}
+ }
+
+ static void testd() {
+ long var_1 = 0L;
+
+ int var_2 = (byte)var_1 + 1;
+ for (int i=0; i<2 ; i++) var_2 = var_2 - 1;
+
+ for ( Object temp = new byte[var_2]; true ;
+ var_2 = "1".equals("0") ? 2 : 1 ) {}
+ }
+
+ public static void main(String[] args) throws Exception {
+ int nex = 0;
+
+ try {
+ testa();
+ }
+ catch (java.lang.NegativeArraySizeException ex) { nex++; }
+ try {
+ testb();
+ }
+ catch (java.lang.NegativeArraySizeException ex) { nex++; }
+ try {
+ testc();
+ }
+ catch (java.lang.NegativeArraySizeException ex) { nex++; }
+ try {
+ testd();
+ }
+ catch (java.lang.NegativeArraySizeException ex) { nex++; }
+
+ if (nex != 4)
+ System.exit(97);
+ }
+}
+
diff --git a/jaxp/.hgignore b/jaxp/.hgignore
index ca1b0b21ee2..eccd39adfa1 100644
--- a/jaxp/.hgignore
+++ b/jaxp/.hgignore
@@ -1,3 +1,4 @@
^build/
^dist/
+^webrev/
^nbproject/private/
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 5d76cae3784..2a305e905e7 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -29,3 +29,6 @@ ae890d80d5dffcd4dc77a1f17d768e192d1852c7 jdk7-b51
69ad87dc25cbcaaaded4727199395ad0c78bc427 jdk7-b52
e8837366d3fd72f7c7a47ebfdbd5106c16156f12 jdk7-b53
946a9f0c493261fa6a010dc33e61b9b535ba80c1 jdk7-b54
+039945fba683ee6773a721e2bd4e449f6133769a jdk7-b55
+c197c6801271c60f9c9f5d18fcc95b59e76dcd54 jdk7-b56
+e4851e9f7be26fc52a628be06ffa8aaea0919bd7 jdk7-b57
diff --git a/jaxp/THIRD_PARTY_README b/jaxp/THIRD_PARTY_README
index 9f4d7e5087a..690890548f2 100644
--- a/jaxp/THIRD_PARTY_README
+++ b/jaxp/THIRD_PARTY_README
@@ -61,6 +61,28 @@ 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 notice is provided with respect to littlecms, which may be included with this software:
+
+Little cms
+Copyright (C) 1998-2004 Marti Maria
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
%% This notice is provided with respect to zlib 1.1.3, which may be included with this software:
Acknowledgments:
@@ -115,16 +137,6 @@ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQ
The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
____________________________________
This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy@w3.org.
-
-%% This notice is provided with respect to jscheme.jar, which may be included with this software:
-Software License Agreement
-Copyright © 1998-2002 by Peter Norvig.
-Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions:
-1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose.
-2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software.
-3.The origin of this software must not be misrepresented, either by explicit claim or by omission.
-4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license).
-If you find this software useful, it would be nice if you let me (peter@norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so.
%% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software:
diff --git a/jaxp/TRADEMARK b/jaxp/TRADEMARK
new file mode 100644
index 00000000000..6587bafba88
--- /dev/null
+++ b/jaxp/TRADEMARK
@@ -0,0 +1,41 @@
+OpenJDK Trademark Notice
+Version 1.1, 2008/3/10
+
+OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner").
+Owner permits any person obtaining a copy of this software (the "Software")
+which is based on original software retrieved from one of the following
+websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6,
+or http://openjdk.java.net (each a "Website", with the original software made
+available by the Owner on a Website being known as the "Website Software") to
+use the Name in package names and version strings of the Software subject to
+the following conditions:
+
+ - The Software is a substantially complete implementation of the OpenJDK
+ development kit or runtime environment code made available by Owner on a
+ Website, and the vast majority of the Software code is identical to the
+ upstream Website Software;
+
+ - No permission is hereby granted to use the Name in any other manner,
+ unless such use constitutes "fair use."
+
+ - The Owner makes no warranties of any kind respecting the Name and all
+ representations and warranties, including any implied warranty of
+ merchantability, fitness for a particular purpose or non-infringement
+ are hereby disclaimed; and
+
+ - This notice and the following legend are included in all copies of the
+ Software or portions of it:
+
+ OpenJDK is a trademark or registered trademark of Sun Microsystems,
+ Inc. in the United States and other countries.
+
+The Name may also be used in connection with descriptions of the Software that
+constitute "fair use," such as "derived from the OpenJDK code base" or "based
+on the OpenJDK source code."
+
+Owner intends to revise this Notice as necessary in order to meet the needs of
+the OpenJDK Community. Please send questions or comments about this Notice to
+Sun Microsystems at openjdk-tm@sun.com. Revisions to this Notice will be
+announced on the public mailing list announce@openjdk.java.net, to which you
+may subscribe by visiting http://mail.openjdk.java.net. The latest version of
+this Notice may be found at http://openjdk.java.net/legal.
diff --git a/jaxp/make/jprt.properties b/jaxp/make/jprt.properties
index 26ffd61a5b5..f75871dec9b 100644
--- a/jaxp/make/jprt.properties
+++ b/jaxp/make/jprt.properties
@@ -32,13 +32,13 @@ solaris_sparc_5.10,\
solaris_sparcv9_5.10,\
solaris_i586_5.10,\
solaris_x64_5.10,\
-linux_i586,\
-linux_x64,\
+linux_i586_2.6,\
+linux_x64_2.6,\
windows_i586,\
windows_x64
# The different build flavors we want
-jprt.build.flavors=product
+jprt.build.flavors=product,fastdebug
# Explicitly designate what the 32bit match is for the 64bit build
jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/XSLTProcessorApplet.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/XSLTProcessorApplet.java
deleted file mode 100644
index 519604c3355..00000000000
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/XSLTProcessorApplet.java
+++ /dev/null
@@ -1,792 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Copyright 1999-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: XSLTProcessorApplet.java,v 1.2.4.1 2005/09/15 02:20:05 jeffsuttor Exp $
- */
-package com.sun.org.apache.xalan.internal.client;
-
-import java.applet.Applet;
-import java.awt.Graphics;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import com.sun.org.apache.xalan.internal.res.XSLMessages;
-import com.sun.org.apache.xalan.internal.res.XSLTErrorResources;
-
-/**
- * Provides applet host for the XSLT processor. To perform transformations on an HTML client:
- *
- * - Use an <applet> tag to embed this applet in the HTML client.
- * - Use the DocumentURL and StyleURL PARAM tags or the {@link #setDocumentURL} and
- * {@link #setStyleURL} methods to specify the XML source document and XSL stylesheet.
- * - Call the {@link #getHtmlText} method (or one of the transformToHtml() methods)
- * to perform the transformation and return the result as a String.
- *
- *
- * This class extends Applet which ultimately causes this class to implement Serializable.
- * This is a serious restriction on this class. All fields that are not transient and not
- * static are written-out/read-in during serialization. So even private fields essentially
- * become part of the API. Developers need to take care when modifying fields.
- * @xsl.usage general
- */
-public class XSLTProcessorApplet extends Applet
-{
-
- /**
- * The stylesheet processor.
- * This field is now transient because a
- * javax.xml.transform.TransformerFactory from JAXP
- * makes no claims to be serializable.
- */
- transient TransformerFactory m_tfactory = null;
-
- /**
- * @serial
- */
- private String m_styleURL;
-
- /**
- * @serial
- */
- private String m_documentURL;
-
- // Parameter names. To change a name of a parameter, you need only make
- // a single change. Simply modify the value of the parameter string below.
- //--------------------------------------------------------------------------
-
- /**
- * @serial
- */
- private final String PARAM_styleURL = "styleURL";
-
- /**
- * @serial
- */
- private final String PARAM_documentURL = "documentURL";
-
-
- // We'll keep the DOM trees around, so tell which trees
- // are cached.
-
- /**
- * @serial
- */
- private String m_styleURLOfCached = null;
-
- /**
- * @serial
- */
- private String m_documentURLOfCached = null;
-
- /**
- * Save this for use on the worker thread; may not be necessary.
- * @serial
- */
- private URL m_codeBase = null;
-
- /**
- * @serial
- */
- private String m_treeURL = null;
-
- /**
- * DocumentBase URL
- * @serial
- */
- private URL m_documentBase = null;
-
- /**
- * Thread stuff for the trusted worker thread.
- */
- transient private Thread m_callThread = null;
-
- /**
- */
- transient private TrustedAgent m_trustedAgent = null;
-
- /**
- * Thread for running TrustedAgent.
- */
- transient private Thread m_trustedWorker = null;
-
- /**
- * Where the worker thread puts the HTML text.
- */
- transient private String m_htmlText = null;
-
- /**
- * Where the worker thread puts the document/stylesheet text.
- */
- transient private String m_sourceText = null;
-
- /**
- * Stylesheet attribute name and value that the caller can set.
- */
- transient private String m_nameOfIDAttrOfElemToModify = null;
-
- /**
- */
- transient private String m_elemIdToModify = null;
-
- /**
- */
- transient private String m_attrNameToSet = null;
-
- /**
- */
- transient private String m_attrValueToSet = null;
-
- /**
- * The XSLTProcessorApplet constructor takes no arguments.
- */
- public XSLTProcessorApplet(){}
-
- /**
- * Get basic information about the applet
- * @return A String with the applet name and author.
- */
- public String getAppletInfo()
- {
- return "Name: XSLTProcessorApplet\r\n" + "Author: Scott Boag";
- }
-
- /**
- * Get descriptions of the applet parameters.
- * @return A two-dimensional array of Strings with Name, Type, and Description
- * for each parameter.
- */
- public String[][] getParameterInfo()
- {
-
- String[][] info =
- {
- { PARAM_styleURL, "String", "URL to an XSL stylesheet" },
- { PARAM_documentURL, "String", "URL to an XML document" },
- };
-
- return info;
- }
-
- /**
- * Standard applet initialization.
- */
- public void init()
- {
-
- // PARAMETER SUPPORT
- // The following code retrieves the value of each parameter
- // specified with the tag and stores it in a member
- // variable.
- //----------------------------------------------------------------------
- String param;
-
- // styleURL: Parameter description
- //----------------------------------------------------------------------
- param = getParameter(PARAM_styleURL);
-
- // stylesheet parameters
- m_parameters = new Hashtable();
-
- if (param != null)
- setStyleURL(param);
-
- // documentURL: Parameter description
- //----------------------------------------------------------------------
- param = getParameter(PARAM_documentURL);
-
- if (param != null)
- setDocumentURL(param);
-
- m_codeBase = this.getCodeBase();
- m_documentBase = this.getDocumentBase();
-
- // If you use a ResourceWizard-generated "control creator" class to
- // arrange controls in your applet, you may want to call its
- // CreateControls() method from within this method. Remove the following
- // call to resize() before adding the call to CreateControls();
- // CreateControls() does its own resizing.
- //----------------------------------------------------------------------
- resize(320, 240);
- }
-
- /**
- * Automatically called when the HTML client containing the applet loads.
- * This method starts execution of the applet thread.
- */
- public void start()
- {
- //check if user code's on the stack before invoking the worker thread
- boolean passed = false;
- try {
- java.security.AccessController.checkPermission(new java.security.AllPermission());
- } catch (SecurityException se) {
- //expected
- passed = true;
- }
- if (!passed) {
- throw new SecurityException("The XSLTProcessorApplet class must be extended and its method start() overridden.");
- }
-
- m_trustedAgent = new TrustedAgent();
- Thread currentThread = Thread.currentThread();
- m_trustedWorker = new Thread(currentThread.getThreadGroup(),
- m_trustedAgent);
- m_trustedWorker.start();
- try
- {
- m_tfactory = TransformerFactory.newInstance();
- this.showStatus("Causing Transformer and Parser to Load and JIT...");
-
- // Prime the pump so that subsequent transforms are faster.
- StringReader xmlbuf = new StringReader("");
- StringReader xslbuf = new StringReader(
- "");
- PrintWriter pw = new PrintWriter(new StringWriter());
-
- synchronized (m_tfactory)
- {
- Templates templates = m_tfactory.newTemplates(new StreamSource(xslbuf));
- Transformer transformer = templates.newTransformer();
- transformer.transform(new StreamSource(xmlbuf), new StreamResult(pw));
- }
- System.out.println("Primed the pump!");
- this.showStatus("Ready to go!");
- }
- catch (Exception e)
- {
- this.showStatus("Could not prime the pump!");
- System.out.println("Could not prime the pump!");
- e.printStackTrace();
- }
- }
-
- /**
- * Do not call; this applet contains no UI or visual components.
- *
- */
- public void paint(Graphics g){}
-
- /**
- * Automatically called when the HTML page containing the applet is no longer
- * on the screen. Stops execution of the applet thread.
- */
- public void stop()
- {
- if (null != m_trustedWorker)
- {
- m_trustedWorker.stop();
-
- // m_trustedWorker.destroy();
- m_trustedWorker = null;
- }
-
- m_styleURLOfCached = null;
- m_documentURLOfCached = null;
- }
-
- /**
- * Cleanup; called when applet is terminated and unloaded.
- */
- public void destroy()
- {
- if (null != m_trustedWorker)
- {
- m_trustedWorker.stop();
-
- // m_trustedWorker.destroy();
- m_trustedWorker = null;
- }
- m_styleURLOfCached = null;
- m_documentURLOfCached = null;
- }
-
- /**
- * Set the URL to the XSL stylesheet that will be used
- * to transform the input XML. No processing is done yet.
- * @param urlString valid URL string for XSL stylesheet.
- */
- public void setStyleURL(String urlString)
- {
- m_styleURL = urlString;
- }
-
- /**
- * Set the URL to the XML document that will be transformed
- * with the XSL stylesheet. No processing is done yet.
- * @param urlString valid URL string for XML document.
- */
- public void setDocumentURL(String urlString)
- {
- m_documentURL = urlString;
- }
-
- /**
- * The processor keeps a cache of the source and
- * style trees, so call this method if they have changed
- * or you want to do garbage collection.
- */
- public void freeCache()
- {
- m_styleURLOfCached = null;
- m_documentURLOfCached = null;
- }
-
- /**
- * Set an attribute in the stylesheet, which gives the ability
- * to have some dynamic selection control.
- * @param nameOfIDAttrOfElemToModify The name of an attribute to search for a unique id.
- * @param elemId The unique ID to look for.
- * @param attrName Once the element is found, the name of the attribute to set.
- * @param value The value to set the attribute to.
- */
- public void setStyleSheetAttribute(String nameOfIDAttrOfElemToModify,
- String elemId, String attrName,
- String value)
- {
- m_nameOfIDAttrOfElemToModify = nameOfIDAttrOfElemToModify;
- m_elemIdToModify = elemId;
- m_attrNameToSet = attrName;
- m_attrValueToSet = value;
- }
-
-
- /**
- * Stylesheet parameter key/value pair stored in a hashtable
- */
- transient Hashtable m_parameters;
-
- /**
- * Submit a stylesheet parameter.
- *
- * @param key stylesheet parameter key
- * @param expr the parameter expression to be submitted.
- * @see javax.xml.transform.Transformer#setParameter(String,Object)
- */
- public void setStylesheetParam(String key, String expr)
- {
- m_parameters.put(key, expr);
- }
-
- /**
- * Given a String containing markup, escape the markup so it
- * can be displayed in the browser.
- *
- * @param s String to escape
- *
- * The escaped string.
- */
- public String escapeString(String s)
- {
- StringBuffer sb = new StringBuffer();
- int length = s.length();
-
- for (int i = 0; i < length; i++)
- {
- char ch = s.charAt(i);
-
- if ('<' == ch)
- {
- sb.append("<");
- }
- else if ('>' == ch)
- {
- sb.append(">");
- }
- else if ('&' == ch)
- {
- sb.append("&");
- }
- else if (0xd800 <= ch && ch < 0xdc00)
- {
- // UTF-16 surrogate
- int next;
-
- if (i + 1 >= length)
- {
- throw new RuntimeException(
- XSLMessages.createMessage(
- XSLTErrorResources.ER_INVALID_UTF16_SURROGATE,
- new Object[]{ Integer.toHexString(ch) })); //"Invalid UTF-16 surrogate detected: "
-
- //+Integer.toHexString(ch)+ " ?");
- }
- else
- {
- next = s.charAt(++i);
-
- if (!(0xdc00 <= next && next < 0xe000))
- throw new RuntimeException(
- XSLMessages.createMessage(
- XSLTErrorResources.ER_INVALID_UTF16_SURROGATE,
- new Object[]{
- Integer.toHexString(ch) + " "
- + Integer.toHexString(next) })); //"Invalid UTF-16 surrogate detected: "
-
- //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
- next = ((ch - 0xd800) << 10) + next - 0xdc00 + 0x00010000;
- }
- sb.append("&#x");
- sb.append(Integer.toHexString(next));
- sb.append(";");
- }
- else
- {
- sb.append(ch);
- }
- }
- return sb.toString();
- }
-
- /**
- * Assuming the stylesheet URL and the input XML URL have been set,
- * perform the transformation and return the result as a String.
- *
- * @return A string that contains the contents pointed to by the URL.
- *
- */
- public String getHtmlText()
- {
- m_trustedAgent.m_getData = true;
- m_callThread = Thread.currentThread();
- try
- {
- synchronized (m_callThread)
- {
- m_callThread.wait();
- }
- }
- catch (InterruptedException ie)
- {
- System.out.println(ie.getMessage());
- }
- return m_htmlText;
- }
-
- /**
- * Get an XML document (or stylesheet)
- *
- * @param treeURL valid URL string for the document.
- *
- * @return document
- *
- * @throws IOException
- */
- public String getTreeAsText(String treeURL) throws IOException
- {
- m_treeURL = treeURL;
- m_trustedAgent.m_getData = true;
- m_trustedAgent.m_getSource = true;
- m_callThread = Thread.currentThread();
- try
- {
- synchronized (m_callThread)
- {
- m_callThread.wait();
- }
- }
- catch (InterruptedException ie)
- {
- System.out.println(ie.getMessage());
- }
- return m_sourceText;
- }
-
- /**
- * Use a Transformer to copy the source document
- * to a StreamResult.
- *
- * @return the document as a string
- */
- private String getSource() throws TransformerException
- {
- StringWriter osw = new StringWriter();
- PrintWriter pw = new PrintWriter(osw, false);
- String text = "";
- try
- {
- URL docURL = new URL(m_documentBase, m_treeURL);
- synchronized (m_tfactory)
- {
- Transformer transformer = m_tfactory.newTransformer();
- StreamSource source = new StreamSource(docURL.toString());
- StreamResult result = new StreamResult(pw);
- transformer.transform(source, result);
- text = osw.toString();
- }
- }
- catch (MalformedURLException e)
- {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
- catch (Exception any_error)
- {
- any_error.printStackTrace();
- }
- return text;
- }
-
- /**
- * Get the XML source Tree as a text string suitable
- * for display in a browser. Note that this is for display of the
- * XML itself, not for rendering of HTML by the browser.
- *
- * @return XML source document as a string.
- * @throws Exception thrown if tree can not be converted.
- */
- public String getSourceTreeAsText() throws Exception
- {
- return getTreeAsText(m_documentURL);
- }
-
- /**
- * Get the XSL style Tree as a text string suitable
- * for display in a browser. Note that this is for display of the
- * XML itself, not for rendering of HTML by the browser.
- *
- * @return The XSL stylesheet as a string.
- * @throws Exception thrown if tree can not be converted.
- */
- public String getStyleTreeAsText() throws Exception
- {
- return getTreeAsText(m_styleURL);
- }
-
- /**
- * Get the HTML result Tree as a text string suitable
- * for display in a browser. Note that this is for display of the
- * XML itself, not for rendering of HTML by the browser.
- *
- * @return Transformation result as unmarked text.
- * @throws Exception thrown if tree can not be converted.
- */
- public String getResultTreeAsText() throws Exception
- {
- return escapeString(getHtmlText());
- }
-
- /**
- * Process a document and a stylesheet and return
- * the transformation result. If one of these is null, the
- * existing value (of a previous transformation) is not affected.
- *
- * @param doc URL string to XML document
- * @param style URL string to XSL stylesheet
- *
- * @return HTML transformation result
- */
- public String transformToHtml(String doc, String style)
- {
-
- if (null != doc)
- {
- m_documentURL = doc;
- }
-
- if (null != style)
- {
- m_styleURL = style;
- }
-
- return getHtmlText();
- }
-
- /**
- * Process a document and a stylesheet and return
- * the transformation result. Use the xsl:stylesheet PI to find the
- * document, if one exists.
- *
- * @param doc URL string to XML document containing an xsl:stylesheet PI.
- *
- * @return HTML transformation result
- */
- public String transformToHtml(String doc)
- {
-
- if (null != doc)
- {
- m_documentURL = doc;
- }
-
- m_styleURL = null;
-
- return getHtmlText();
- }
-
-
- /**
- * Process the transformation.
- *
- * @return The transformation result as a string.
- *
- * @throws TransformerException
- */
- private String processTransformation() throws TransformerException
- {
- String htmlData = null;
- this.showStatus("Waiting for Transformer and Parser to finish loading and JITing...");
-
- synchronized (m_tfactory)
- {
- URL documentURL = null;
- URL styleURL = null;
- StringWriter osw = new StringWriter();
- PrintWriter pw = new PrintWriter(osw, false);
- StreamResult result = new StreamResult(pw);
-
- this.showStatus("Begin Transformation...");
- try
- {
- documentURL = new URL(m_codeBase, m_documentURL);
- StreamSource xmlSource = new StreamSource(documentURL.toString());
-
- styleURL = new URL(m_codeBase, m_styleURL);
- StreamSource xslSource = new StreamSource(styleURL.toString());
-
- Transformer transformer = m_tfactory.newTransformer(xslSource);
-
-
- Enumeration m_keys = m_parameters.keys();
- while (m_keys.hasMoreElements()){
- Object key = m_keys.nextElement();
- Object expression = m_parameters.get(key);
- transformer.setParameter((String) key, expression);
- }
- transformer.transform(xmlSource, result);
- }
- catch (TransformerConfigurationException tfe)
- {
- tfe.printStackTrace();
- throw new RuntimeException(tfe.getMessage());
- }
- catch (MalformedURLException e)
- {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
-
- this.showStatus("Transformation Done!");
- htmlData = osw.toString();
- }
- return htmlData;
- }
-
- /**
- * This class maintains a worker thread that that is
- * trusted and can do things like access data. You need
- * this because the thread that is called by the browser
- * is not trusted and can't access data from the URLs.
- */
- class TrustedAgent implements Runnable
- {
-
- /**
- * Specifies whether the worker thread should perform a transformation.
- */
- public boolean m_getData = false;
-
- /**
- * Specifies whether the worker thread should get an XML document or XSL stylesheet.
- */
- public boolean m_getSource = false;
-
- /**
- * The real work is done from here.
- *
- */
- public void run()
- {
- while (true)
- {
- m_trustedWorker.yield();
-
- if (m_getData) // Perform a transformation or get a document.
- {
- try
- {
- m_getData = false;
- m_htmlText = null;
- m_sourceText = null;
- if (m_getSource) // Get a document.
- {
- m_getSource = false;
- m_sourceText = getSource();
- }
- else // Perform a transformation.
- m_htmlText = processTransformation();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- synchronized (m_callThread)
- {
- m_callThread.notify();
- }
- }
- }
- else
- {
- try
- {
- m_trustedWorker.sleep(50);
- }
- catch (InterruptedException ie)
- {
- ie.printStackTrace();
- }
- }
- }
- }
- }
-
- // For compatiblity with old serialized objects
- // We will change non-serialized fields and change methods
- // and not have this break us.
- private static final long serialVersionUID=4618876841979251422L;
-
- // For compatibility when de-serializing old objects
- private void readObject(java.io.ObjectInputStream inStream) throws IOException, ClassNotFoundException
- {
- inStream.defaultReadObject();
-
- // Needed assignment of non-serialized fields
-
- // A TransformerFactory is not guaranteed to be serializable,
- // so we create one here
- m_tfactory = TransformerFactory.newInstance();
- }
-}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/package.html b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/package.html
deleted file mode 100644
index cc48cd87a4d..00000000000
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- Xalan Client Package.
-
- Implementation of Xalan applet.
-
-
-
-
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
index b6bd82ca0d5..b2d33e940f2 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: Import.java,v 1.2.4.1 2005/09/12 10:32:33 pvedula Exp $
+ * $Id: Import.java,v 1.8 2007/04/09 21:30:40 joehw Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.compiler;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
index 718e5120ecd..3d549f47402 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: Include.java,v 1.2.4.1 2005/09/01 15:44:18 pvedula Exp $
+ * $Id: Include.java,v 1.8 2007/04/09 21:30:41 joehw Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.compiler;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
index e2694039765..b0829dc9ed3 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: Type.java,v 1.2.4.2 2005/09/15 18:34:13 jeffsuttor Exp $
+ * $Id: Type.java,v 1.8 2007/03/28 16:51:19 joehw Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
index 4d11fa8b8d6..cb1c51618a0 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: SAX2DOM.java,v 1.7 2006/01/26 07:01:40 jeffsuttor Exp $
+ * $Id: SAX2DOM.java,v 1.8.2.1 2006/12/04 18:45:41 spericas Exp $
*/
@@ -68,7 +68,7 @@ public class SAX2DOM implements ContentHandler, LexicalHandler, Constants {
static final DocumentBuilderFactory _factory =
DocumentBuilderFactory.newInstance();
- public SAX2DOM() throws ParserConfigurationException {
+ public SAX2DOM() throws ParserConfigurationException {
synchronized (SAX2DOM.class) {
_document = _factory.newDocumentBuilder().newDocument();
}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
index bf31233702a..f31ed040d96 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: TemplatesImpl.java,v 1.2.4.1 2005/09/06 12:19:26 pvedula Exp $
+ * $Id: TemplatesImpl.java,v 1.8 2007/03/26 20:12:27 spericas Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.trax;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
index 0f11b0420f6..aa293177e90 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: TransformerFactoryImpl.java,v 1.2.4.1 2005/09/15 06:15:38 pvedula Exp $
+ * $Id: TransformerFactoryImpl.java,v 1.8 2007/04/09 21:30:41 joehw Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.trax;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
index 0c86f32272f..1ad227cd178 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: TransformerImpl.java,v 1.5 2005/09/28 13:48:46 pvedula Exp $
+ * $Id: TransformerImpl.java,v 1.10 2007/06/13 01:57:09 joehw Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.trax;
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
index 265de02f181..51d76c4b7a0 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
@@ -148,7 +148,6 @@ public class EntityImpl
* @exception DOMException
*
NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
-
public void setPrefix(String prefix)
throws DOMException
{
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
index cf68ef03de1..a02707dc817 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -45,8 +45,8 @@ import com.sun.xml.internal.stream.StaxEntityResolverWrapper;
public class PropertyManager {
- protected static final String STAX_NOTATIONS = "javax.xml.stream.notations";
- protected static final String STAX_ENTITIES = "javax.xml.stream.entities";
+ public static final String STAX_NOTATIONS = "javax.xml.stream.notations";
+ public static final String STAX_ENTITIES = "javax.xml.stream.entities";
private static final String STRING_INTERNING = "http://xml.org/sax/features/string-interning";
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
index 1851ef8fbc7..0a8980b111a 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
@@ -289,6 +289,8 @@ public class XMLDocumentFragmentScannerImpl
protected boolean fReportCdataEvent = false ;
protected boolean fIsCoalesce = false ;
protected String fDeclaredEncoding = null;
+ /** Disallow doctype declaration. */
+ protected boolean fDisallowDoctype = false;
// drivers
@@ -1852,6 +1854,11 @@ public class XMLDocumentFragmentScannerImpl
}
// start general entity
if (!fEntityStore.isDeclaredEntity(name)) {
+ //SUPPORT_DTD=false && ReplaceEntityReferences should throw exception
+ if (fDisallowDoctype && fReplaceEntityReferences) {
+ reportFatalError("EntityNotDeclared", new Object[]{name});
+ return;
+ }
//REVISIT: one more case needs to be included: external PE and standalone is no
if ( fHasExternalDTD && !fStandalone) {
if (fValidation)
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
index d5180fd7bb0..0336ec14982 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
@@ -62,6 +62,10 @@ import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentScanner;
* @author Arnaud Le Hors, IBM
* @author Eric Ye, IBM
* @author Sunitha Reddy, Sun Microsystems
+ *
+ * Refer to the table in unit-test javax.xml.stream.XMLStreamReaderTest.SupportDTD for changes
+ * related to property SupportDTD.
+ * @author Joe Wang, Sun Microsystems
*/
public class XMLDocumentScannerImpl
extends XMLDocumentFragmentScannerImpl{
@@ -185,9 +189,6 @@ public class XMLDocumentScannerImpl
/** Load external DTD. */
protected boolean fLoadExternalDTD = true;
- /** Disallow doctype declaration. */
- protected boolean fDisallowDoctype = false;
-
// state
/** Seen doctype declaration. */
@@ -227,8 +228,8 @@ public class XMLDocumentScannerImpl
/** String. */
private XMLString fString = new XMLString();
- public static final char [] DOCTYPE = {'D','O','C','T','Y','P','E'};
- public static final char [] COMMENTSTRING = {'-','-'};
+ private static final char [] DOCTYPE = {'D','O','C','T','Y','P','E'};
+ private static final char [] COMMENTSTRING = {'-','-'};
//
// Constructors
@@ -708,6 +709,12 @@ public class XMLDocumentScannerImpl
//
// Private methods
//
+ /** Set the scanner state after scanning DTD */
+ protected void setEndDTDScanState() {
+ setScannerState(SCANNER_STATE_PROLOG);
+ setDriver(fPrologDriver);
+ fEntityManager.setEntityHandler(XMLDocumentScannerImpl.this);
+ }
/** Returns the scanner state name. */
protected String getScannerStateName(int state) {
@@ -930,19 +937,20 @@ public class XMLDocumentScannerImpl
reportFatalError("AlreadySeenDoctype", null);
}
fSeenDoctypeDecl = true;
- if(fDTDDriver == null){
- fDTDDriver = new DTDDriver();
- }
-
// scanDoctypeDecl() sends XNI doctypeDecl event that
// in SAX is converted to startDTD() event.
if (scanDoctypeDecl(fDisallowDoctype)) {
+ //allow parsing of entity decls to continue in order to stay well-formed
setScannerState(SCANNER_STATE_DTD_INTERNAL_DECLS);
fSeenInternalSubset = true;
+ if(fDTDDriver == null){
+ fDTDDriver = new DTDDriver();
+ }
setDriver(fContentDriver);
- int dtdEvent = fDTDDriver.next();
+ //always return DTD event, the event however, will not contain any entities
+ return fDTDDriver.next();
// If no DTD support, ignore and continue parsing
- return fDisallowDoctype ? next() : dtdEvent;
+ //return fDisallowDoctype ? next() : dtdEvent;
}
/** xxx:check this part again
@@ -955,17 +963,17 @@ public class XMLDocumentScannerImpl
}
*/
- if (fDisallowDoctype) {
- setScannerState(SCANNER_STATE_PROLOG);
- return next();
- }
-
// handle external subset
if (fDoctypeSystemId != null) {
if (((fValidation || fLoadExternalDTD)
&& (fValidationManager == null || !fValidationManager.isCachedDTD()))) {
- setScannerState(SCANNER_STATE_DTD_EXTERNAL);
+ if (!fDisallowDoctype)
+ setScannerState(SCANNER_STATE_DTD_EXTERNAL);
+ else
+ setScannerState(SCANNER_STATE_PROLOG);
setDriver(fContentDriver);
+ if(fDTDDriver == null)
+ fDTDDriver = new DTDDriver();
return fDTDDriver.next();
}
@@ -976,8 +984,13 @@ public class XMLDocumentScannerImpl
// This handles the case of a DOCTYPE that had neither an internal subset or an external subset.
fDTDScanner.setInputSource(fExternalSubsetSource);
fExternalSubsetSource = null;
- setScannerState(SCANNER_STATE_DTD_EXTERNAL_DECLS);
+ if (!fDisallowDoctype)
+ setScannerState(SCANNER_STATE_DTD_EXTERNAL_DECLS);
+ else
+ setScannerState(SCANNER_STATE_PROLOG);
setDriver(fContentDriver);
+ if(fDTDDriver == null)
+ fDTDDriver = new DTDDriver();
return fDTDDriver.next();
}
}
@@ -1117,19 +1130,21 @@ public class XMLDocumentScannerImpl
}
fMarkupDepth--;
- // scan external subset next
- if (!XMLDocumentScannerImpl.this.fDisallowDoctype &&
- fDoctypeSystemId != null && (fValidation || fLoadExternalDTD)) {
- setScannerState(SCANNER_STATE_DTD_EXTERNAL);
+ if (fDisallowDoctype) {
+ //simply reset the entity store without having to mess around
+ //with the DTD Scanner code
+ fEntityStore = fEntityManager.getEntityStore();
+ fEntityStore.reset();
+ } else {
+ // scan external subset next unless we are ignoring DTDs
+ if (fDoctypeSystemId != null && (fValidation || fLoadExternalDTD)) {
+ setScannerState(SCANNER_STATE_DTD_EXTERNAL);
+ break;
+ }
}
- // break out of here
- else {
- setScannerState(SCANNER_STATE_PROLOG);
- setDriver(fPrologDriver);
- fEntityManager.setEntityHandler(XMLDocumentScannerImpl.this);
- return true;
- }
+ setEndDTDScanState();
+ return true;
}
break;
}
@@ -1160,13 +1175,16 @@ public class XMLDocumentScannerImpl
boolean completeDTD = true;
boolean moreToScan = fDTDScanner.scanDTDExternalSubset(completeDTD);
if (!moreToScan) {
- setScannerState(SCANNER_STATE_PROLOG);
- setDriver(fPrologDriver);
- fEntityManager.setEntityHandler(XMLDocumentScannerImpl.this);
+ setEndDTDScanState();
return true;
}
break;
}
+ case SCANNER_STATE_PROLOG : {
+ // skip entity decls
+ setEndDTDScanState();
+ return true;
+ }
default: {
throw new XNIException("DTDDriver#dispatch: scanner state="+fScannerState+" ("+getScannerStateName(fScannerState)+')');
}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
index 4b721d8f89b..4535aed18ab 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
@@ -56,7 +56,6 @@ public class XMLStreamFilterImpl implements javax.xml.stream.XMLStreamReader {
* hasNext() to advance the underlining stream in order to find the next acceptable event
*/
private boolean fStreamAdvancedByHasNext = false;
-
/** Creates a new instance of XMLStreamFilterImpl */
public XMLStreamFilterImpl(XMLStreamReader reader,StreamFilter filter){
@@ -436,7 +435,6 @@ public class XMLStreamFilterImpl implements javax.xml.stream.XMLStreamReader {
*/
public String getVersion() {
return fStreamReader.getVersion();
-
}
/**
@@ -532,5 +530,4 @@ public class XMLStreamFilterImpl implements javax.xml.stream.XMLStreamReader {
public String getAttributeLocalName(int index){
return fStreamReader.getAttributeLocalName(index);
}
-
}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
index a05a3e57a0a..208e44e5b67 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
@@ -34,4 +34,3 @@ XPointerResolutionUnsuccessful = XPointer resolution unsuccessful.
# Messages from erroneous set-up
IncompatibleNamespaceContext = The type of the NamespaceContext is incompatible with using XInclude; it must be an instance of XIncludeNamespaceSupport
ExpandedSystemId = Could not expand system id of included resource
-null
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
index c98ebbf4dcf..c017b8704dc 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
@@ -1214,19 +1214,29 @@ public class XSAttributeChecker {
int max = ((XInt)attrValues[ATTIDX_MAXOCCURS]).intValue();
if (max != SchemaSymbols.OCCURRENCE_UNBOUNDED) {
- // The maxOccurs restriction no longer applies to elements
- // and wildcards. These are now validated using a constant
- // space algorithm. The restriction still applies to model
- // groups such as xs:sequence.
+ // maxOccurLimit is only check in secure mode
+ if (fSchemaHandler.fSecureProcessing != null) {
+ String localName = element.getLocalName();
- String localName = element.getLocalName();
- if (fSchemaHandler.fSecureProcessing != null &&
- !localName.equals("element") && !localName.equals("any")) {
+ // The maxOccurs restriction no longer applies to elements
+ // and wildcards in a sequence in which they are the only
+ // particle. These are now validated using a constant
+ // space algorithm. The restriction still applies to all
+ // other cases.
+
+ // Determine if constant-space algorithm can be applied
+ final boolean optimize =
+ (localName.equals("element") || localName.equals("any")) &&
+ (element.getNextSibling() == null) &&
+ (element.getPreviousSibling() == null) &&
+ (element.getParentNode().getLocalName().equals("sequence"));
+
+ if (!optimize) {
//Revisit :: IMO this is not right place to check
// maxOccurNodeLimit.
int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getMaxOccurNodeLimit();
if (max > maxOccurNodeLimit) {
- reportSchemaError("maxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
+ reportSchemaFatalError("maxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
// reset max values in case processing continues on error
attrValues[ATTIDX_MAXOCCURS] = fXIntPool.getXInt(maxOccurNodeLimit);
@@ -1234,6 +1244,7 @@ public class XSAttributeChecker {
max = maxOccurNodeLimit;
}
}
+ }
if (min > max) {
reportSchemaError ("p-props-correct.2.1",
@@ -1607,6 +1618,10 @@ public class XSAttributeChecker {
return retValue;
}
+ void reportSchemaFatalError (String key, Object[] args, Element ele) {
+ fSchemaHandler.reportSchemaFatalError(key, args, ele);
+ }
+
void reportSchemaError (String key, Object[] args, Element ele) {
fSchemaHandler.reportSchemaError(key, args, ele);
}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
index ce40559cdc2..665db93eeba 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
@@ -2523,25 +2523,26 @@ public class XSDHandler {
return false;
}
+ void reportSchemaFatalError(String key, Object[] args, Element ele) {
+ reportSchemaErr(key, args, ele, XMLErrorReporter.SEVERITY_FATAL_ERROR);
+ }
+
void reportSchemaError(String key, Object[] args, Element ele) {
- if (element2Locator(ele, xl)) {
- fErrorReporter.reportError(xl, XSMessageFormatter.SCHEMA_DOMAIN,
- key, args, XMLErrorReporter.SEVERITY_ERROR);
- }
- else {
- fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
- key, args, XMLErrorReporter.SEVERITY_ERROR);
- }
+ reportSchemaErr(key, args, ele, XMLErrorReporter.SEVERITY_ERROR);
}
void reportSchemaWarning(String key, Object[] args, Element ele) {
+ reportSchemaErr(key, args, ele, XMLErrorReporter.SEVERITY_WARNING);
+ }
+
+ void reportSchemaErr(String key, Object[] args, Element ele, short type) {
if (element2Locator(ele, xl)) {
fErrorReporter.reportError(xl, XSMessageFormatter.SCHEMA_DOMAIN,
- key, args, XMLErrorReporter.SEVERITY_WARNING);
+ key, args, type);
}
else {
fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
- key, args, XMLErrorReporter.SEVERITY_WARNING);
+ key, args, type);
}
}
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
index f5e63002cf1..95265b45ebb 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -111,6 +111,10 @@ public final class XMLSchemaFactory extends SchemaFactory {
fXMLSchemaLoader.setProperty(XMLGRAMMAR_POOL, fXMLGrammarPoolWrapper);
fXMLSchemaLoader.setEntityResolver(fDOMEntityResolverWrapper);
fXMLSchemaLoader.setErrorHandler(fErrorHandlerWrapper);
+
+ // Enable secure processing feature by default
+ fSecurityManager = new SecurityManager();
+ fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
}
/**
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
index 842d80b9aff..08c0f4d073e 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
@@ -943,8 +943,7 @@ public class XIncludeHandler
setState(STATE_IGNORE);
}
else {
- reportFatalError("NoFallback",
- new Object[] { attributes.getValue(null, "href") });
+ reportFatalError("NoFallback");
}
}
else if (isFallbackElement(element)) {
@@ -1002,8 +1001,7 @@ public class XIncludeHandler
// we check to see if the children of this include element contained a fallback
if (getState() == STATE_EXPECT_FALLBACK
&& !getSawFallback(fDepth + 1)) {
- reportFatalError("NoFallback",
- new Object[] { "unknown" });
+ reportFatalError("NoFallback");
}
}
if (isFallbackElement(element)) {
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/jaxp/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
index 6bcfc19f867..1fc66fde8e2 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
@@ -53,7 +53,35 @@ public class ThreadControllerWrapper
{
/**
- * Will get a thread from the pool, execute the task
+ * This class was introduced as a fix for CR 6607339.
+ */
+ final class SafeThread extends Thread {
+ private volatile boolean ran = false;
+
+ public SafeThread(Runnable target) {
+ super(target);
+ }
+
+ public final void run() {
+ if (Thread.currentThread() != this) {
+ throw new IllegalStateException("The run() method in a"
+ + " SafeThread cannot be called from another thread.");
+ }
+ synchronized (this) {
+ if (!ran) {
+ ran = true;
+ }
+ else {
+ throw new IllegalStateException("The run() method in a"
+ + " SafeThread cannot be called more than once.");
+ }
+ }
+ super.run();
+ }
+ }
+
+ /**
+ * Will get a thread from the pool, execute the task
* and return the thread to the pool.
*
* The return value is used only to wait for completion
@@ -68,7 +96,7 @@ public class ThreadControllerWrapper
public Thread run(Runnable task, int priority)
{
- Thread t = new Thread(task);
+ Thread t = new SafeThread(task);
t.start();
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java b/jaxp/src/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
index 71e87c0e1fb..c9e0661b6c7 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: NodeSequence.java,v 1.2.4.2 2005/09/14 19:45:19 jeffsuttor Exp $
+ * $Id: NodeSequence.java,v 1.6 2007/01/12 19:26:42 spericas Exp $
*/
package com.sun.org.apache.xpath.internal.axes;
diff --git a/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
index 3f39341c9bf..e046f530990 100644
--- a/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
+++ b/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
@@ -25,6 +25,8 @@
package com.sun.xml.internal.stream.events;
+import com.sun.org.apache.xerces.internal.impl.PropertyManager;
+import java.util.List;
import javax.xml.stream.util.XMLEventAllocator;
import javax.xml.stream.*;
import javax.xml.stream.events.*;
@@ -144,7 +146,13 @@ public class XMLEventAllocatorImpl implements XMLEventAllocator {
break;
}
case XMLEvent.DTD:{
- event = new DTDEvent(streamReader.getText());
+ DTDEvent dtdEvent = new DTDEvent(streamReader.getText());
+ dtdEvent.setLocation(streamReader.getLocation());
+ List entities = (List)streamReader.getProperty(PropertyManager.STAX_ENTITIES);
+ if (entities != null && entities.size() != 0) dtdEvent.setEntities(entities);
+ List notations = (List)streamReader.getProperty(PropertyManager.STAX_NOTATIONS);
+ if (notations != null && notations.size() != 0) dtdEvent.setNotations(notations);
+ event = dtdEvent;
break;
}
case XMLEvent.CDATA:{
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 82117eae928..7978c2806c9 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -29,3 +29,6 @@ af4a3eeb7812a5d09a241c50b51b3c648a9d45c1 jdk7-b46
e646890d18b770f625f14ed4ad5c50554d8d3d8b jdk7-b52
b250218eb2e534384667ec73e3713e684667fd4c jdk7-b53
50ea00dc5f143fe00025233e704903c37f8464aa jdk7-b54
+e0eebd978b830c09e7862cff3f77a914c15651c9 jdk7-b55
+0f7fbf85f7a1d9c027a863b9955c623352ed1292 jdk7-b56
+68257a5eb19afc11aee7eb19f7250f9b9eec7c05 jdk7-b57
diff --git a/jaxws/THIRD_PARTY_README b/jaxws/THIRD_PARTY_README
index 9f4d7e5087a..690890548f2 100644
--- a/jaxws/THIRD_PARTY_README
+++ b/jaxws/THIRD_PARTY_README
@@ -61,6 +61,28 @@ 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 notice is provided with respect to littlecms, which may be included with this software:
+
+Little cms
+Copyright (C) 1998-2004 Marti Maria
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
%% This notice is provided with respect to zlib 1.1.3, which may be included with this software:
Acknowledgments:
@@ -115,16 +137,6 @@ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQ
The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
____________________________________
This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy@w3.org.
-
-%% This notice is provided with respect to jscheme.jar, which may be included with this software:
-Software License Agreement
-Copyright © 1998-2002 by Peter Norvig.
-Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions:
-1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose.
-2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software.
-3.The origin of this software must not be misrepresented, either by explicit claim or by omission.
-4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license).
-If you find this software useful, it would be nice if you let me (peter@norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so.
%% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software:
diff --git a/jaxws/TRADEMARK b/jaxws/TRADEMARK
new file mode 100644
index 00000000000..6587bafba88
--- /dev/null
+++ b/jaxws/TRADEMARK
@@ -0,0 +1,41 @@
+OpenJDK Trademark Notice
+Version 1.1, 2008/3/10
+
+OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner").
+Owner permits any person obtaining a copy of this software (the "Software")
+which is based on original software retrieved from one of the following
+websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6,
+or http://openjdk.java.net (each a "Website", with the original software made
+available by the Owner on a Website being known as the "Website Software") to
+use the Name in package names and version strings of the Software subject to
+the following conditions:
+
+ - The Software is a substantially complete implementation of the OpenJDK
+ development kit or runtime environment code made available by Owner on a
+ Website, and the vast majority of the Software code is identical to the
+ upstream Website Software;
+
+ - No permission is hereby granted to use the Name in any other manner,
+ unless such use constitutes "fair use."
+
+ - The Owner makes no warranties of any kind respecting the Name and all
+ representations and warranties, including any implied warranty of
+ merchantability, fitness for a particular purpose or non-infringement
+ are hereby disclaimed; and
+
+ - This notice and the following legend are included in all copies of the
+ Software or portions of it:
+
+ OpenJDK is a trademark or registered trademark of Sun Microsystems,
+ Inc. in the United States and other countries.
+
+The Name may also be used in connection with descriptions of the Software that
+constitute "fair use," such as "derived from the OpenJDK code base" or "based
+on the OpenJDK source code."
+
+Owner intends to revise this Notice as necessary in order to meet the needs of
+the OpenJDK Community. Please send questions or comments about this Notice to
+Sun Microsystems at openjdk-tm@sun.com. Revisions to this Notice will be
+announced on the public mailing list announce@openjdk.java.net, to which you
+may subscribe by visiting http://mail.openjdk.java.net. The latest version of
+this Notice may be found at http://openjdk.java.net/legal.
diff --git a/jaxws/make/Makefile b/jaxws/make/Makefile
index 56696720183..3dc17bfa39f 100644
--- a/jaxws/make/Makefile
+++ b/jaxws/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007 Sun Microsystems, Inc. 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
diff --git a/jaxws/make/build.xml b/jaxws/make/build.xml
index 9f013e992a8..5b83e558dfc 100644
--- a/jaxws/make/build.xml
+++ b/jaxws/make/build.xml
@@ -78,6 +78,15 @@
+
+
+
+
+
+
diff --git a/jaxws/make/jprt.properties b/jaxws/make/jprt.properties
index 26ffd61a5b5..f75871dec9b 100644
--- a/jaxws/make/jprt.properties
+++ b/jaxws/make/jprt.properties
@@ -32,13 +32,13 @@ solaris_sparc_5.10,\
solaris_sparcv9_5.10,\
solaris_i586_5.10,\
solaris_x64_5.10,\
-linux_i586,\
-linux_x64,\
+linux_i586_2.6,\
+linux_x64_2.6,\
windows_i586,\
windows_x64
# The different build flavors we want
-jprt.build.flavors=product
+jprt.build.flavors=product,fastdebug
# Explicitly designate what the 32bit match is for the 64bit build
jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
diff --git a/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java b/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java
index 6e5e6a6e7b8..5fd26866922 100644
--- a/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java
+++ b/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java
@@ -182,7 +182,8 @@ public class MailcapFile {
*/
public String[] getNativeCommands(String mime_type) {
String[] cmds = null;
- List v = (List)native_commands.get(mime_type.toLowerCase());
+ List v =
+ (List)native_commands.get(mime_type.toLowerCase(Locale.ENGLISH));
if (v != null) {
cmds = new String[v.size()];
cmds = (String[])v.toArray(cmds);
@@ -301,7 +302,8 @@ public class MailcapFile {
reportParseError(MailcapTokenizer.STRING_TOKEN, currentToken,
tokenizer.getCurrentTokenValue());
}
- String primaryType = tokenizer.getCurrentTokenValue().toLowerCase();
+ String primaryType =
+ tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH);
String subType = "*";
// parse the '/' between primary and sub
@@ -322,7 +324,8 @@ public class MailcapFile {
reportParseError(MailcapTokenizer.STRING_TOKEN,
currentToken, tokenizer.getCurrentTokenValue());
}
- subType = tokenizer.getCurrentTokenValue().toLowerCase();
+ subType =
+ tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH);
// get the next token to simplify the next step
currentToken = tokenizer.nextToken();
@@ -386,8 +389,8 @@ public class MailcapFile {
reportParseError(MailcapTokenizer.STRING_TOKEN,
currentToken, tokenizer.getCurrentTokenValue());
}
- String paramName =
- tokenizer.getCurrentTokenValue().toLowerCase();
+ String paramName = tokenizer.getCurrentTokenValue().
+ toLowerCase(Locale.ENGLISH);
// parse the '=' which separates the name from the value
currentToken = tokenizer.nextToken();
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java
index 7943701af5a..845fbdb0292 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
* This helps enable whether the JDefinedClass is a Class or Interface or
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java
index 9e2174d9940..602e8ecb725 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
index 1c9e580fe29..c42297a82cc 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java
index 12d68285f10..01b766f0cc6 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java
index f7bc5eaeda7..07cd44f73c0 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
index df2d90cfdfb..1e9f8c6d201 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java
index 77e61cecc1e..a66be614977 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
index 426ebd5d273..83fe71629f5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java
index 6a8727d3441..440d4001d6c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java
index a9d0efd3689..d10da44d93f 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java
index b6934c93c85..d86d08695cc 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java
index 87e78dd324d..6a433c0d4fb 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java
index d5a1934a0ab..91bfa57a68e 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java
index 75368a3d0e7..f352498fd3d 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java
index fe7bb364e5a..e4f9560f406 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
index c64b5e9c795..57d7552d7ab 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -220,16 +220,14 @@ public final class JBlock implements JGenerable, JStatement {
* @return Newly generated JInvocation
*/
public JInvocation invoke(JExpression expr, JMethod method) {
- return invoke(expr, method.name());
+ return insert(new JInvocation(expr, method));
}
/**
* Creates a static invocation statement.
*/
public JInvocation staticInvoke(JClass type, String method) {
- JInvocation i = new JInvocation(type, method);
- insert(i);
- return i;
+ return insert(new JInvocation(type, method));
}
/**
@@ -241,9 +239,7 @@ public final class JBlock implements JGenerable, JStatement {
* @return Newly generated JInvocation
*/
public JInvocation invoke(String method) {
- JInvocation i = new JInvocation((JExpression)null, method);
- insert(i);
- return i;
+ return insert(new JInvocation((JExpression)null, method));
}
/**
@@ -255,7 +251,7 @@ public final class JBlock implements JGenerable, JStatement {
* @return Newly generated JInvocation
*/
public JInvocation invoke(JMethod method) {
- return invoke(method.name());
+ return insert(new JInvocation((JExpression)null, method));
}
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java
index 6d82275c790..e4df8bfd412 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java
index 3b415031129..27a4c3210e5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java
index d840b4954b9..b427526e120 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java
index 731e0b32191..a7c31207d49 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java
index d4b7a9de58b..bbfd4aa685c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -321,7 +321,7 @@ public abstract class JClass extends JType
/** Generates a static method invocation. */
public final JInvocation staticInvoke(JMethod method) {
- return staticInvoke(method.name());
+ return new JInvocation(this,method);
}
/** Generates a static method invocation. */
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java
index 21b95114e88..850cfe837bf 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java
index 43cf24c391c..a4be9ba327c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java
index 25791e0c1e7..1f674412186 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -446,13 +446,29 @@ public final class JCodeModel {
JClass clazz = ref(s.substring(start,idx));
+ return parseSuffix(clazz);
+ }
+
+ /**
+ * Parses additional left-associative suffixes, like type arguments
+ * and array specifiers.
+ */
+ private JClass parseSuffix(JClass clazz) throws ClassNotFoundException {
if(idx==s.length())
return clazz; // hit EOL
char ch = s.charAt(idx);
if(ch=='<')
- return parseArguments(clazz);
+ return parseSuffix(parseArguments(clazz));
+
+ if(ch=='[') {
+ if(s.charAt(idx+1)==']') {
+ idx+=2;
+ return parseSuffix(clazz.array());
+ }
+ throw new IllegalArgumentException("Expected ']' but found "+s.substring(idx+1));
+ }
return clazz;
}
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
index 3001b3c8fed..efd7eddede4 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java
index 58534f4ebee..9e01118b907 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -75,6 +75,13 @@ public class JConditional implements JStatement {
return _else;
}
+ /**
+ * Creates ... else if(...) ... code.
+ */
+ public JConditional _elseif(JExpression boolExp) {
+ return _else()._if(boolExp);
+ }
+
public void state(JFormatter f) {
if(test==JExpr.TRUE) {
_then.generateBody(f);
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java
index bc49f8122a9..fe89d7d7038 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java
index 79ddbe154bb..50eaa1ef9fa 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java
index b95e41524c9..81e1cf8d491 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -251,6 +251,13 @@ public class JDefinedClass
if (superClass == null)
throw new NullPointerException();
+ for( JClass o=superClass.outer(); o!=null; o=o.outer() ){
+ if(this==o){
+ throw new IllegalArgumentException("Illegal class inheritance loop." +
+ " Outer class " + this.name + " may not subclass from inner class: " + o.name());
+ }
+ }
+
this.superClass = superClass;
return this;
}
@@ -307,8 +314,9 @@ public class JDefinedClass
}
/**
- * This method generates reference to the JEnumConstant in
- * the class
+ * If the named enum already exists, the reference to it is returned.
+ * Otherwise this method generates a new enum reference with the given
+ * name and returns it.
*
* @param name
* The name of the constant.
@@ -316,8 +324,11 @@ public class JDefinedClass
* The generated type-safe enum constant.
*/
public JEnumConstant enumConstant(String name){
- JEnumConstant ec = new JEnumConstant(this, name);
- enumConstantsByName.put(name, ec);
+ JEnumConstant ec = enumConstantsByName.get(name);
+ if (null == ec) {
+ ec = new JEnumConstant(this, name);
+ enumConstantsByName.put(name, ec);
+ }
return ec;
}
@@ -576,7 +587,6 @@ public class JDefinedClass
* null if not found.
*/
public JMethod getMethod(String name, JType[] argTypes) {
- outer :
for (JMethod m : methods) {
if (!m.name().equals(name))
continue;
@@ -740,8 +750,8 @@ public class JDefinedClass
f.nl().g(jdoc);
if (annotations != null){
- for( int i=0; i= 0)
- throw new IllegalArgumentException("JClass name contains '.': "
- + name);
+ throw new IllegalArgumentException("method name contains '.': " + name);
this.name = name;
}
+ private JInvocation(JGenerable object, JMethod method) {
+ this.object = object;
+ this.method =method;
+ }
+
/**
* Invokes a constructor of an object (i.e., creates
* a new object.)
@@ -131,10 +148,15 @@ public final class JInvocation extends JExpressionImpl implements JStatement {
} else {
if (isConstructor)
f.p("new").g(type).p('(');
- else if (object != null)
- f.g(object).p('.').p(name).p('(');
- else
- f.id(name).p('(');
+ else {
+ String name = this.name;
+ if(name==null) name=this.method.name();
+
+ if (object != null)
+ f.g(object).p('.').p(name).p('(');
+ else
+ f.id(name).p('(');
+ }
}
f.g(args);
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
index 3cf2c87da27..6b56e9251f7 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -51,6 +51,13 @@ public class JJavaName {
return true;
}
+ /**
+ * Checks if the given string is a valid fully qualified name.
+ */
+ public static boolean isFullyQualifiedClassName(String s) {
+ return isJavaPackageName(s);
+ }
+
/**
* Checks if the given string is a valid Java package name.
*/
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java
index 84a4b575a0c..e46ba3d3724 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
index 13c3c8b4797..3141ebc61f1 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -268,14 +268,28 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat
return name;
}
- /**
+ /**
+ * Changes the name of the method.
+ */
+ public void name(String n) {
+ this.name = n;
+ }
+
+ /**
* Returns the return type.
*/
public JType type() {
return type;
}
- /**
+ /**
+ * Overrides the return type.
+ */
+ public void type(JType t) {
+ this.type = t;
+ }
+
+ /**
* Returns all the parameter types in an array.
* @return
* If there's no parameter, an empty array will be returned.
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java
index 0f32e76144a..64e0c93e04c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java
index daf5b8529b6..f4596b18455 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java
index dc136f4c034..3320e7dd967 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java
index 7be3c061a66..93ff0491064 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java
index cd436549591..23f75d5e4bd 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
index 76b0252b310..e26a961dec2 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
index 8e6fbfe87e2..f1c9283d8ff 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java
index d1e09254b3c..c88d370edc6 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java
index 7df52148824..a690732cefc 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java
index 51a9492a6de..8df7b37c4cd 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java
index 6178a58a1bb..afe70124d4c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
/**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java
index 1bb0bdbfcf7..44af487e089 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java
index 7bf099f43f4..050cf8a87d2 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java
index 35cc1e5c8bb..1739e1308b1 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java
index 489cc1789dc..b208d49bb12 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java
index ce9c8bae3f8..de745686080 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
index 4bb2511b09c..9412d3e3156 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java
index 0a94f7339b4..15b0c4f212e 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java
index 4c67388a70d..930e2be1eb1 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
index 11fa7e39ea4..b58d1f50d14 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal;
import java.lang.reflect.InvocationHandler;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java
index f53937f705b..61a22e8ffa7 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.fmt;
import java.io.ByteArrayOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java
index 67c09b7f4e2..81e29f04f02 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.fmt;
import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java
index 68e8b8dbd3d..12452641a09 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java
index 3c5d9128db3..450aac31a43 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.fmt;
import java.io.DataInputStream;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
index 234b768abdd..00d88e876ef 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.fmt;
import java.io.BufferedReader;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java
index ee9b629ac6e..dbc44daee95 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.fmt;
import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html
index c5227a2d1f1..2493ed41413 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html
@@ -1,3 +1,27 @@
+
Various resource file formats (classes that implement JResourceFile).
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
index 45f2d5f838c..aa7a1695eb1 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
/**
* Library for generating Java source code
.
*
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java
index 40874364279..46b4270ff89 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.util;
import java.util.Comparator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
index c4d3f07c6b6..c759b2b249e 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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,6 +22,10 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
+/*
+ * @(#)$Id: EncoderFactory.java,v 1.3 2005/09/10 19:07:33 kohsuke Exp $
+ */
+
package com.sun.codemodel.internal.util;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
index d8947ff2d4e..6db471edcf5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.util;
import java.io.FilterWriter;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
index 2dbcd787fdb..4fa997964ce 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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,6 +22,10 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
+/*
+ * @(#)$Id: MS1252Encoder.java,v 1.2 2005/09/10 19:07:33 kohsuke Exp $
+ */
+
package com.sun.codemodel.internal.util;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java
index 3f0d31303ad..71d4dfd82aa 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -23,6 +23,10 @@
* have any questions.
*/
+/*
+ * @(#)SingleByteEncoder.java 1.14 03/01/23
+ */
+
package com.sun.codemodel.internal.util;
import java.nio.ByteBuffer;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java
index 0081f24bf5d..ca97bc1d6fa 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -33,6 +33,7 @@ import java.nio.charset.CoderResult;
* Utility class for dealing with surrogates.
*
* @author Mark Reinhold
+ * @version 1.11, 03/01/23
*/
class Surrogate {
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
index 549c89cc13b..ad09f15817a 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.util;
import java.io.FilterWriter;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java
index 58cd9d76d7f..5a55423b4c5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
index cad99ce6155..1523d1a8d0f 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.OutputStream;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
index 4b923ad098b..1bf8f845c75 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java
index cb785a7a76e..cbb5b203ba5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
index 52b959739aa..10740dfa422 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.FilterOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java
index 44975d934bb..0d345993bf5 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.codemodel.internal.writer;
import java.io.FilterOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java b/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java
index 74193498dbb..b11eb1bb3c3 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import javax.activation.DataSource;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java b/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java
index 357e6ff28bc..6cc67b466e4 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java b/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java
index 81a71bedee0..c9b77721c9a 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import org.xml.sax.helpers.XMLFilterImpl;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Interned.java b/jaxws/src/share/classes/com/sun/istack/internal/Interned.java
index 17bf5c36892..26e6bff8648 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/Interned.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/Interned.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import java.lang.annotation.Documented;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java b/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java
index b8a103ca9f8..f31eb46f248 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import java.lang.annotation.Documented;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java b/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java
index 2a785fe6db3..269d2498193 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import java.lang.annotation.Documented;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
index 67405219be7..957a3362e3a 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java b/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java
index 99fb6630926..558d8ce57c5 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java b/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java
index dfd68fe6cd6..0c6095f0a5a 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal;
import org.xml.sax.SAXParseException;
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java
new file mode 100644
index 00000000000..c88f6aea2c4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.istack.internal;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.Location;
+
+/**
+ * {@link XMLStreamException} that properly handles exception chaining.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class XMLStreamException2 extends XMLStreamException {
+ public XMLStreamException2(String msg) {
+ super(msg);
+ }
+
+ public XMLStreamException2(Throwable th) {
+ super(th);
+ }
+
+ public XMLStreamException2(String msg, Throwable th) {
+ super(msg, th);
+ }
+
+ public XMLStreamException2(String msg, Location location) {
+ super(msg, location);
+ }
+
+ public XMLStreamException2(String msg, Location location, Throwable th) {
+ super(msg, location, th);
+ }
+
+ /**
+ * {@link XMLStreamException} doesn't return the correct cause.
+ */
+ public Throwable getCause() {
+ return getNestedException();
+ }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
similarity index 93%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java
rename to jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
index 5c544fcc02c..cf6c0d46d40 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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,20 +22,19 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
+package com.sun.istack.internal;
-package com.sun.xml.internal.ws.util.xml;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+import org.xml.sax.Locator;
+import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.namespace.QName;
+
/**
* This is a simple utility class that adapts StAX events from an
* {@link XMLStreamReader} to SAX events on a
@@ -43,6 +42,7 @@ import org.xml.sax.helpers.AttributesImpl;
* parser technologies.
*
* @author Ryan.Shoemaker@Sun.COM
+ * @version 1.0
*/
public class XMLStreamReaderToContentHandler {
@@ -56,6 +56,11 @@ public class XMLStreamReaderToContentHandler {
// event that was fired (such as end element)
private boolean eagerQuit;
+ /**
+ * If true, not start/endDocument event.
+ */
+ private boolean fragment;
+
/**
* Construct a new StAX to SAX adapter that will convert a StAX event
* stream into a SAX event stream.
@@ -65,10 +70,11 @@ public class XMLStreamReaderToContentHandler {
* @param saxCore
* SAXevent sink
*/
- public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit) {
+ public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) {
this.staxStreamReader = staxCore;
this.saxHandler = saxCore;
this.eagerQuit = eagerQuit;
+ this.fragment = fragment;
}
/*
@@ -152,15 +158,21 @@ public class XMLStreamReaderToContentHandler {
handleEndDocument();
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException2(e);
}
}
private void handleEndDocument() throws SAXException {
+ if(fragment)
+ return;
+
saxHandler.endDocument();
}
private void handleStartDocument() throws SAXException {
+ if(fragment)
+ return;
+
saxHandler.setDocumentLocator(new Locator() {
public int getColumnNumber() {
return staxStreamReader.getLocation().getColumnNumber();
@@ -184,7 +196,7 @@ public class XMLStreamReaderToContentHandler {
staxStreamReader.getPITarget(),
staxStreamReader.getPIData());
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException2(e);
}
}
@@ -195,7 +207,7 @@ public class XMLStreamReaderToContentHandler {
staxStreamReader.getTextStart(),
staxStreamReader.getTextLength() );
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException2(e);
}
}
@@ -203,11 +215,15 @@ public class XMLStreamReaderToContentHandler {
QName qName = staxStreamReader.getName();
try {
+ String pfix = qName.getPrefix();
+ String rawname = (pfix == null || pfix.length() == 0)
+ ? qName.getLocalPart()
+ : pfix + ':' + qName.getLocalPart();
// fire endElement
saxHandler.endElement(
qName.getNamespaceURI(),
qName.getLocalPart(),
- qName.toString());
+ rawname);
// end namespace bindings
int nsCount = staxStreamReader.getNamespaceCount();
@@ -219,7 +235,7 @@ public class XMLStreamReaderToContentHandler {
saxHandler.endPrefixMapping(prefix);
}
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException2(e);
}
}
@@ -249,7 +265,7 @@ public class XMLStreamReaderToContentHandler {
rawname,
attrs);
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException2(e);
}
}
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/package-info.java
index a9772934dfb..60a915df58d 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/package-info.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
/**
* istack-commons runtime utilities.
*/
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java
index 55dd90b60e5..2678f1437b3 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.istack.internal.tools;
import com.sun.mirror.type.TypeMirror;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java
similarity index 51%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java
rename to jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java
index 9a666ee92d2..8159a7e677b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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,46 +22,47 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
+package com.sun.istack.internal.tools;
-package com.sun.tools.internal.txw2;
-
-import org.apache.tools.ant.Project;
-import org.xml.sax.SAXParseException;
-
-import java.text.MessageFormat;
+import java.util.Collection;
/**
+ * {@link ClassLoader} that masks a specified set of classes
+ * from its parent class loader.
+ *
+ *
+ * This code is used to create an isolated environment.
+ *
* @author Kohsuke Kawaguchi
*/
-public class AntErrorListener implements ErrorListener {
- private final Project project;
+public class MaskingClassLoader extends ClassLoader {
- public AntErrorListener(Project p) {
- this.project = p;
+ private final String[] masks;
+
+ public MaskingClassLoader(String... masks) {
+ this.masks = masks;
}
- public void error(SAXParseException e) {
- print(e,Project.MSG_ERR);
+ public MaskingClassLoader(Collection masks) {
+ this(masks.toArray(new String[masks.size()]));
}
- public void fatalError(SAXParseException e) {
- print(e,Project.MSG_ERR);
+ public MaskingClassLoader(ClassLoader parent, String... masks) {
+ super(parent);
+ this.masks = masks;
}
- public void warning(SAXParseException e) {
- print(e,Project.MSG_WARN);
+ public MaskingClassLoader(ClassLoader parent, Collection masks) {
+ this(parent, masks.toArray(new String[masks.size()]));
}
- private void print(SAXParseException e, int level) {
- project.log(e.getMessage(),level);
- project.log(getLocation(e),level);
- }
+ @Override
+ protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ for (String mask : masks) {
+ if(name.startsWith(mask))
+ throw new ClassNotFoundException();
+ }
- String getLocation(SAXParseException e) {
- return MessageFormat.format(" {0}:{1} of {2}",
- new Object[]{
- String.valueOf(e.getLineNumber()),
- String.valueOf(e.getColumnNumber()),
- e.getSystemId()});
+ return super.loadClass(name, resolve);
}
}
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
new file mode 100644
index 00000000000..013a0aa12ad
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.istack.internal.tools;
+
+import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.util.Enumeration;
+
+/**
+ * Load classes/resources from a side folder, so that
+ * classes of the same package can live in a single jar file.
+ *
+ *
+ * For example, with the following jar file:
+ *
+ * /
+ * +- foo
+ * +- X.class
+ * +- bar
+ * +- X.class
+ *
+ *
+ * {@link ParallelWorldClassLoader}("foo/") would load X.class from
+ * /foo/X.class (note that X is defined in the root package, not
+ * foo.X.
+ *
+ *
+ * This can be combined with {@link MaskingClassLoader} to mask classes which are loaded by the parent
+ * class loader so that the child class loader
+ * classes living in different folders are loaded
+ * before the parent class loader loads classes living the jar file publicly
+ * visible
+ * For example, with the following jar file:
+ *
+ * /
+ * +- foo
+ * +- X.class
+ * +- bar
+ * +-foo
+ * +- X.class
+ *
+ *
+ * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader()) would load foo.X.class from
+ * /bar/foo.X.class not the foo.X.class in the publicly visible place in the jar file, thus
+ * masking the parent classLoader from loading the class from foo.X.class
+ * (note that X is defined in the package foo, not
+ * bar.foo.X.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class ParallelWorldClassLoader extends ClassLoader {
+
+ /**
+ * Strings like "prefix/", "abc/", or "" to indicate
+ * classes should be loaded normally.
+ */
+ private final String prefix;
+
+ public ParallelWorldClassLoader(ClassLoader parent,String prefix) {
+ super(parent);
+ this.prefix = prefix;
+ }
+
+ protected Class findClass(String name) throws ClassNotFoundException {
+ StringBuffer sb = new StringBuffer(name.length()+prefix.length()+6);
+ sb.append(prefix).append(name.replace('.','/')).append(".class");
+
+ InputStream is = getParent().getResourceAsStream(sb.toString());
+ if (is==null)
+ throw new ClassNotFoundException(name);
+
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buf = new byte[1024];
+ int len;
+ while((len=is.read(buf))>=0)
+ baos.write(buf,0,len);
+
+ buf = baos.toByteArray();
+ int packIndex = name.lastIndexOf('.');
+ if (packIndex != -1) {
+ String pkgname = name.substring(0, packIndex);
+ // Check if package already loaded.
+ Package pkg = getPackage(pkgname);
+ if (pkg == null) {
+ definePackage(pkgname, null, null, null, null, null, null, null);
+ }
+ }
+ return defineClass(name,buf,0,buf.length);
+ } catch (IOException e) {
+ throw new ClassNotFoundException(name,e);
+ }
+ }
+
+ protected URL findResource(String name) {
+ return getParent().getResource(prefix+name);
+ }
+
+ protected Enumeration findResources(String name) throws IOException {
+ return getParent().getResources( prefix+name);
+ }
+
+ /**
+ * Given the URL inside jar, returns the URL to the jar itself.
+ */
+ public static URL toJarUrl(URL res) throws ClassNotFoundException, MalformedURLException {
+ String url = res.toExternalForm();
+ if(!url.startsWith("jar:"))
+ throw new ClassNotFoundException("Loaded outside a jar "+url);
+ url = url.substring(4); // cut off jar:
+ url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!'
+ return new URL(url);
+ }
+}
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java
index f77048324be..3ce8c80627f 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
/**
* istack-commons tool time utilities.
*
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
index d976cd66459..c4f8f825a3b 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -103,7 +103,7 @@ public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactor
if (wsAP == null) {
AnnotationProcessorContext context = new AnnotationProcessorContext();
- wsAP = new WebServiceAP(null, null, null, context);
+ wsAP = new WebServiceAP(null, context, null, null);
}
wsAP.init(apEnv);
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java
index 9cf442544df..31850e07dd2 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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
@@ -26,7 +26,7 @@
/**
*
* This document describes the {@link com.sun.mirror.apt.AnnotationProcessor AnnotationProcessor}
- * included with JAX-WS 2.0.
+ * included with JAX-WS 2.0.1.
*
*
The {@link com.sun.istack.internal.ws.AnnotationProcessorFactoryImpl AnnoatationnProcessorFactoryImpl} class
* tells the APT
diff --git a/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin b/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
new file mode 100644
index 00000000000..6b19c805ad8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
@@ -0,0 +1,4 @@
+com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn
+com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn
+com.sun.tools.internal.xjc.addon.at_generated.PluginImpl
+com.sun.tools.internal.xjc.addon.episode.PluginImpl
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
index c9afcaa1792..2ec45591cc3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc;
import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
index ddc5a4ac95b..5dec6daad65 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
UNEXPECTED_NGCC_TOKEN = \
Unexpected {0} appears at line {1} column {2}
@@ -5,15 +30,16 @@ BASEDIR_DOESNT_EXIST = \
Non-existent directory: {0}
VERSION = \
- schemagen version "JAXB 2.0 in JDK 1.6" \n\
- JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.0 in JDK 1.6)
+ schemagen version "JAXB 2.1.3" \n\
+ JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.3 in JDK)
USAGE = \
Usage: schemagen [-options ...] \n\
Options: \n\
-\ \ \ \ -d : specify where to place processor and javac generated class files \n\
-\ \ \ \ -cp : specify where to find user specified files \n\
-\ \ \ \ -classpath : specify where to find user specified files \n\
-\ \ \ \ -version : display version information
+\ \ \ \ -d : specify where to place processor and javac generated class files\n\
+\ \ \ \ -cp : specify where to find user specified files\n\
+\ \ \ \ -classpath : specify where to find user specified files\n\
+\ \ \ \ -episode : generate episode file for separate compilation\n\
+\ \ \ \ -version : display version information\n\
\ \ \ \ -help : display this usage message
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
index b1f22f42c8e..8a9656f43f3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc;
import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
index 8f538075766..699f47828cd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc;
import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
index ef178300eb2..3b268d5e530 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc;
import java.io.File;
@@ -122,7 +121,7 @@ public class SchemaGenerator {
}
Class schemagenRunner = classLoader.loadClass(Runner.class.getName());
- Method mainMethod = schemagenRunner.getDeclaredMethod("main",String[].class);
+ Method mainMethod = schemagenRunner.getDeclaredMethod("main",String[].class,File.class);
List aptargs = new ArrayList();
@@ -150,7 +149,7 @@ public class SchemaGenerator {
aptargs.addAll(options.arguments);
String[] argsarray = aptargs.toArray(new String[aptargs.size()]);
- return (Integer)mainMethod.invoke(null,new Object[]{argsarray});
+ return (Integer)mainMethod.invoke(null,new Object[]{argsarray,options.episodeFile});
}
/**
@@ -204,11 +203,15 @@ public class SchemaGenerator {
}
public static final class Runner {
- public static int main(String[] args) throws Exception {
+ public static int main(String[] args, File episode) throws Exception {
ClassLoader cl = Runner.class.getClassLoader();
Class apt = cl.loadClass("com.sun.tools.apt.Main");
Method processMethod = apt.getMethod("process",AnnotationProcessorFactory.class, String[].class);
- return (Integer) processMethod.invoke(null, new com.sun.tools.internal.jxc.apt.SchemaGenerator(), args);
+
+ com.sun.tools.internal.jxc.apt.SchemaGenerator r = new com.sun.tools.internal.jxc.apt.SchemaGenerator();
+ if(episode!=null)
+ r.setEpisodeFile(episode);
+ return (Integer) processMethod.invoke(null, r, args);
}
}
}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
index 09175235a11..47d1fc41874 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.io.File;
@@ -88,7 +87,7 @@ final class AnnotationParser implements AnnotationProcessor {
// -Aconfig=foo.config:bar.config where : is the pathSeparatorChar
StringTokenizer st = new StringTokenizer(value,File.pathSeparator);
if(!st.hasMoreTokens()) {
- errorListener.error(null,Messages.NO_FILE_SPECIFIED.format());
+ errorListener.error(null,Messages.OPERAND_MISSING.format(Const.CONFIG_FILE_OPTION));
continue;
}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
index ce842f980b3..68aa512346a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.util.Arrays;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
index 6b6008b92bd..8ec9cdb55c5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
index 117fec778fe..e9a053414fd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
index 553dc68dd99..3390a5f5502 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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,21 +22,22 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.Declaration;
import com.sun.mirror.declaration.FieldDeclaration;
import com.sun.mirror.declaration.MethodDeclaration;
import com.sun.mirror.declaration.ParameterDeclaration;
import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.Declaration;
import com.sun.mirror.type.MirroredTypeException;
+import com.sun.mirror.type.MirroredTypesException;
import com.sun.mirror.type.TypeMirror;
import com.sun.xml.internal.bind.v2.model.annotation.AbstractInlineAnnotationReaderImpl;
import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader;
@@ -67,6 +68,10 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe
return f.getAnnotation(annotationType)!=null;
}
+ public boolean hasClassAnnotation(TypeDeclaration clazz, Class annotationType) {
+ return clazz.getAnnotation(annotationType)!=null;
+ }
+
public Annotation[] getAllFieldAnnotations(FieldDeclaration field, Locatable srcPos) {
return getAllAnnotations(field,srcPos);
}
@@ -94,7 +99,8 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe
for( AnnotationMirror m : decl.getAnnotationMirrors() ) {
try {
String fullName = m.getAnnotationType().getDeclaration().getQualifiedName();
- Class type = getClass().getClassLoader().loadClass(fullName);
+ Class type =
+ getClass().getClassLoader().loadClass(fullName).asSubclass(Annotation.class);
Annotation annotation = decl.getAnnotation(type);
if(annotation!=null)
r.add( LocatableAnnotation.create(annotation,srcPos) );
@@ -135,6 +141,26 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe
}
}
+ public TypeMirror[] getClassArrayValue(Annotation a, String name) {
+ try {
+ a.annotationType().getMethod(name).invoke(a);
+ assert false;
+ throw new IllegalStateException("should throw a MirroredTypesException");
+ } catch (IllegalAccessException e) {
+ throw new IllegalAccessError(e.getMessage());
+ } catch (InvocationTargetException e) {
+ if( e.getCause() instanceof MirroredTypesException ) {
+ MirroredTypesException me = (MirroredTypesException)e.getCause();
+ Collection r = me.getTypeMirrors();
+ return r.toArray(new TypeMirror[r.size()]);
+ }
+ // impossible
+ throw new RuntimeException(e);
+ } catch (NoSuchMethodException e) {
+ throw new NoSuchMethodError(e.getMessage());
+ }
+ }
+
protected String fullName(MethodDeclaration m) {
return m.getDeclaringType().getQualifiedName()+'#'+m.getSimpleName();
}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
index 9f69124cbb2..c9a4d4dd55e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
@@ -1,12 +1,34 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
NON_EXISTENT_FILE = \
Directory "{0}" doesn't exist.
UNRECOGNIZED_PARAMETER = \
Unrecognized option {0} is not valid.
-NO_FILE_SPECIFIED = \
- No directory was specified.
-
-NO_CLASSPATH_SPECIFIED = \
- No classpath was specified.
+OPERAND_MISSING = \
+ Option "{0}" is missing an operand.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
index 61fc613136d..13f3293fef0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.text.MessageFormat;
@@ -36,9 +35,8 @@ import java.util.ResourceBundle;
enum Messages {
// Accessor
NON_EXISTENT_FILE, // 1 arg
- NO_FILE_SPECIFIED, // 0 args
- NO_CLASSPATH_SPECIFIED, // 0 args
UNRECOGNIZED_PARAMETER, //1 arg
+ OPERAND_MISSING, // 1 arg
;
private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getPackage().getName() +".MessageBundle");
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
index a63f4f9b7bd..fbeb61d75d7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.io.File;
@@ -44,6 +43,8 @@ public class Options {
public File targetDir = null;
+ public File episodeFile = null;
+
public final List arguments = new ArrayList();
public void parseArguments(String[] args) throws BadCommandLineException {
@@ -64,7 +65,7 @@ public class Options {
if (args[i].equals("-d")) {
if (i == args.length - 1)
throw new BadCommandLineException(
- (Messages.NO_FILE_SPECIFIED.format()));
+ (Messages.OPERAND_MISSING.format(args[i])));
targetDir = new File(args[++i]);
if( !targetDir.exists() )
throw new BadCommandLineException(
@@ -72,10 +73,18 @@ public class Options {
return 1;
}
+ if (args[i].equals("-episode")) {
+ if (i == args.length - 1)
+ throw new BadCommandLineException(
+ (Messages.OPERAND_MISSING.format(args[i])));
+ episodeFile = new File(args[++i]);
+ return 1;
+ }
+
if (args[i].equals("-cp") || args[i].equals("-classpath")) {
if (i == args.length - 1)
throw new BadCommandLineException(
- (Messages.NO_CLASSPATH_SPECIFIED.format()));
+ (Messages.OPERAND_MISSING.format(args[i])));
classpath = args[++i];
return 1;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
index 63f1a508125..bbadce081cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc. 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 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-
package com.sun.tools.internal.jxc.apt;
import java.io.File;
@@ -67,6 +66,8 @@ public class SchemaGenerator implements AnnotationProcessorFactory {
*/
private final Map schemaLocations = new HashMap();
+ private File episodeFile;
+
public SchemaGenerator() {
}
@@ -74,6 +75,10 @@ public class SchemaGenerator implements AnnotationProcessorFactory {
schemaLocations.putAll(m);
}
+ public void setEpisodeFile(File episodeFile) {
+ this.episodeFile = episodeFile;
+ }
+
public Collection