From 59b2e0f9bfc7158209286925674d7357db3ba8f9 Mon Sep 17 00:00:00 2001
From: Martin Traverso <mtraverso@gmail.com>
Date: Mon, 25 Nov 2024 13:26:44 -0800
Subject: [PATCH] Rename trino-apache-ranger module to trino-ranger

---
 core/trino-server/src/main/provisio/trino.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../plugin/ranger/ApacheRangerPlugin.java     |  0
 .../io/trino/plugin/ranger/RangerConfig.java  |  0
 .../ranger/RangerSystemAccessControl.java     |  0
 .../RangerSystemAccessControlFactory.java     |  0
 .../ranger/RangerTrinoAccessRequest.java      |  0
 .../plugin/ranger/RangerTrinoAccessType.java  |  0
 .../ranger/RangerTrinoEventListener.java      |  0
 .../plugin/ranger/RangerTrinoResource.java    |  0
 .../plugin/ranger/RangerAdminClientImpl.java  |  0
 .../plugin/ranger/TestApacheRangerPlugin.java |  0
 .../trino/plugin/ranger/TestRangerConfig.java |  0
 .../ranger/TestRangerSystemAccessControl.java |  0
 .../test/resources/ranger-trino-security.xml  |  0
 .../src/test/resources/trino-policies.json    |  0
 pom.xml                                       | 28 +++++++++----------
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename plugin/{trino-apache-ranger => trino-ranger}/pom.xml (99%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/ApacheRangerPlugin.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerConfig.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControlFactory.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessRequest.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessType.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerTrinoEventListener.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/main/java/io/trino/plugin/ranger/RangerTrinoResource.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/java/io/trino/plugin/ranger/RangerAdminClientImpl.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/java/io/trino/plugin/ranger/TestApacheRangerPlugin.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/java/io/trino/plugin/ranger/TestRangerConfig.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/java/io/trino/plugin/ranger/TestRangerSystemAccessControl.java (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/resources/ranger-trino-security.xml (100%)
 rename plugin/{trino-apache-ranger => trino-ranger}/src/test/resources/trino-policies.json (100%)

diff --git a/core/trino-server/src/main/provisio/trino.xml b/core/trino-server/src/main/provisio/trino.xml
index 6d290e42b81b4..6d2e4f2672462 100644
--- a/core/trino-server/src/main/provisio/trino.xml
+++ b/core/trino-server/src/main/provisio/trino.xml
@@ -34,7 +34,7 @@
 
     <!-- Plugins -->
     <artifactSet to="plugin/apache-ranger">
-        <artifact id="${project.groupId}:trino-apache-ranger:zip:${project.version}">
+        <artifact id="${project.groupId}:trino-ranger:zip:${project.version}">
             <unpack />
         </artifact>
     </artifactSet>
diff --git a/plugin/trino-apache-ranger/pom.xml b/plugin/trino-ranger/pom.xml
similarity index 99%
rename from plugin/trino-apache-ranger/pom.xml
rename to plugin/trino-ranger/pom.xml
index 30580ced3ecc0..9dba426bad216 100644
--- a/plugin/trino-apache-ranger/pom.xml
+++ b/plugin/trino-ranger/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>trino-apache-ranger</artifactId>
+    <artifactId>trino-ranger</artifactId>
 
     <packaging>trino-plugin</packaging>
     <name>Trino - Apache Ranger access control</name>
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/ApacheRangerPlugin.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/ApacheRangerPlugin.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/ApacheRangerPlugin.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/ApacheRangerPlugin.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerConfig.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerConfig.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerConfig.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerConfig.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControlFactory.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControlFactory.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControlFactory.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControlFactory.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessRequest.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessRequest.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessRequest.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessRequest.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessType.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessType.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessType.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoAccessType.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoEventListener.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoEventListener.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoEventListener.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoEventListener.java
diff --git a/plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoResource.java b/plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoResource.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoResource.java
rename to plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerTrinoResource.java
diff --git a/plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/RangerAdminClientImpl.java b/plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/RangerAdminClientImpl.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/RangerAdminClientImpl.java
rename to plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/RangerAdminClientImpl.java
diff --git a/plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestApacheRangerPlugin.java b/plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestApacheRangerPlugin.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestApacheRangerPlugin.java
rename to plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestApacheRangerPlugin.java
diff --git a/plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestRangerConfig.java b/plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestRangerConfig.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestRangerConfig.java
rename to plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestRangerConfig.java
diff --git a/plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestRangerSystemAccessControl.java b/plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestRangerSystemAccessControl.java
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/java/io/trino/plugin/ranger/TestRangerSystemAccessControl.java
rename to plugin/trino-ranger/src/test/java/io/trino/plugin/ranger/TestRangerSystemAccessControl.java
diff --git a/plugin/trino-apache-ranger/src/test/resources/ranger-trino-security.xml b/plugin/trino-ranger/src/test/resources/ranger-trino-security.xml
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/resources/ranger-trino-security.xml
rename to plugin/trino-ranger/src/test/resources/ranger-trino-security.xml
diff --git a/plugin/trino-apache-ranger/src/test/resources/trino-policies.json b/plugin/trino-ranger/src/test/resources/trino-policies.json
similarity index 100%
rename from plugin/trino-apache-ranger/src/test/resources/trino-policies.json
rename to plugin/trino-ranger/src/test/resources/trino-policies.json
diff --git a/pom.xml b/pom.xml
index 5a0c4f8ec8306..0b4918454196b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
         <module>lib/trino-parquet</module>
         <module>lib/trino-plugin-toolkit</module>
         <module>lib/trino-record-decoder</module>
-        <module>plugin/trino-apache-ranger</module>
         <module>plugin/trino-base-jdbc</module>
         <module>plugin/trino-bigquery</module>
         <module>plugin/trino-blackhole</module>
@@ -102,6 +101,7 @@
         <module>plugin/trino-pinot</module>
         <module>plugin/trino-postgresql</module>
         <module>plugin/trino-prometheus</module>
+        <module>plugin/trino-ranger</module>
         <module>plugin/trino-redis</module>
         <module>plugin/trino-redshift</module>
         <module>plugin/trino-resource-group-managers</module>
@@ -959,19 +959,6 @@
                 <version>${dep.swagger.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-apache-ranger</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-apache-ranger</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-            </dependency>
-
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-array</artifactId>
@@ -1404,6 +1391,19 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-ranger</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-ranger</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-re2j</artifactId>