Attachment 604954 Details for Bug 848662 – Update licenses on two Oracle example files to match upstream

[patch] Update licenses on two Oracle example files to match upstream

antlr-2.7.7-licensefix.patch (text/plain), 5.60 KB, created by Tom "spot" Callaway on 2012-08-16 14:23:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom "spot" Callaway

Created: 2012-08-16 14:23:52 UTC

Size: 5.60 KB

patch

obsolete

>diff -up antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java.licensefix antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java
>--- antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java.licensefix	2012-08-16 10:16:12.157567962 -0400
>+++ antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java	2012-08-16 10:17:46.425574161 -0400
>@@ -1,19 +1,33 @@
> 
> /*
>- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
>+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
>  *
>- * Permission to use, copy, modify, and distribute this software
>- * and its documentation for NON-COMMERCIAL purposes and without
>- * fee is hereby granted provided that this copyright notice
>- * appears in all copies. Please refer to the file "copyright.html"
>- * for further important copyright and licensing information.
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>  *
>- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
>- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
>- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
>- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
>- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
>- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
>+ *   - Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ *
>+ *   - Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ *   - Neither the name of Oracle or the names of its
>+ *     contributors may be used to endorse or promote products derived
>+ *     from this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
>+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
>+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
>+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
> import java.awt.*;
>diff -up antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java.licensefix antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java
>--- antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java.licensefix	2012-08-16 10:18:24.649576674 -0400
>+++ antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java	2012-08-16 10:18:49.002578275 -0400
>@@ -1,19 +1,33 @@
> 
> /*
>- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
>+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
>  *
>- * Permission to use, copy, modify, and distribute this software
>- * and its documentation for NON-COMMERCIAL purposes and without
>- * fee is hereby granted provided that this copyright notice
>- * appears in all copies. Please refer to the file "copyright.html"
>- * for further important copyright and licensing information.
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>  *
>- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
>- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
>- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
>- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
>- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
>- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
>+ *   - Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ *
>+ *   - Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ *   - Neither the name of Oracle or the names of its
>+ *     contributors may be used to endorse or promote products derived
>+ *     from this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
>+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
>+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
>+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
> import java.io.*;

Actions: View | Diff

Attachments on bug 848662: 604954