RANGER-660: updated tagsync packaging to include atlas libraries Signed-off-by: Madhan Neethiraj <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/e0faf52d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/e0faf52d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/e0faf52d Branch: refs/heads/master Commit: e0faf52d92271dbdceb787585124c859f571355f Parents: 44ddd59 Author: Abhay Kulkarni <[email protected]> Authored: Mon Sep 28 12:09:57 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Sep 30 19:59:42 2015 -0700 ---------------------------------------------------------------------- .../atlas-client-0.6-incubating-SNAPSHOT.jar | Bin 34445 -> 0 bytes ...las-notification-0.6-incubating-SNAPSHOT.jar | Bin 34596 -> 0 bytes ...atlas-typesystem-0.6-incubating-SNAPSHOT.jar | Bin 355378 -> 0 bytes .../atlas-client-0.5.0.2.3.1.1-19.jar | Bin 0 -> 34558 bytes .../atlas-notification-0.5.0.2.3.1.1-19.jar | Bin 0 -> 34734 bytes .../atlas-typesystem-0.5.0.2.3.1.1-19.jar | Bin 0 -> 355350 bytes pom.xml | 2 +- tagsync/pom.xml | 22 +++++++++++-------- .../source/atlas/AtlasNotificationMapper.java | 8 +------ 9 files changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-client-0.6-incubating-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-client-0.6-incubating-SNAPSHOT.jar b/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-client-0.6-incubating-SNAPSHOT.jar deleted file mode 100644 index feaaa38..0000000 Binary files a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-client-0.6-incubating-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-notification-0.6-incubating-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-notification-0.6-incubating-SNAPSHOT.jar b/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-notification-0.6-incubating-SNAPSHOT.jar deleted file mode 100644 index 3c2ecb6..0000000 Binary files a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-notification-0.6-incubating-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-typesystem-0.6-incubating-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-typesystem-0.6-incubating-SNAPSHOT.jar b/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-typesystem-0.6-incubating-SNAPSHOT.jar deleted file mode 100644 index 8e5d1bf..0000000 Binary files a/lib/local/apache-atlas-0.6-incubating-SNAPSHOT/atlas-typesystem-0.6-incubating-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/local-repo/org/apache/atlas/atlas-client/0.5.0.2.3.1.1-19/atlas-client-0.5.0.2.3.1.1-19.jar ---------------------------------------------------------------------- diff --git a/local-repo/org/apache/atlas/atlas-client/0.5.0.2.3.1.1-19/atlas-client-0.5.0.2.3.1.1-19.jar b/local-repo/org/apache/atlas/atlas-client/0.5.0.2.3.1.1-19/atlas-client-0.5.0.2.3.1.1-19.jar new file mode 100644 index 0000000..1fb2ef7 Binary files /dev/null and b/local-repo/org/apache/atlas/atlas-client/0.5.0.2.3.1.1-19/atlas-client-0.5.0.2.3.1.1-19.jar differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/local-repo/org/apache/atlas/atlas-notification/0.5.0.2.3.1.1-19/atlas-notification-0.5.0.2.3.1.1-19.jar ---------------------------------------------------------------------- diff --git a/local-repo/org/apache/atlas/atlas-notification/0.5.0.2.3.1.1-19/atlas-notification-0.5.0.2.3.1.1-19.jar b/local-repo/org/apache/atlas/atlas-notification/0.5.0.2.3.1.1-19/atlas-notification-0.5.0.2.3.1.1-19.jar new file mode 100644 index 0000000..848eeb3 Binary files /dev/null and b/local-repo/org/apache/atlas/atlas-notification/0.5.0.2.3.1.1-19/atlas-notification-0.5.0.2.3.1.1-19.jar differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/local-repo/org/apache/atlas/atlas-typesystem/0.5.0.2.3.1.1-19/atlas-typesystem-0.5.0.2.3.1.1-19.jar ---------------------------------------------------------------------- diff --git a/local-repo/org/apache/atlas/atlas-typesystem/0.5.0.2.3.1.1-19/atlas-typesystem-0.5.0.2.3.1.1-19.jar b/local-repo/org/apache/atlas/atlas-typesystem/0.5.0.2.3.1.1-19/atlas-typesystem-0.5.0.2.3.1.1-19.jar new file mode 100644 index 0000000..f619b6e Binary files /dev/null and b/local-repo/org/apache/atlas/atlas-typesystem/0.5.0.2.3.1.1-19/atlas-typesystem-0.5.0.2.3.1.1-19.jar differ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7ebf0cf..247fb1a 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ </repository> <repository> <id>repo</id> - <url>file://${user.home}/local-repo</url> + <url>file://${basedir}/local-repo</url> <snapshots> <enabled>true</enabled> </snapshots> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/tagsync/pom.xml ---------------------------------------------------------------------- diff --git a/tagsync/pom.xml b/tagsync/pom.xml index 18c684c..83c0f30 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -30,6 +30,16 @@ <version>0.5.0</version> </parent> + <repositories> + + <repository> + <id>repo</id> + <url>file://${basedir}/../local-repo</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -94,23 +104,17 @@ <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-notification</artifactId> - <version>0.6-incubating-SNAPSHOT</version> - <scope>system</scope> - <systemPath>${local.lib.dir}/apache-atlas-0.6-incubating-SNAPSHOT/atlas-notification-0.6-incubating-SNAPSHOT.jar</systemPath> + <version>0.5.0.2.3.1.1-19</version> </dependency> <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-typesystem</artifactId> - <version>0.6-incubating-SNAPSHOT</version> - <scope>system</scope> - <systemPath>${local.lib.dir}/apache-atlas-0.6-incubating-SNAPSHOT/atlas-typesystem-0.6-incubating-SNAPSHOT.jar</systemPath> + <version>0.5.0.2.3.1.1-19</version> </dependency> <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-client</artifactId> - <version>0.6-incubating-SNAPSHOT</version> - <scope>system</scope> - <systemPath>${local.lib.dir}/apache-atlas-0.6-incubating-SNAPSHOT/atlas-client-0.6-incubating-SNAPSHOT.jar</systemPath> + <version>0.5.0.2.3.1.1-19</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e0faf52d/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasNotificationMapper.java ---------------------------------------------------------------------- diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasNotificationMapper.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasNotificationMapper.java index 973b7fb..dd5cd44 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasNotificationMapper.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasNotificationMapper.java @@ -165,8 +165,7 @@ class AtlasNotificationMapper { elements = new HashMap<String, RangerPolicy.RangerPolicyResource>(); - //String[] components = getQualifiedNameComponents(entity); - String[] components = getTempNameComponents(entity); + String[] components = getQualifiedNameComponents(entity); // components should contain qualifiedName, instanceName, dbName, tableName, columnName in that order @@ -200,10 +199,6 @@ class AtlasNotificationMapper { LOG.error("invalid qualifiedName for HIVE_TABLE, qualifiedName=" + components[0]); } } else if (StringUtils.equals(entityTypeName, ENTITY_TYPE_HIVE_COLUMN)) { - LOG.error("HIVE_COLUMN creation is not handled."); - throw new Exception("HIVE_COLUMN entity-creation not implemented"); - - /* if (components.length > 4) { dbName = components[2]; tableName = components[3]; @@ -217,7 +212,6 @@ class AtlasNotificationMapper { } else { LOG.error("invalid qualifiedName for HIVE_COLUMN, qualifiedName=" + components[0]); } - */ } }
