diff --git a/com.oracle.truffle.r.pkgs/rJava/DESCRIPTION b/com.oracle.truffle.r.pkgs/rJava/DESCRIPTION
index 0b4abc2eee6b3735f3d1183742ac54753fbfc852..a58cce044cf2f62aa01ef520f88e982161cbe453 100644
--- a/com.oracle.truffle.r.pkgs/rJava/DESCRIPTION
+++ b/com.oracle.truffle.r.pkgs/rJava/DESCRIPTION
@@ -1,9 +1,8 @@
 Package: rJava
-Type: Package
-Title: FastR rJava compatibility layer
 Version: 1.0
-Date: 2017-05-18
-Author: Tomas Stupka
+Title: FastR rJava compatibility layer
+Author: Tomas Stupka, Simon Urbanek <simon.urbanek@r-project.org>
 Maintainer: Tomas Stupka <tomas.stupka@oracle.com>
+Depends: R (>= 2.5.0), methods
 Description: Provides rJava R interface backed by FastR interoperability builtins.
-License: GPL-2
\ No newline at end of file
+License: LGPL-2
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/0classes.R b/com.oracle.truffle.r.pkgs/rJava/R/0classes.R
index 1a877b5fa014b4688a3a5c70d20adf2cff0ee106..5c0a08e069054f06f4332be32f3948d123ed3112 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/0classes.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/0classes.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018 Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## S4 classes (jobjRef is re-defined in .First.lib to contain valid jobj)                                                                                                  
 #' java object reference
 setClass("jobjRef", representation(jobj="externalptr", jclass="character"), 
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/J.R b/com.oracle.truffle.r.pkgs/rJava/R/J.R
index e9ca59afe89a6e6f3a98cfc1a1c3e9aca3417729..c37bfccf78258ab08ecbed15cba4eccc3c7aefae 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/J.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/J.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 setClass("jclassName", representation(name="character", jobj="jobjRef"))
 jclassName <- function(class){
 	if( is( class, "jobjRef" ) && .jinherits(class, "java/lang/Class" ) ){
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/arrays.R b/com.oracle.truffle.r.pkgs/rJava/R/arrays.R
index 2d4b1f6108a4d73a9bfc6ba93c5c7abc6bf05269..71c64d4e54368fa6cbc8d4c88ce1a33489f42bce 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/arrays.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/arrays.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 # :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1:
  
 # {{{ utilities to deal with arrays
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/call.R b/com.oracle.truffle.r.pkgs/rJava/R/call.R
index 9b745e0772c0da97f866b56876ecbfc8e39daa18..18323789e16cba13fc91331bd25c4f9be64d75da 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/call.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/call.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## This file is part of the rJava package - low-level R/Java interface
 ## (C)2006 Simon Urbanek <simon.urbanek@r-project.org>
 ## For license terms see DESCRIPTION and/or LICENSE
@@ -16,12 +5,12 @@
 ## $Id$
 
 # create a new object
-.jnew <- function(class, ..., check=TRUE, silent=!check, class.loader=NULL) {
+.jnew <- function(class, ..., check=TRUE, silent=!check) {
   class <- gsub("\\.", "/", as.character(class)) # allow non-JNI specifiation
   # TODO: should this do "S" > "java/lang/String", ... like .jcall
   
   if (check) .jcheck(silent=TRUE)
-  o<-.External(RcreateObject, class, ..., silent=silent, class.loader=class.loader)
+  o<-.External(RcreateObject, class, ..., silent=silent)
   if (check) .jcheck(silent=silent)
   if (is.null(o)) {
   	  if (!silent) {
@@ -374,7 +363,11 @@ is.jnull <- function(x) {
   else
     try(a <- .jcall("java/lang/Class","Ljava/lang/Class;","forName",cl,check=FALSE))
   # this is really .jcheck but we don't want it to appear on the call stack
-  .Call(RJavaCheckExceptions, silent)
+  
+  # FASTR TODO seems the fastr .C impl meant to invoke R replacements for c functions 
+  # has a problem to accept additional .C args
+  #.C(RJavaCheckExceptions, silent, FALSE, PACKAGE = "rJava")
+  .C(RJavaCheckExceptions, silent)
   if (!silent && is.jnull(a)) stop("class not found")
   a
 }
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/comparison.R b/com.oracle.truffle.r.pkgs/rJava/R/comparison.R
index 70f0447c6e68c994039aa1218eea7e6eeb11e940..820fca016f56c46e60f5a9d8c3f6f72cad844007 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/comparison.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/comparison.R
@@ -1,13 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
 
 #' if a and b are compatable, 
 #' in the sense of the java.util.Comparable interface
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/completion.R b/com.oracle.truffle.r.pkgs/rJava/R/completion.R
index 2e3dc1fbe65b1db20e3ff718930e687df8202f6f..b307690f1cb13ac3c55d78ff766abfa4d68063d1 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/completion.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/completion.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 # :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1:
 
 # S4 dispatch does not work for .DollarNames, so we'll use S3
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/converter.R b/com.oracle.truffle.r.pkgs/rJava/R/converter.R
index 0401920e756c53fb800e99a7dd2ececd22a487a5..66798dab48387ba9878c9e67a3c66586beeb5ae1 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/converter.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/converter.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 # in: Java -> R
 .conv.in <- new.env(parent=emptyenv())
 .conv.in$. <- FALSE
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/exceptions.R b/com.oracle.truffle.r.pkgs/rJava/R/exceptions.R
index 454dffa101a8a5855ed4b6105736356eec1c7c64..c5c752cfc7c5d870d226a3bc58374517420d078e 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/exceptions.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/exceptions.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## functions for some basic exception handling
 
 # FIXME: should all these actually be deprecated or defunct
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/import.R b/com.oracle.truffle.r.pkgs/rJava/R/import.R
index 9f13d38e8fa14912cde500f2277cdf0e172af7ce..1b634396c160433df163f83bd83c80fdb2e46e07 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/import.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/import.R
@@ -1,13 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
 
 IMPORTER <- ".__rjava__import"
 
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/instanceof.R b/com.oracle.truffle.r.pkgs/rJava/R/instanceof.R
index 81b66760317a9152dd0d5ae8b2b6cc2e84536062..7f28b2e124f8d4be7ecf7e7cfd731b101efbb07e 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/instanceof.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/instanceof.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 `%instanceof%` <- .jinstanceof <- function( o, cl ){
 	
 	if( !inherits( o, "jobjRef" ) ){
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/jfirst.R b/com.oracle.truffle.r.pkgs/rJava/R/jfirst.R
index 0437c275290dc444233fc8136a036e470ac07a8c..8a9d86c35af8050c538249e7a03e946770a81b25 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/jfirst.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/jfirst.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 # this part is common to all platforms and must be invoked
 # from .First.lib after library.dynam
 
@@ -56,7 +45,8 @@
 .registerFastrFunctions <- function() {
   # .C
   .fastr.register.functions("rJava", .env, 0, 
-        list(RclearException=.RclearException))
+        list(RJavaCheckExceptions = .RJavaCheckExceptions,
+             RclearException=.RclearException))
   # .External  
   .fastr.register.functions("rJava", .env, 3, 
         list(RcreateObject = .RcreateObject, 
@@ -66,8 +56,7 @@
              RcallMethod = .RcallMethod))
   # .Call
   .fastr.register.functions("rJava", .env, 1, 
-        list(RJavaCheckExceptions = .RJavaCheckExceptions,
-            RpollException = .RpollException,
+        list(RpollException = .RpollException,
             RthrowException = .RthrowException,                                               
             RidenticalRef = .RidenticalRef,
             RisAssignableFrom = .RisAssignableFrom,
@@ -120,44 +109,6 @@
 # - bytes converted to int
 # - chars converted to int
 
-.dispatchOverrides <- function(orig, .NAME, ...) {
-    if(is.character(.NAME)) {        
-        fun <- switch(.NAME, 
-            "RJavaCheckExceptions" = .RJavaCheckExceptions,
-            "RpollException" = .RpollException,
-            "RthrowException" = .RthrowException,
-            "RclearException" = .RclearException,                        
-            "RcallMethod" = .RcallMethod,
-            "RidenticalRef" = .RidenticalRef,
-            "RisAssignableFrom" = .RisAssignableFrom,
-            "RinitJVM" = .RinitJVM,
-            "RJava_checkJVM" = .RJava_checkJVM,
-            "RJava_needs_init" = .RJava_needs_init,
-            "initRJavaTools" = .initRJavaTools,            
-            "RJava_set_memprof" = .RJava_set_memprof,
-            "RgetStringValue" = .RgetStringValue,
-            "RcreateObject" = .RcreateObject,            
-            "RgetStringArrayCont" = .RgetStringArrayCont,
-            "RgetIntArrayCont" = .RgetIntArrayCont,                 
-            "RgetBoolArrayCont" = .RgetBoolArrayCont,
-            "RgetCharArrayCont" = .RgetCharArrayCont,
-            "RgetShortArrayCont" = .RgetShortArrayCont,
-            "RgetByteArrayCont" = .RgetByteArrayCont,
-            "RgetDoubleArrayCont" = .RgetDoubleArrayCont,
-            "RgetFloatArrayCont" = .RgetFloatArrayCont,
-            "RgetLongArrayCont" = .RgetLongArrayCont,
-            "RgetObjectArrayCont" = .RgetObjectArrayCont,
-            "RcreateArray" = .RcreateArray,
-            "RgetField" = .RgetField,
-            "RsetField" = .RsetField,
-            "RtoString" = .RtoString,
-            function(...) orig(.NAME, ...)
-        )        
-        fun(...)
-    } else {
-        orig(.NAME, ...)
-    }
-}
 
 .RJavaCheckExceptions <- function(silent) {
     silent # force args
@@ -407,8 +358,8 @@
     ref
 }    
 
-.RcreateObject <-function(class, ..., silent, class.loader) {
-    class; silent; class.loader # force args
+.RcreateObject <-function(class, ..., silent) {
+    class; silent; # force args
 
     if(!is.character(class) || length(class) != 1) {
         stop("RcreateObject: invalid class name")
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/jinit.R b/com.oracle.truffle.r.pkgs/rJava/R/jinit.R
index aa63fb778581a79f8461b3298a459a475144fa2e..2d1e574af8e300aaecee694a7760986148140c11 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/jinit.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/jinit.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## This file is part of the rJava package - low-level R/Java interface
 ## (C)2006 Simon Urbanek <simon.urbanek@r-project.org>
 ## For license terms see DESCRIPTION and/or LICENSE
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/loader.R b/com.oracle.truffle.r.pkgs/rJava/R/loader.R
index afb8710fcd8584d2939f27e4bf8c6f33b551fc7c..6aebbe5d2c3ceacafbf78b29f4f166516a7cc4b0 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/loader.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/loader.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 .jaddClassPath <- function(path) {
     if (!length(path)) return(invisible(NULL))
     # FASTR <<<<<
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/memprof.R b/com.oracle.truffle.r.pkgs/rJava/R/memprof.R
index f90745301bf078c9a542a7c4f846e398436a92ed..8fd6c2bec52390dae3725bc0c1040a48eab9b601 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/memprof.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/memprof.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 .jmemprof <- function(file = "-") {
   if (is.null(file)) file <- ""
   invisible(.Call(RJava_set_memprof, as.character(file)))
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/methods.R b/com.oracle.truffle.r.pkgs/rJava/R/methods.R
index 75435d009d420cf8911c47472e24b4b3e9a1b7e6..c86d4b876c122b3bf3e6ced26cfb679fd1b0450e 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/methods.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/methods.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## methods for jobjRef class
 ##
 ## additional methods ($ and $<-) are defined in reflection.R
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/options.R b/com.oracle.truffle.r.pkgs/rJava/R/options.R
index e28823c0c975d6365f52b6d2072427343e9a5020..f26d816a53fe7656bd98111b0c3aa2863a2b2857 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/options.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/options.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 .joptions <- function(...) {
   l <- list(...)
   if (length(l)==0) return(list())
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/reflection.R b/com.oracle.truffle.r.pkgs/rJava/R/reflection.R
index bee29283b150d874576e8e20f0ac7e77c2e177f4..d0b5d9dbf96c582687a5b73bc5f5073cc33b41b9 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/reflection.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/reflection.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ### reflection functions - convenience function relying on the low-level
 ### functions .jcall/.jnew and friends
 
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/rep.R b/com.oracle.truffle.r.pkgs/rJava/R/rep.R
index 11491ea3ca89e3f3a741e5097467033100e5c3f7..b7b3f1fa4a94985052ebef4aa1a47bf223da0ebc 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/rep.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/rep.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 # :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1:
 
 # {{{ rep
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/serialize.R b/com.oracle.truffle.r.pkgs/rJava/R/serialize.R
index cb0ef7655508b6caff5f8e16dcbf7f7cdd7f15e1..6ea884296d202adaa8309540775ec1c30fe42d78 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/serialize.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/serialize.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## Java serialization/unserialization
 
 .jserialize <- function(o) {
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/tools.R b/com.oracle.truffle.r.pkgs/rJava/R/tools.R
index 197ff8a40e9d381ac5a450f6eacc8ff1fd607a98..9f3d2801a580b5b1129843f614e1ce03b0edf28d 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/tools.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/tools.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2006 Simon Urbanek <simon.urbanek@r-project.org>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 #' converts a java class name to jni notation
 tojni <- function( cl = "java.lang.Object" ){
 	gsub( "[.]", "/", cl )
diff --git a/com.oracle.truffle.r.pkgs/rJava/R/with.R b/com.oracle.truffle.r.pkgs/rJava/R/with.R
index 6fc68e76821ee16c374fd20de71e2a165a89c040..0111dfab16d21b79cdbbccd18048bc0f0f1018ce 100644
--- a/com.oracle.truffle.r.pkgs/rJava/R/with.R
+++ b/com.oracle.truffle.r.pkgs/rJava/R/with.R
@@ -1,14 +1,3 @@
-##
- # This material is distributed under the GNU General Public License
- # Version 2. You may review the terms of this license at
- # http://www.gnu.org/licenses/gpl-2.0.html
- #
- # Copyright (c) 2010 Romain Francois <francoisromain@free.fr>
- # Copyright (c) 2018, Oracle and/or its affiliates
- #
- # All rights reserved.
-##
-
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
 ## the Free Software Foundation, either version 2 of the License, or
diff --git a/com.oracle.truffle.r.pkgs/rJava/man/jnew.Rd b/com.oracle.truffle.r.pkgs/rJava/man/jnew.Rd
index d599012346b9c68b248b07d50eca708ca537a36b..71f13ce61e5869a0efed6ba1edbb21fcb0eeffc9 100644
--- a/com.oracle.truffle.r.pkgs/rJava/man/jnew.Rd
+++ b/com.oracle.truffle.r.pkgs/rJava/man/jnew.Rd
@@ -7,7 +7,7 @@
 	\code{.jnew} create a new Java object.
 }
 \usage{
-.jnew(class, ..., check=TRUE, silent=!check, class.loader=NULL)
+.jnew(class, ..., check=TRUE, silent=!check)
 }
 \arguments{
   \item{class}{fully qualified class name in JNI notation (e.g. \code{"java/lang/String"}).}
@@ -29,11 +29,6 @@
     \code{check=FALSE, silent=FALSE} is usually not a meaningful
     combination.
   }
-  \item{class.loader}{optional class loader to force for loading the
-    class. If not set, the rJava class loader is used first. The default
-    Java class loader is always used as a last resort. This is for
-    expert use only! If you set the class loader, the class loading
-    behavior changes - use only in very special circumstances.}
 }
 \value{
   Returns the reference (\code{jobjRef}) to the newly created object or
diff --git a/com.oracle.truffle.r.pkgs/rJava/man/jpackage.Rd b/com.oracle.truffle.r.pkgs/rJava/man/jpackage.Rd
index 29daddf40f423213ae23a5ef3b4b0dd06b82ba8d..a1b162e4d80abc692bd935ac256ce433a2cc2a9d 100644
--- a/com.oracle.truffle.r.pkgs/rJava/man/jpackage.Rd
+++ b/com.oracle.truffle.r.pkgs/rJava/man/jpackage.Rd
@@ -19,7 +19,7 @@
   \item{jars}{Java archives in the \code{java} directory of the package
     that should be added to the class path. The paths must be relative
     to package's \code{java} directory. A special value of
-    \code{'*'} adds all \code{.jar} files from the \code{java} the
+    \code{'*'} adds all \code{.jar} files form the \code{java} the
     directory.}
   \item{morePaths}{vector listing any additional entries that should
     be added to the class path.}
diff --git a/com.oracle.truffle.r.pkgs/rJava/man/loader.Rd b/com.oracle.truffle.r.pkgs/rJava/man/loader.Rd
index f7a8e4afebf1c8ac0bb74894bb5fd292e67ed43e..e50e8f6a9f47b27c0f114e68b2b394550f2d62b3 100644
--- a/com.oracle.truffle.r.pkgs/rJava/man/loader.Rd
+++ b/com.oracle.truffle.r.pkgs/rJava/man/loader.Rd
@@ -20,7 +20,7 @@
     class path}
 }
 \value{
-  \code{.jclassPath} returns a character vector listing the class path sequence.
+  \code{.jclassPath} returns a charactger vector listing the class path sequence.
 }
 %\details{
 % 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java
index 56f86de3874fd5551b775db020de677016ffefa8..b8aaf4de65be91c25f92fa09031de93fe47198a4 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 public class ArrayDimensionException extends Exception{
 	public ArrayDimensionException(String message){
 		super( message ) ; 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java b/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java
index 388aadc5c14e948c12822938be8aa275c61050c5..1b45bce9a9ed1a02df5f77054b0f3e86464a6523 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 // :tabSize=2:indentSize=2:noTabs=false:folding=explicit:collapseFolds=1:
 
 import java.lang.reflect.Array ; 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java b/com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java
index ec0f600b7e297d65d7c4fb7bc3479e56a789ae18..9407bd9732413641097c8516dccd1e13d3e1d424 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 
 public class DummyPoint implements Cloneable {
 	public int x; 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java
index 91ce8a08f77268c43789b43a3fec6fd28e39ca26..4b4330b30a877c9fb690792e6652d73ad085a949 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 
 /**
  * Generated when one attemps to flatten an array that is not rectangular
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java
index 7f9cf8f23f233c9eea9533c92f7dec2099c66e85..2be5327ed6ccfa4b3b536bccc2f1468650eb1155 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 /**
  * Exception indicating that an object is not a java array
  */
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java
index 73eac55972345735d33d9627354279949fc59217..48824de1317a02ed6d27aba7b4d66a6cec210af0 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 /**
  * Exception generated when two objects cannot be compared
  * 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java
index 9333fd07470dee580940dc77c2cf884fb66d4858..33524834b5e506b65e5d4d3d930f665f98dd1bf0 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 /**
  * Generated when one tries to access an array of primitive
  * values as an array of Objects
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java b/com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java
index a4f60fcdf572ea584d5a84fd8b977279986134a7..2a89856333ed15704e53779fd57d1d6eaaea7200 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 /**
  * Generated when one tries to convert an arrays into 
  * a primitive array of the wrong type
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java
index 0b4dfd1e7254dae4fa72d203301bff14d5daf948..3b0df629b574f9b19c118f5a1e727a45150de7e2 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 import java.lang.reflect.Array ;
 
 public abstract class RJavaArrayIterator {
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java
index 87658c8a8094d1c3b697d30a4111d6205949974a..6f1098a94cda90af35e0c6eafc9ab431288602a9 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java
@@ -1,13 +1,23 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2009-2010, Simon Urbanek and Romain Francois
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
+// RJavaTools.java: rJava - low level R to java interface
+//
+// :tabSize=2:indentSize=2:noTabs=false:folding=explicit:collapseFolds=1:
+//
+// Copyright (C) 2009 - 2010	Simon Urbanek and Romain Francois
+//
+// This file is part of rJava.
+//
+// rJava is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// rJava 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 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with rJava.  If not, see <http://www.gnu.org/licenses/>.
 
 import java.lang.reflect.Array ; 
 import java.util.Map; 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java
index 9823e602e7c6308445c7bbb3ea7e0795cfc1ad06..d5a05134a6c869ed519df57423a6604a27ed2fcd 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 // :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1:
 
 // {{{ imports
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java
index a220269cdbe713b49550df26576e5c960c04d3af..30e3f14f23ad4b6fdcb54bbc64a3487d0b4e3981 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 import java.lang.Comparable ; 
 
 /**
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java
index 9b5f664808b26bb87accc5af55b8eac418a1f917..85984861dbf50981adb9db34dee858e22a9c5de7 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java
@@ -1,13 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
 
 import java.util.regex.Pattern ;
 import java.util.regex.Matcher ;
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java
index f7906f94bf24832931efa3a81e6adcc5dbf14be3..f6f3424a858f484f2c417ccc09fe56398c28be34 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2009-2010, Simon Urbanek and Romain Francois
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 // RJavaTools.java: rJava - low level R to java interface
 //
 // Copyright (C) 2009 - 2010	Simon Urbanek and Romain Francois
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java
index 0c4b174fc12bcdc36c6ce9e63eee9410e13917b3..9bb9cb9736aa50db48390bd84598d650d5b6e10a 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 // :tabSize=2:indentSize=2:noTabs=false:folding=explicit:collapseFolds=1:
 
 import java.lang.reflect.Array ; 
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java
index 37221045298aacf25d39d9c663ad2fc8661b5ffb..8a09f9c3971bd0cf1fe282ac3b977eb086b9b4cb 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 // :tabSize=2:indentSize=2:noTabs=false:folding=explicit:collapseFolds=1:
 
 /**
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java
index 686a6c259f0475b1f591caf0b91638b5d1675fb2..754b5106c67ea579f0591995677edfe7504de058 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java
+++ b/com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java
@@ -1,14 +1,3 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2006, Simon Urbanek
- * Copyright (c) 2018, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
 // :tabSize=2:indentSize=2:noTabs=false:folding=explicit:collapseFolds=1:
 
 import java.lang.reflect.Array ; 
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index da411e334144d47f2ce4012571bf5323b6ff2d2b..8e663c6794ecea4c3a58773006b72ca4fc2ea970 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -955,20 +955,20 @@ com.oracle.truffle.r.native/gnur/patch/src/nmath/nmath.h,no.copyright
 com.oracle.truffle.r.native/fficall/src/common/rffi_upcalls.h,no.copyright
 com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/REnvironmentMRTest.java,no.copyright
 com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/VectorMRTest.java,no.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java,rjava_romain.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java,rjava_romain.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java,rjava.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/PrimitiveArrayException.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayIterator.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaArrayTools.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaClassLoader.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaComparator.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaImport.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RJavaTools.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayBuilder.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArrayExamples.java,no.copyright
+com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java,no.copyright