copied org.graalvm.python.embedding.util to org.graalvm.python.embedding

and deprecated embedding.util

Author: tomasstupka

docs/user/README.md

@@ -147,7 +147,7 @@ In order to distribute the resulting application for other systems, follow these
       package interop;
    
       import org.graalvm.polyglot.*;
-      import org.graalvm.python.embedding.utils.GraalPyResources;
+      import org.graalvm.python.embedding.GraalPyResources;
    
       class App {
       ...

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/integration/GraalPyResourcesTests.java renamed to graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/GraalPyResourcesTests.java

@@ -38,11 +38,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.python.embedding.utils.test.integration;
+package org.graalvm.python.embedding.test.integration;
 
 import org.graalvm.polyglot.Engine;
-import org.graalvm.python.embedding.utils.GraalPyResources;
-import org.graalvm.python.embedding.utils.VirtualFileSystem;
+import org.graalvm.python.embedding.GraalPyResources;
+import org.graalvm.python.embedding.VirtualFileSystem;
 import org.junit.Test;
 
 import java.nio.file.Path;

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/integration/VirtualFileSystemIntegrationTest.java renamed to graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/VirtualFileSystemIntegrationTest.java

@@ -39,16 +39,16 @@
  * SOFTWARE.
  */
 
-package org.graalvm.python.embedding.utils.test.integration;
+package org.graalvm.python.embedding.test.integration;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.io.IOAccess;
-import org.graalvm.python.embedding.utils.GraalPyResources;
-import org.graalvm.python.embedding.utils.VirtualFileSystem;
+import org.graalvm.python.embedding.GraalPyResources;
+import org.graalvm.python.embedding.VirtualFileSystem;
 import org.junit.Test;
 
 import java.io.BufferedReader;

graalpython/com.oracle.graal.python.test/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java renamed to graalpython/com.oracle.graal.python.test/src/org/graalvm/python/embedding/test/VirtualFileSystemTest.java

@@ -39,10 +39,10 @@
  * SOFTWARE.
  */
 
-package org.graalvm.python.embedding.utils.test;
+package org.graalvm.python.embedding.test;
 
 import org.graalvm.polyglot.io.FileSystem;
-import org.graalvm.python.embedding.utils.VirtualFileSystem;
+import org.graalvm.python.embedding.VirtualFileSystem;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -83,9 +83,9 @@
 import java.util.stream.Stream;
 
 import static com.oracle.graal.python.test.integration.Utils.IS_WINDOWS;
-import static org.graalvm.python.embedding.utils.VirtualFileSystem.HostIO.NONE;
-import static org.graalvm.python.embedding.utils.VirtualFileSystem.HostIO.READ;
-import static org.graalvm.python.embedding.utils.VirtualFileSystem.HostIO.READ_WRITE;
+import static org.graalvm.python.embedding.VirtualFileSystem.HostIO.NONE;
+import static org.graalvm.python.embedding.VirtualFileSystem.HostIO.READ;
+import static org.graalvm.python.embedding.VirtualFileSystem.HostIO.READ_WRITE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;

graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/gradle-test-project/src/main/java/org/example/GraalPy.j

@@ -46,7 +46,7 @@ import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import java.io.IOException;
 
-import org.graalvm.python.embedding.utils.GraalPyResources;
+import org.graalvm.python.embedding.GraalPyResources;
 
 public class GraalPy {
     private static final String PYTHON = "python";

graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/src/main/java/GraalPy.java

@@ -46,7 +46,7 @@
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import java.io.IOException;
-import org.graalvm.python.embedding.utils.GraalPyResources;
+import org.graalvm.python.embedding.GraalPyResources;
 
 public class GraalPy {
     private static final String PYTHON = "python";

graalpython/graalpy-jbang/examples/hello.java

@@ -46,7 +46,7 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.python.embedding.utils.GraalPyResources;
+import org.graalvm.python.embedding.GraalPyResources;
 
 public class hello {
     public static void main(String[] args) {

graalpython/graalpy-jbang/templates/graalpy-template.java.qute

@@ -14,7 +14,7 @@ import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.io.IOAccess;
-import org.graalvm.python.embedding.utils.GraalPyResources;
+import org.graalvm.python.embedding.GraalPyResources;
 
 public class {baseName} {
     public static void main(String[] args) {

graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute

@@ -17,7 +17,7 @@ import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.io.IOAccess;
-import org.graalvm.python.embedding.utils.GraalPyResources;
+import org.graalvm.python.embedding.GraalPyResources;
 
 public class {baseName} {
     public static void main(String[] args) {

graalpython/lib-graalpython/modules/standalone/__main__.py

@@ -64,7 +64,7 @@
 
 assert sys.pycache_prefix is None
 
-# Prefix and filelist match the defaults in org.graalvm.python.embedding.utils.VirtualFileSystemImpl
+# Prefix and filelist match the defaults in org.graalvm.python.embedding.VirtualFileSystemImpl
 VFS_PREFIX = "org.graalvm.python.vfs"
 FILES_LIST_NAME = "fileslist.txt"
 FILES_LIST_PATH = VFS_PREFIX + "/" + FILES_LIST_NAME