Skip to content

A
atlas
Commit 7b3ace5e by Hemanth Yamijala
Options

ATLAS-922 remove test atlas-application.properties embedded in…

ATLAS-922 remove test atlas-application.properties embedded in atlas-typesystem.jar (madhan.neethiraj via yhemanth)
parent f4ca40e2
Showing with 256 additions and 115 deletions
addons/falcon-bridge/pom.xml
...@@ -85,6 +85,14 @@ ...@@ -85,6 +85,14 @@
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -230,6 +238,10 @@ ...@@ -230,6 +238,10 @@
<name>atlas.data</name> <name>atlas.data</name>
<value>${project.build.directory}/data</value> <value>${project.build.directory}/data</value>
</systemProperty> </systemProperty>
<systemProperty>
<key>atlas.conf</key>
<value>${project.build.directory}/../../../typesystem/target/test-classes</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
...@@ -289,6 +301,12 @@ ...@@ -289,6 +301,12 @@
<execution> <execution>
<configuration> <configuration>
<mainClass>org.apache.atlas.falcon.model.FalconDataModelGenerator</mainClass> <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> <arguments>
<argument>${project.build.directory}/models/falcon_model.json</argument> <argument>${project.build.directory}/models/falcon_model.json</argument>
</arguments> </arguments>
......
addons/hdfs-model/pom.xml
...@@ -84,6 +84,14 @@ ...@@ -84,6 +84,14 @@
<artifactId>atlas-repository</artifactId> <artifactId>atlas-repository</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -123,6 +131,12 @@ ...@@ -123,6 +131,12 @@
<execution> <execution>
<configuration> <configuration>
<mainClass>org.apache.atlas.fs.model.FSDataModelGenerator</mainClass> <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> <arguments>
<argument>${project.build.directory}/models/fs_model.json</argument> <argument>${project.build.directory}/models/fs_model.json</argument>
</arguments> </arguments>
...@@ -141,4 +155,4 @@ ...@@ -141,4 +155,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
addons/hive-bridge/pom.xml
...@@ -148,6 +148,14 @@ ...@@ -148,6 +148,14 @@
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -307,6 +315,10 @@ ...@@ -307,6 +315,10 @@
<name>atlas.data</name> <name>atlas.data</name>
<value>${project.build.directory}/data</value> <value>${project.build.directory}/data</value>
</systemProperty> </systemProperty>
<systemProperty>
<key>atlas.conf</key>
<value>${project.build.directory}/../../../typesystem/target/test-classes</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
...@@ -366,6 +378,12 @@ ...@@ -366,6 +378,12 @@
<execution> <execution>
<configuration> <configuration>
<mainClass>org.apache.atlas.hive.model.HiveDataModelGenerator</mainClass> <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> <arguments>
<argument>${project.build.directory}/models/hive_model.json</argument> <argument>${project.build.directory}/models/hive_model.json</argument>
</arguments> </arguments>
......
addons/sqoop-bridge/pom.xml
...@@ -150,6 +150,14 @@ ...@@ -150,6 +150,14 @@
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -309,6 +317,10 @@ ...@@ -309,6 +317,10 @@
<name>atlas.data</name> <name>atlas.data</name>
<value>${project.build.directory}/data</value> <value>${project.build.directory}/data</value>
</systemProperty> </systemProperty>
<systemProperty>
<key>atlas.conf</key>
<value>${project.build.directory}/../../../typesystem/target/test-classes</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
...@@ -368,6 +380,12 @@ ...@@ -368,6 +380,12 @@
<execution> <execution>
<configuration> <configuration>
<mainClass>org.apache.atlas.sqoop.model.SqoopDataModelGenerator</mainClass> <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> <arguments>
<argument>${project.build.directory}/models/sqoop_model.json</argument> <argument>${project.build.directory}/models/sqoop_model.json</argument>
</arguments> </arguments>
......
addons/storm-bridge/pom.xml
...@@ -123,6 +123,14 @@ ...@@ -123,6 +123,14 @@
<type>war</type> <type>war</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -349,6 +357,10 @@ ...@@ -349,6 +357,10 @@
<name>atlas.data</name> <name>atlas.data</name>
<value>${project.build.directory}/data</value> <value>${project.build.directory}/data</value>
</systemProperty> </systemProperty>
<systemProperty>
<key>atlas.conf</key>
<value>${project.build.directory}/../../../typesystem/target/test-classes</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
...@@ -409,6 +421,12 @@ ...@@ -409,6 +421,12 @@
<execution> <execution>
<configuration> <configuration>
<mainClass>org.apache.atlas.storm.model.StormDataModelGenerator</mainClass> <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> <arguments>
<argument>${project.build.directory}/models/storm_model.json</argument> <argument>${project.build.directory}/models/storm_model.json</argument>
</arguments> </arguments>
...@@ -427,4 +445,4 @@ ...@@ -427,4 +445,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
catalog/pom.xml
...@@ -102,6 +102,14 @@ ...@@ -102,6 +102,14 @@
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
client/pom.xml
...@@ -69,6 +69,14 @@ ...@@ -69,6 +69,14 @@
</dependency> </dependency>
<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> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope> <scope>test</scope>
......
common/src/main/java/org/apache/atlas/ApplicationProperties.java
...@@ -67,8 +67,22 @@ public final class ApplicationProperties extends PropertiesConfiguration { ...@@ -67,8 +67,22 @@ public final class ApplicationProperties extends PropertiesConfiguration {
public static Configuration get(String fileName) throws AtlasException { public static Configuration get(String fileName) throws AtlasException {
String confLocation = System.getProperty("atlas.conf"); String confLocation = System.getProperty("atlas.conf");
try { try {
URL url = confLocation == null ? ApplicationProperties.class.getResource("/" + fileName) URL url = null;
: new File(confLocation, fileName).toURI().toURL();
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); LOG.info("Loading {} from {}", fileName, url);
Configuration configuration = new ApplicationProperties(url).interpolatedConfiguration(); Configuration configuration = new ApplicationProperties(url).interpolatedConfiguration();
......
notification/pom.xml
...@@ -97,6 +97,14 @@ ...@@ -97,6 +97,14 @@
<version>${zkclient.version}</version> <version>${zkclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
pom.xml
...@@ -1336,6 +1336,10 @@ ...@@ -1336,6 +1336,10 @@
<directory>src/test/resources</directory> <directory>src/test/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
</testResource> </testResource>
<testResource>
<directory>typesystem/src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources> </testResources>
<pluginManagement> <pluginManagement>
......
release-log.txt
...@@ -29,6 +29,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ...@@ -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) ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES: 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-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-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) ATLAS-866 Improve association of terms with entity (Show tree view) (kevalbhatt18 via sumasai)
......
repository/pom.xml
...@@ -156,6 +156,14 @@ ...@@ -156,6 +156,14 @@
<artifactId>hbase-server</artifactId> <artifactId>hbase-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
typesystem/pom.xml
...@@ -133,6 +133,18 @@ ...@@ -133,6 +133,18 @@
</configuration> </configuration>
</plugin> </plugin>
<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> <groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId> <artifactId>scala-maven-plugin</artifactId>
</plugin> </plugin>
......
typesystem/src/main/resources/atlas-application.properties deleted 100644 → 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
typesystem/src/test/resources/atlas-application.properties
...@@ -28,4 +28,94 @@ atlas.service=atlas ...@@ -28,4 +28,94 @@ atlas.service=atlas
#invalid system property #invalid system property
atlas.db=${atlasdb} atlas.db=${atlasdb}
atlas.TypeSystem.impl=org.apache.atlas.typesystem.types.TypeSystem atlas.TypeSystem.impl=org.apache.atlas.typesystem.types.TypeSystem
\ No newline at end of file
######### 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
webapp/pom.xml
...@@ -329,6 +329,14 @@ ...@@ -329,6 +329,14 @@
<version>3.4</version> <version>3.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId>
<version>${parent.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -478,6 +486,10 @@ ...@@ -478,6 +486,10 @@
<name>atlas.data</name> <name>atlas.data</name>
<value>${project.build.directory}/data</value> <value>${project.build.directory}/data</value>
</systemProperty> </systemProperty>
<systemProperty>
<key>atlas.conf</key>
<value>${project.build.directory}/../../typesystem/target/test-classes</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment