Mercurial > hg > openjdk > jdk6 > langtools

changeset 34:000e16a6d2be jdk6-b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6775264: Changes for openjdk6 build 14 6772068: Fix copyright in test/tools/javac/Paths/6638501 Summary: Final b14 state (as defined by the source bundle) Reviewed-by: darcy
author ohair
date Fri, 30 Jan 2009 17:17:44 -0800
parents 7b5209f5a0e5
children 85c38fcf8763
files test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java test/tools/javac/Paths/6638501/JarFromManifestFailure.java test/tools/javac/Paths/6638501/WsCompileExample.java test/tools/javac/Paths/6638501/test/SayHello.java test/tools/javac/Paths/6638501/test1/SayHelloToo.java
diffstat 5 files changed, 122 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Fri Jan 30 17:12:06 2009 -0800
+++ b/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Fri Jan 30 17:17:44 2009 -0800
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 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.
+ */
+
 package test;
 
 public class HelloImpl {
--- a/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Fri Jan 30 17:12:06 2009 -0800
+++ b/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Fri Jan 30 17:17:44 2009 -0800
@@ -1,6 +1,24 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * Copyright 2007-2008 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.
  */
 
 /*
@@ -31,10 +49,11 @@
         arList.add(new File("HelloLib.jar"));
         jar(new File(libFile, "JarPointer.jar"), arList, testClasses);
 
-        String [] args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test/SayHello.java").toString().replace('\\', '/');
+        String[] args1 = {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test/SayHello.java").getPath().replace('\\', '/')
+        };
         System.err.println("First compile!!!");
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in first compile!");
@@ -42,10 +61,11 @@
 
         System.err.println("Second compile!!!");
 
-        args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test1/SayHelloToo.java").toString().replace('\\', '/');
+        args1 = new String[] {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test1/SayHelloToo.java").getPath().replace('\\', '/')
+        };
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in second compile!");
         }
--- a/test/tools/javac/Paths/6638501/WsCompileExample.java	Fri Jan 30 17:12:06 2009 -0800
+++ b/test/tools/javac/Paths/6638501/WsCompileExample.java	Fri Jan 30 17:17:44 2009 -0800
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 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.
+ */
+
 import java.util.List;
 import java.util.ArrayList;
 import java.io.File;
--- a/test/tools/javac/Paths/6638501/test/SayHello.java	Fri Jan 30 17:12:06 2009 -0800
+++ b/test/tools/javac/Paths/6638501/test/SayHello.java	Fri Jan 30 17:17:44 2009 -0800
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 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.
+ */
+
 import test.HelloImpl;
 
 public class SayHello extends HelloImpl {
--- a/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Fri Jan 30 17:12:06 2009 -0800
+++ b/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Fri Jan 30 17:17:44 2009 -0800
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 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.
+ */
+
 import test.HelloImpl;
 
 public class SayHelloToo extends HelloImpl {