You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2016/06/21 09:05:04 UTC
[1/3] incubator-atlas git commit: ATLAS-922 remove test
atlas-application.properties embedded in atlas-typesystem.jar
(madhan.neethiraj via yhemanth)
Repository: incubator-atlas
Updated Branches:
refs/heads/0.7-incubating ec1ddd902 -> a703a453b
ATLAS-922 remove test atlas-application.properties embedded in atlas-typesystem.jar (madhan.neethiraj via yhemanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/7b3ace5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/7b3ace5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/7b3ace5e
Branch: refs/heads/0.7-incubating
Commit: 7b3ace5e5ea5101631309af405109be7dda9a593
Parents: f4ca40e
Author: Hemanth Yamijala <hy...@hortonworks.com>
Authored: Tue Jun 21 12:39:28 2016 +0530
Committer: Hemanth Yamijala <hy...@hortonworks.com>
Committed: Tue Jun 21 12:39:28 2016 +0530
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 18 ++++
addons/hdfs-model/pom.xml | 16 ++-
addons/hive-bridge/pom.xml | 18 ++++
addons/sqoop-bridge/pom.xml | 18 ++++
addons/storm-bridge/pom.xml | 20 +++-
catalog/pom.xml | 8 ++
client/pom.xml | 8 ++
.../org/apache/atlas/ApplicationProperties.java | 18 +++-
notification/pom.xml | 8 ++
pom.xml | 4 +
release-log.txt | 1 +
repository/pom.xml | 8 ++
typesystem/pom.xml | 12 +++
.../main/resources/atlas-application.properties | 107 -------------------
.../test/resources/atlas-application.properties | 92 +++++++++++++++-
webapp/pom.xml | 12 +++
16 files changed, 256 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 14c6090..c6d7dec 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -85,6 +85,14 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -230,6 +238,10 @@
<name>atlas.data</name>
<value>${project.build.directory}/data</value>
</systemProperty>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
@@ -289,6 +301,12 @@
<execution>
<configuration>
<mainClass>org.apache.atlas.falcon.model.FalconDataModelGenerator</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
+ </systemProperties>
<arguments>
<argument>${project.build.directory}/models/falcon_model.json</argument>
</arguments>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/addons/hdfs-model/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml
index f4033bc..f65c9ee 100644
--- a/addons/hdfs-model/pom.xml
+++ b/addons/hdfs-model/pom.xml
@@ -84,6 +84,14 @@
<artifactId>atlas-repository</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -123,6 +131,12 @@
<execution>
<configuration>
<mainClass>org.apache.atlas.fs.model.FSDataModelGenerator</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/src/test/resources/</value>
+ </systemProperty>
+ </systemProperties>
<arguments>
<argument>${project.build.directory}/models/fs_model.json</argument>
</arguments>
@@ -141,4 +155,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index dff93a9..3baaed2 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -148,6 +148,14 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -307,6 +315,10 @@
<name>atlas.data</name>
<value>${project.build.directory}/data</value>
</systemProperty>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
@@ -366,6 +378,12 @@
<execution>
<configuration>
<mainClass>org.apache.atlas.hive.model.HiveDataModelGenerator</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
+ </systemProperties>
<arguments>
<argument>${project.build.directory}/models/hive_model.json</argument>
</arguments>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index 343bb4e..766c18d 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -150,6 +150,14 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -309,6 +317,10 @@
<name>atlas.data</name>
<value>${project.build.directory}/data</value>
</systemProperty>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
@@ -368,6 +380,12 @@
<execution>
<configuration>
<mainClass>org.apache.atlas.sqoop.model.SqoopDataModelGenerator</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
+ </systemProperties>
<arguments>
<argument>${project.build.directory}/models/sqoop_model.json</argument>
</arguments>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index b1a7a9b..72310d2 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -123,6 +123,14 @@
<type>war</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -349,6 +357,10 @@
<name>atlas.data</name>
<value>${project.build.directory}/data</value>
</systemProperty>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
@@ -409,6 +421,12 @@
<execution>
<configuration>
<mainClass>org.apache.atlas.storm.model.StormDataModelGenerator</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../../typesystem/target/test-classes</value>
+ </systemProperty>
+ </systemProperties>
<arguments>
<argument>${project.build.directory}/models/storm_model.json</argument>
</arguments>
@@ -427,4 +445,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 8a49d3d..87cf646 100755
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -102,6 +102,14 @@
<artifactId>mockito-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 69b8731..aa16bb4 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -69,6 +69,14 @@
</dependency>
<dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/common/src/main/java/org/apache/atlas/ApplicationProperties.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/atlas/ApplicationProperties.java b/common/src/main/java/org/apache/atlas/ApplicationProperties.java
index 48cb7a6..741e1a6 100644
--- a/common/src/main/java/org/apache/atlas/ApplicationProperties.java
+++ b/common/src/main/java/org/apache/atlas/ApplicationProperties.java
@@ -67,8 +67,22 @@ public final class ApplicationProperties extends PropertiesConfiguration {
public static Configuration get(String fileName) throws AtlasException {
String confLocation = System.getProperty("atlas.conf");
try {
- URL url = confLocation == null ? ApplicationProperties.class.getResource("/" + fileName)
- : new File(confLocation, fileName).toURI().toURL();
+ URL url = null;
+
+ if (confLocation == null) {
+ LOG.info("Looking for {} in classpath", fileName);
+
+ url = ApplicationProperties.class.getClassLoader().getResource(fileName);
+
+ if (url == null) {
+ LOG.info("Looking for /{} in classpath", fileName);
+
+ url = ApplicationProperties.class.getClassLoader().getResource("/" + fileName);
+ }
+ } else {
+ url = new File(confLocation, fileName).toURI().toURL();
+ }
+
LOG.info("Loading {} from {}", fileName, url);
Configuration configuration = new ApplicationProperties(url).interpolatedConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/notification/pom.xml
----------------------------------------------------------------------
diff --git a/notification/pom.xml b/notification/pom.xml
index fc08115..4b1b7a5 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -97,6 +97,14 @@
<version>${zkclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1539922..fcf8059 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1336,6 +1336,10 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
+ <testResource>
+ <directory>typesystem/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 9b8c479..9cd5922 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -29,6 +29,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
+ATLAS-922 remove test atlas-application.properties embedded in atlas-typesystem.jar (madhan.neethiraj via yhemanth)
ATLAS-725 UI : Filter out or highlight deleted entities in search result outputs(dsl, text) , schema view, and lineage graph (kevalbhatt18 via sumasai)
ATLAS-897 Atlas UI: Feature to associate multiple assets with a term. (kevalbhatt18 via sumasai)
ATLAS-866 Improve association of terms with entity (Show tree view) (kevalbhatt18 via sumasai)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index 533e48b..f2119eb 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -156,6 +156,14 @@
<artifactId>hbase-server</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/typesystem/pom.xml
----------------------------------------------------------------------
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index c1f3fcd..ce30194 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -133,6 +133,18 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/typesystem/src/main/resources/atlas-application.properties
----------------------------------------------------------------------
diff --git a/typesystem/src/main/resources/atlas-application.properties b/typesystem/src/main/resources/atlas-application.properties
deleted file mode 100644
index 2bbcdcd..0000000
--- a/typesystem/src/main/resources/atlas-application.properties
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-######### Atlas Server Configs #########
-atlas.rest.address=http://localhost:31000
-
-######### Graph Database Configs #########
-# Graph Storage
-atlas.graph.storage.backend=${titan.storage.backend}
-
-# Entity repository implementation
-atlas.EntityAuditRepository.impl=${entity.repository.impl}
-
-# Graph Search Index Backend
-atlas.graph.index.search.backend=${titan.index.backend}
-
-#Berkeley storage directory
-atlas.graph.storage.directory=${sys:atlas.data}/berkley
-
-#hbase
-#For standalone mode , specify localhost
-#for distributed mode, specify zookeeper quorum here - For more information refer http://s3.thinkaurelius.com/docs/titan/current/hbase.html#_remote_server_mode_2
-
-atlas.graph.storage.hostname=${titan.storage.hostname}
-atlas.graph.storage.hbase.regions-per-server=1
-atlas.graph.storage.lock.wait-time=10000
-
-#ElasticSearch
-atlas.graph.index.search.directory=${sys:atlas.data}/es
-atlas.graph.index.search.elasticsearch.client-only=false
-atlas.graph.index.search.elasticsearch.local-mode=true
-atlas.graph.index.search.elasticsearch.create.sleep=2000
-
-# Solr cloud mode properties
-atlas.graph.index.search.solr.mode=cloud
-atlas.graph.index.search.solr.zookeeper-url=${solr.zk.address}
-
-
-######### Hive Lineage Configs #########
-## Schema
-atlas.lineage.schema.query.hive_table=hive_table where __guid='%s'\, columns
-
-######### Notification Configs #########
-atlas.notification.embedded=true
-
-atlas.kafka.zookeeper.connect=localhost:19026
-atlas.kafka.bootstrap.servers=localhost:19027
-atlas.kafka.data=${sys:atlas.data}/kafka
-atlas.kafka.zookeeper.session.timeout.ms=4000
-atlas.kafka.zookeeper.sync.time.ms=20
-atlas.kafka.consumer.timeout.ms=100
-atlas.kafka.auto.commit.interval.ms=100
-atlas.kafka.hook.group.id=atlas
-atlas.kafka.entities.group.id=atlas_entities
-atlas.kafka.auto.commit.enable=false
-
-######### Entity Audit Configs #########
-atlas.audit.hbase.tablename=ATLAS_ENTITY_AUDIT_EVENTS
-atlas.audit.zookeeper.session.timeout.ms=1000
-atlas.audit.hbase.zookeeper.quorum=localhost
-atlas.audit.hbase.zookeeper.property.clientPort=19026
-
-######### Security Properties #########
-
-# SSL config
-atlas.enableTLS=false
-atlas.server.https.port=31443
-
-######### Security Properties #########
-
-hbase.security.authentication=simple
-
-atlas.hook.falcon.synchronous=true
-
-######### JAAS Configuration ########
-
-atlas.jaas.KafkaClient.loginModuleName = com.sun.security.auth.module.Krb5LoginModule
-atlas.jaas.KafkaClient.loginModuleControlFlag = required
-atlas.jaas.KafkaClient.option.useKeyTab = true
-atlas.jaas.KafkaClient.option.storeKey = true
-atlas.jaas.KafkaClient.option.serviceName = kafka
-atlas.jaas.KafkaClient.option.keyTab = /etc/security/keytabs/atlas.service.keytab
-atlas.jaas.KafkaClient.option.principal = atlas/_HOST@EXAMPLE.COM
-
-######### High Availability Configuration ########
-atlas.server.ha.enabled=false
-#atlas.server.ids=id1
-#atlas.server.address.id1=localhost:21000
-
-#########POLICY FILE PATH #########
-atlas.auth.policy.file=${sys:user.dir}/distro/src/conf/policy-store.txt
-
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/typesystem/src/test/resources/atlas-application.properties
----------------------------------------------------------------------
diff --git a/typesystem/src/test/resources/atlas-application.properties b/typesystem/src/test/resources/atlas-application.properties
index ba66ae5..28d8af3 100644
--- a/typesystem/src/test/resources/atlas-application.properties
+++ b/typesystem/src/test/resources/atlas-application.properties
@@ -28,4 +28,94 @@ atlas.service=atlas
#invalid system property
atlas.db=${atlasdb}
-atlas.TypeSystem.impl=org.apache.atlas.typesystem.types.TypeSystem
\ No newline at end of file
+atlas.TypeSystem.impl=org.apache.atlas.typesystem.types.TypeSystem
+
+######### Atlas Server Configs #########
+atlas.rest.address=http://localhost:31000
+
+######### Graph Database Configs #########
+# Graph Storage
+atlas.graph.storage.backend=${titan.storage.backend}
+
+# Entity repository implementation
+atlas.EntityAuditRepository.impl=${entity.repository.impl}
+
+# Graph Search Index Backend
+atlas.graph.index.search.backend=${titan.index.backend}
+
+#Berkeley storage directory
+atlas.graph.storage.directory=${sys:atlas.data}/berkley
+
+#hbase
+#For standalone mode , specify localhost
+#for distributed mode, specify zookeeper quorum here - For more information refer http://s3.thinkaurelius.com/docs/titan/current/hbase.html#_remote_server_mode_2
+
+atlas.graph.storage.hostname=${titan.storage.hostname}
+atlas.graph.storage.hbase.regions-per-server=1
+atlas.graph.storage.lock.wait-time=10000
+
+#ElasticSearch
+atlas.graph.index.search.directory=${sys:atlas.data}/es
+atlas.graph.index.search.elasticsearch.client-only=false
+atlas.graph.index.search.elasticsearch.local-mode=true
+atlas.graph.index.search.elasticsearch.create.sleep=2000
+
+# Solr cloud mode properties
+atlas.graph.index.search.solr.mode=cloud
+atlas.graph.index.search.solr.zookeeper-url=${solr.zk.address}
+
+
+######### Hive Lineage Configs #########
+## Schema
+atlas.lineage.schema.query.hive_table=hive_table where __guid='%s'\, columns
+
+######### Notification Configs #########
+atlas.notification.embedded=true
+
+atlas.kafka.zookeeper.connect=localhost:19026
+atlas.kafka.bootstrap.servers=localhost:19027
+atlas.kafka.data=${sys:atlas.data}/kafka
+atlas.kafka.zookeeper.session.timeout.ms=4000
+atlas.kafka.zookeeper.sync.time.ms=20
+atlas.kafka.consumer.timeout.ms=100
+atlas.kafka.auto.commit.interval.ms=100
+atlas.kafka.hook.group.id=atlas
+atlas.kafka.entities.group.id=atlas_entities
+atlas.kafka.auto.commit.enable=false
+
+######### Entity Audit Configs #########
+atlas.audit.hbase.tablename=ATLAS_ENTITY_AUDIT_EVENTS
+atlas.audit.zookeeper.session.timeout.ms=1000
+atlas.audit.hbase.zookeeper.quorum=localhost
+atlas.audit.hbase.zookeeper.property.clientPort=19026
+
+######### Security Properties #########
+
+# SSL config
+atlas.enableTLS=false
+atlas.server.https.port=31443
+
+######### Security Properties #########
+
+hbase.security.authentication=simple
+
+atlas.hook.falcon.synchronous=true
+
+######### JAAS Configuration ########
+
+atlas.jaas.KafkaClient.loginModuleName = com.sun.security.auth.module.Krb5LoginModule
+atlas.jaas.KafkaClient.loginModuleControlFlag = required
+atlas.jaas.KafkaClient.option.useKeyTab = true
+atlas.jaas.KafkaClient.option.storeKey = true
+atlas.jaas.KafkaClient.option.serviceName = kafka
+atlas.jaas.KafkaClient.option.keyTab = /etc/security/keytabs/atlas.service.keytab
+atlas.jaas.KafkaClient.option.principal = atlas/_HOST@EXAMPLE.COM
+
+######### High Availability Configuration ########
+atlas.server.ha.enabled=false
+#atlas.server.ids=id1
+#atlas.server.address.id1=localhost:21000
+
+#########POLICY FILE PATH #########
+atlas.auth.policy.file=${sys:user.dir}/distro/src/conf/policy-store.txt
+
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b3ace5e/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index e17f64d..43f9c86 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -329,6 +329,14 @@
<version>3.4</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-typesystem</artifactId>
+ <version>${parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -478,6 +486,10 @@
<name>atlas.data</name>
<value>${project.build.directory}/data</value>
</systemProperty>
+ <systemProperty>
+ <key>atlas.conf</key>
+ <value>${project.build.directory}/../../typesystem/target/test-classes</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
[2/3] incubator-atlas git commit: Merge branch 'master' into
0.7-incubating
Posted by sh...@apache.org.
Merge branch 'master' into 0.7-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4d60dac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4d60dac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4d60dac5
Branch: refs/heads/0.7-incubating
Commit: 4d60dac5f89182fd40dca7157b5e7ded469d346d
Parents: ec1ddd9 7b3ace5
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Jun 21 14:23:02 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Jun 21 14:23:02 2016 +0530
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 18 ++++
addons/hdfs-model/pom.xml | 16 ++-
addons/hive-bridge/pom.xml | 18 ++++
addons/sqoop-bridge/pom.xml | 18 ++++
addons/storm-bridge/pom.xml | 20 +++-
catalog/pom.xml | 8 ++
client/pom.xml | 8 ++
.../org/apache/atlas/ApplicationProperties.java | 18 +++-
notification/pom.xml | 8 ++
pom.xml | 4 +
release-log.txt | 1 +
repository/pom.xml | 8 ++
typesystem/pom.xml | 12 +++
.../main/resources/atlas-application.properties | 107 -------------------
.../test/resources/atlas-application.properties | 92 +++++++++++++++-
webapp/pom.xml | 12 +++
16 files changed, 256 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-atlas git commit: ATLAS-926 Change version in 0.7
branch to 0.7-incubating (shwethags)
Posted by sh...@apache.org.
ATLAS-926 Change version in 0.7 branch to 0.7-incubating (shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/a703a453
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/a703a453
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/a703a453
Branch: refs/heads/0.7-incubating
Commit: a703a453b1cda8fdba8d6662dd5ce2cf46fefb8b
Parents: 4d60dac
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Jun 21 14:34:57 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Jun 21 14:34:57 2016 +0530
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 2 +-
addons/hdfs-model/pom.xml | 2 +-
addons/hive-bridge/pom.xml | 2 +-
addons/sqoop-bridge/pom.xml | 2 +-
addons/storm-bridge/pom.xml | 2 +-
authorization/pom.xml | 2 +-
catalog/pom.xml | 2 +-
client/pom.xml | 2 +-
common/pom.xml | 2 +-
dashboardv2/pom.xml | 2 +-
distro/pom.xml | 3 +--
docs/pom.xml | 2 +-
graphdb/api/pom.xml | 2 +-
graphdb/pom.xml | 2 +-
notification/pom.xml | 2 +-
pom.xml | 8 +++++++-
release-log.txt | 3 ++-
repository/pom.xml | 2 +-
server-api/pom.xml | 2 +-
titan/pom.xml | 2 +-
typesystem/pom.xml | 2 +-
webapp/pom.xml | 2 +-
22 files changed, 29 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index c6d7dec..c49f09d 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>falcon-bridge</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/addons/hdfs-model/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml
index f65c9ee..ea0d9f1 100644
--- a/addons/hdfs-model/pom.xml
+++ b/addons/hdfs-model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>hdfs-model</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 3baaed2..9602bc8 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>hive-bridge</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index 766c18d..8cd8c5b 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>sqoop-bridge</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 72310d2..4e6e6c4 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>storm-bridge</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/authorization/pom.xml
----------------------------------------------------------------------
diff --git a/authorization/pom.xml b/authorization/pom.xml
index 74c433b..3240b33 100644
--- a/authorization/pom.xml
+++ b/authorization/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-authorization</artifactId>
<name>Apache Atlas Authorization</name>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 87cf646..e128a7d 100755
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-catalog</artifactId>
<description>Apache Atlas Business Catalog Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index aa16bb4..ab3a9e4 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-client</artifactId>
<description>Apache Atlas Client</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 8239f26..6845100 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-common</artifactId>
<description>Apache Atlas Common</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/dashboardv2/pom.xml
----------------------------------------------------------------------
diff --git a/dashboardv2/pom.xml b/dashboardv2/pom.xml
index a46f40d..4ebf1e7 100644
--- a/dashboardv2/pom.xml
+++ b/dashboardv2/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-dashboardv2</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/distro/pom.xml
----------------------------------------------------------------------
diff --git a/distro/pom.xml b/distro/pom.xml
index 7aa4e50..4558ddc 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>atlas-distro</artifactId>
@@ -304,7 +304,6 @@ atlas.graph.index.search.solr.zookeeper-url=localhost:2181
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>storm-bridge</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index e34d7fe..a526179 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-docs</artifactId>
<description>Apache Atlas Documentation</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/graphdb/api/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml
index 5c05a40..052ac76 100644
--- a/graphdb/api/pom.xml
+++ b/graphdb/api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-graphdb-api</artifactId>
<description>Apache Atlas Graph Datbase API</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/graphdb/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/pom.xml b/graphdb/pom.xml
index 666fe5a..f5af3b5 100644
--- a/graphdb/pom.xml
+++ b/graphdb/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-graphdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/notification/pom.xml
----------------------------------------------------------------------
diff --git a/notification/pom.xml b/notification/pom.xml
index 4b1b7a5..1649456 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-notification</artifactId>
<description>Apache Atlas Notification</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fcf8059..b940bc1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
<description>Metadata Management and Data Governance Platform over Hadoop</description>
<name>apache-atlas</name>
<packaging>pom</packaging>
@@ -1078,6 +1078,12 @@
<dependency>
<groupId>org.apache.atlas</groupId>
+ <artifactId>storm-bridge</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
<artifactId>hdfs-model</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 9cd5922..d1d3ec6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,7 +1,7 @@
Apache Atlas Release Notes
==========================
---trunk - unreleased
+--Release 0.7-incubating
INCOMPATIBLE CHANGES:
ATLAS-844 Remove titan berkeley and elastic search jars if hbase/solr based profiles are chosen (yhemanth via shwethags)
ATLAS-819 All user defined types should have a set of common attributes (shwethags)
@@ -29,6 +29,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
+ATLAS-926 Change version in 0.7 branch to 0.7-incubating (shwethags)
ATLAS-922 remove test atlas-application.properties embedded in atlas-typesystem.jar (madhan.neethiraj via yhemanth)
ATLAS-725 UI : Filter out or highlight deleted entities in search result outputs(dsl, text) , schema view, and lineage graph (kevalbhatt18 via sumasai)
ATLAS-897 Atlas UI: Feature to associate multiple assets with a term. (kevalbhatt18 via sumasai)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index f2119eb..0a3c4cc 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-repository</artifactId>
<description>Apache Atlas Repository Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/server-api/pom.xml
----------------------------------------------------------------------
diff --git a/server-api/pom.xml b/server-api/pom.xml
index 9da3279..1d1e0a9 100644
--- a/server-api/pom.xml
+++ b/server-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/titan/pom.xml
----------------------------------------------------------------------
diff --git a/titan/pom.xml b/titan/pom.xml
index 09006d9..ab2b6f6 100644
--- a/titan/pom.xml
+++ b/titan/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>atlas-titan</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/typesystem/pom.xml
----------------------------------------------------------------------
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index ce30194..a6d505a 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-typesystem</artifactId>
<description>Apache Atlas Typesystem Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a703a453/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 43f9c86..06f77e2 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
+ <version>0.7-incubating</version>
</parent>
<artifactId>atlas-webapp</artifactId>
<description>Apache Atlas Web Application</description>