atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject incubator-atlas git commit: ATLAS-392 Rename application.properties to atlas-application.properties (rishabhbhardwaj via shwethags)
Date Tue, 22 Dec 2015 11:39:02 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 34857de8c -> cd139e501


ATLAS-392 Rename application.properties to atlas-application.properties (rishabhbhardwaj via
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/cd139e50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/cd139e50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/cd139e50

Branch: refs/heads/master
Commit: cd139e501f5502c1155d67d32d0b74d751fbd761
Parents: 34857de
Author: Shwetha GS <sshivalingamurthy@hortonworks.com>
Authored: Tue Dec 22 17:08:53 2015 +0530
Committer: Shwetha GS <sshivalingamurthy@hortonworks.com>
Committed: Tue Dec 22 17:08:53 2015 +0530

----------------------------------------------------------------------
 .../org/apache/atlas/ApplicationProperties.java |  2 +-
 distro/src/bin/atlas_start.py                   |  2 +-
 distro/src/conf/application.properties          | 84 --------------------
 distro/src/conf/atlas-application.properties    | 84 ++++++++++++++++++++
 docs/src/site/twiki/Bridge-Hive.twiki           |  2 +-
 docs/src/site/twiki/Configuration.twiki         |  2 +-
 docs/src/site/twiki/HighAvailability.twiki      |  2 +-
 docs/src/site/twiki/InstallationSteps.twiki     |  4 +-
 docs/src/site/twiki/security.twiki              |  2 +-
 release-log.txt                                 |  1 +
 .../src/main/resources/application.properties   | 80 -------------------
 .../main/resources/atlas-application.properties | 80 +++++++++++++++++++
 .../src/test/resources/application.properties   | 29 -------
 .../test/resources/atlas-application.properties | 29 +++++++
 .../web/filters/AtlasAuthenticationFilter.java  |  2 +-
 .../atlas/web/listeners/LoginProcessor.java     |  2 +-
 .../atlas/web/service/SecureEmbeddedServer.java |  2 +-
 .../MetadataAuthenticationKerberosFilterIT.java |  2 +-
 .../atlas/web/security/BaseSecurityTest.java    |  6 +-
 .../security/NegativeSSLAndKerberosTest.java    |  8 +-
 .../atlas/web/security/SSLAndKerberosTest.java  |  8 +-
 21 files changed, 220 insertions(+), 213 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/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 738ec53..9fbbc35 100644
--- a/common/src/main/java/org/apache/atlas/ApplicationProperties.java
+++ b/common/src/main/java/org/apache/atlas/ApplicationProperties.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
 public class ApplicationProperties extends PropertiesConfiguration {
     private static final Logger LOG = LoggerFactory.getLogger(ApplicationProperties.class);
 
-    public static final String APPLICATION_PROPERTIES = "application.properties";
+    public static final String APPLICATION_PROPERTIES = "atlas-application.properties";
     public static final String CLIENT_PROPERTIES = "client.properties";
 
     private static Configuration INSTANCE = null;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/distro/src/bin/atlas_start.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py
index 352494a..cd9669b 100755
--- a/distro/src/bin/atlas_start.py
+++ b/distro/src/bin/atlas_start.py
@@ -25,7 +25,7 @@ ATLAS_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=application.log"
 ATLAS_COMMAND_OPTS="-Datlas.home=%s"
 ATLAS_CONFIG_OPTS="-Datlas.conf=%s"
 DEFAULT_JVM_OPTS="-Xmx1024m -XX:MaxPermSize=512m -Dlog4j.configuration=atlas-log4j.xml"
-CONF_FILE="application.properties"
+CONF_FILE="atlas-application.properties"
 HBASE_STORAGE_CONF_ENTRY="atlas.graph.storage.backend\s*=\s*hbase"
 
 def main():

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/distro/src/conf/application.properties
----------------------------------------------------------------------
diff --git a/distro/src/conf/application.properties b/distro/src/conf/application.properties
deleted file mode 100755
index cb6ee31..0000000
--- a/distro/src/conf/application.properties
+++ /dev/null
@@ -1,84 +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.
-#
-
-#########  Graph Database Configs  #########
-# Graph Storage
-atlas.graph.storage.backend=berkeleyje
-atlas.graph.storage.directory=${sys:atlas.home}/data/berkley
-
-#Hbase as stoarge backend
-#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=localhost
-atlas.graph.storage.hbase.regions-per-server=1
-atlas.graph.storage.lock.wait-time=10000
-
-#Solr
-#atlas.graph.index.search.backend=solr
-
-# Solr cloud mode properties
-#atlas.graph.index.search.solr.mode=cloud
-#atlas.graph.index.search.solr.zookeeper-url=localhost:2181
-
-#Solr http mode properties
-#atlas.graph.index.search.solr.mode=http
-#atlas.graph.index.search.solr.http-urls=http://localhost:8983/solr
-
-# Graph Search Index
-#ElasticSearch
-atlas.graph.index.search.backend=elasticsearch
-atlas.graph.index.search.directory=${sys:atlas.home}/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
-
-
-#########  Notification Configs  #########
-atlas.notification.embedded=true
-atlas.kafka.data=${sys:atlas.home}/data/kafka
-atlas.kafka.zookeeper.connect=localhost:9026
-atlas.kafka.bootstrap.servers=localhost:9027
-atlas.kafka.zookeeper.session.timeout.ms=400
-atlas.kafka.zookeeper.sync.time.ms=20
-atlas.kafka.auto.commit.interval.ms=1000
-atlas.kafka.auto.offset.reset=smallest
-atlas.kafka.hook.group.id=atlas
-
-
-#########  Hive Lineage Configs  #########
-# This models reflects the base super types for Data and Process
-#atlas.lineage.hive.table.type.name=DataSet
-#atlas.lineage.hive.process.type.name=Process
-#atlas.lineage.hive.process.inputs.name=inputs
-#atlas.lineage.hive.process.outputs.name=outputs
-
-## Schema
-atlas.lineage.hive.table.schema.query.hive_table=hive_table where name='%s'\, columns
-atlas.lineage.hive.table.schema.query.Table=Table where name='%s'\, columns
-
-## Server port configuration
-#atlas.server.http.port=21000
-#atlas.server.https.port=21443
-
-#########  Security Properties  #########
-
-# SSL config
-atlas.enableTLS=false
-
-atlas.rest.address=http://localhost:21000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/distro/src/conf/atlas-application.properties
----------------------------------------------------------------------
diff --git a/distro/src/conf/atlas-application.properties b/distro/src/conf/atlas-application.properties
new file mode 100755
index 0000000..cb6ee31
--- /dev/null
+++ b/distro/src/conf/atlas-application.properties
@@ -0,0 +1,84 @@
+#
+# 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.
+#
+
+#########  Graph Database Configs  #########
+# Graph Storage
+atlas.graph.storage.backend=berkeleyje
+atlas.graph.storage.directory=${sys:atlas.home}/data/berkley
+
+#Hbase as stoarge backend
+#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=localhost
+atlas.graph.storage.hbase.regions-per-server=1
+atlas.graph.storage.lock.wait-time=10000
+
+#Solr
+#atlas.graph.index.search.backend=solr
+
+# Solr cloud mode properties
+#atlas.graph.index.search.solr.mode=cloud
+#atlas.graph.index.search.solr.zookeeper-url=localhost:2181
+
+#Solr http mode properties
+#atlas.graph.index.search.solr.mode=http
+#atlas.graph.index.search.solr.http-urls=http://localhost:8983/solr
+
+# Graph Search Index
+#ElasticSearch
+atlas.graph.index.search.backend=elasticsearch
+atlas.graph.index.search.directory=${sys:atlas.home}/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
+
+
+#########  Notification Configs  #########
+atlas.notification.embedded=true
+atlas.kafka.data=${sys:atlas.home}/data/kafka
+atlas.kafka.zookeeper.connect=localhost:9026
+atlas.kafka.bootstrap.servers=localhost:9027
+atlas.kafka.zookeeper.session.timeout.ms=400
+atlas.kafka.zookeeper.sync.time.ms=20
+atlas.kafka.auto.commit.interval.ms=1000
+atlas.kafka.auto.offset.reset=smallest
+atlas.kafka.hook.group.id=atlas
+
+
+#########  Hive Lineage Configs  #########
+# This models reflects the base super types for Data and Process
+#atlas.lineage.hive.table.type.name=DataSet
+#atlas.lineage.hive.process.type.name=Process
+#atlas.lineage.hive.process.inputs.name=inputs
+#atlas.lineage.hive.process.outputs.name=outputs
+
+## Schema
+atlas.lineage.hive.table.schema.query.hive_table=hive_table where name='%s'\, columns
+atlas.lineage.hive.table.schema.query.Table=Table where name='%s'\, columns
+
+## Server port configuration
+#atlas.server.http.port=21000
+#atlas.server.https.port=21443
+
+#########  Security Properties  #########
+
+# SSL config
+atlas.enableTLS=false
+
+atlas.rest.address=http://localhost:21000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/docs/src/site/twiki/Bridge-Hive.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Bridge-Hive.twiki b/docs/src/site/twiki/Bridge-Hive.twiki
index 7a80e37..e3b03fa 100644
--- a/docs/src/site/twiki/Bridge-Hive.twiki
+++ b/docs/src/site/twiki/Bridge-Hive.twiki
@@ -64,7 +64,7 @@ Follow these instructions in your hive set-up to add hive hook for Atlas:
     </property>
   </verbatim>
    * Add 'export HIVE_AUX_JARS_PATH=<atlas package>/hook/hive' in hive-env.sh of your
hive configuration
-   * Copy <atlas-conf>/client.properties and <atlas-conf>/application.properties
to the hive conf directory.
+   * Copy <atlas-conf>/client.properties and <atlas-conf>/atlas-application.properties
to the hive conf directory.
 
 The following properties in <atlas-conf>/client.properties control the thread pool
and notification details:
    * atlas.hook.hive.synchronous - boolean, true to run the hook synchronously. default false

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/docs/src/site/twiki/Configuration.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Configuration.twiki b/docs/src/site/twiki/Configuration.twiki
index 8b942ab..5fa5f5b 100644
--- a/docs/src/site/twiki/Configuration.twiki
+++ b/docs/src/site/twiki/Configuration.twiki
@@ -1,6 +1,6 @@
 ---+ Configuring Apache Atlas - Application Properties
 
-All configuration in Atlas uses java properties style configuration. The main configuration
file is application.properties which is in the *conf* dir at the deployed location. It consists
of the following sections:
+All configuration in Atlas uses java properties style configuration. The main configuration
file is atlas-application.properties which is in the *conf* dir at the deployed location.
It consists of the following sections:
 
 
 ---++ Graph Configs

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/docs/src/site/twiki/HighAvailability.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/HighAvailability.twiki b/docs/src/site/twiki/HighAvailability.twiki
index dac1644..856e0ab 100644
--- a/docs/src/site/twiki/HighAvailability.twiki
+++ b/docs/src/site/twiki/HighAvailability.twiki
@@ -76,7 +76,7 @@ to configure Atlas to use Kafka in HA mode, do the following:
       $KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper <list of zookeeper host:port
entries> --topic ATLAS_ENTITIES --replication-factor <numReplicas> --partitions 1
       Here KAFKA_HOME points to the Kafka installation directory.
       </verbatim>
-   * In application.properties, set the following configuration:
+   * In atlas-application.properties, set the following configuration:
      <verbatim>
      atlas.notification.embedded=false
      atlas.kafka.zookeeper.connect=<comma separated list of servers forming Zookeeper
quorum used by Kafka>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 86b3e0a..3f186cc 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -31,7 +31,7 @@ Tar is structured as follows
    |- quick_start.py
    |- cputil.py
 |- conf
-   |- application.properties
+   |- atlas-application.properties
    |- client.properties
    |- atlas-env.sh
    |- log4j.xml
@@ -167,7 +167,7 @@ For configuring Titan to work with Solr, please follow the instructions
below
 
   The number of replicas (replicationFactor) can be set according to the redundancy required.
 
-   * Change ATLAS configuration to point to the Solr instance setup. Please make sure the
following configurations are set to the below values in ATLAS_HOME//conf/application.properties
+   * Change ATLAS configuration to point to the Solr instance setup. Please make sure the
following configurations are set to the below values in ATLAS_HOME/conf/atlas-application.properties
 <verbatim>
  atlas.graph.index.search.backend=solr5
  atlas.graph.index.search.solr.mode=cloud

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/docs/src/site/twiki/security.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/security.twiki b/docs/src/site/twiki/security.twiki
index a4eb096..fc61402 100755
--- a/docs/src/site/twiki/security.twiki
+++ b/docs/src/site/twiki/security.twiki
@@ -10,7 +10,7 @@ The following features are available for enhancing the security of the platform:
 
 ---+++ SSL
 
-Both SSL one-way (server authentication) and two-way (server and client authentication) are
supported.  The following application properties (properties configured in the application.properties
file) are available for configuring SSL:
+Both SSL one-way (server authentication) and two-way (server and client authentication) are
supported.  The following application properties (properties configured in the atlas-application.properties
file) are available for configuring SSL:
 
    * <code>atlas.enableTLS</code> (false|true) [default: false] - enable/disable
the SSL listener
    * <code>keystore.file</code> - the path to the keystore file leveraged by
the server.  This file contains the server certificate.

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 6997c0b..afa428b 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -5,6 +5,7 @@ Apache Atlas Release Notes
 INCOMPATIBLE CHANGES:
 
 ALL CHANGES:
+ATLAS-392 Rename application.properties to atlas-application.properties (rishabhbhardwaj
via shwethags)
 ATLAS-381 HiveMetaStoreBridge will not connect to a kerberized hive metastore (dossett@gmail.com
via shwethags)
 ATLAS-20 Rename env variables from METADATA to ATLAS (rishabhbhardwaj via shwethags)
 ATLAS-360 Secure cluster Atlas-solr integration instructions (tbeerbower via shwethags)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/typesystem/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/typesystem/src/main/resources/application.properties b/typesystem/src/main/resources/application.properties
deleted file mode 100644
index 702c6f2..0000000
--- a/typesystem/src/main/resources/application.properties
+++ /dev/null
@@ -1,80 +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}
-
-# 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  #########
-# This models reflects the base super types for Data and Process
-#atlas.lineage.hive.table.type.name=DataSet
-#atlas.lineage.hive.process.type.name=Process
-#atlas.lineage.hive.process.inputs.name=inputs
-#atlas.lineage.hive.process.outputs.name=outputs
-
-## Schema
-atlas.lineage.hive.table.schema.query.hive_table=hive_table where name='%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=400
-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
-
-#########  Security Properties  #########
-
-# SSL config
-atlas.enableTLS=false
-atlas.server.https.port=31443
-
-#########  Security Properties  #########

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/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
new file mode 100644
index 0000000..702c6f2
--- /dev/null
+++ b/typesystem/src/main/resources/atlas-application.properties
@@ -0,0 +1,80 @@
+#
+# 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}
+
+# 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  #########
+# This models reflects the base super types for Data and Process
+#atlas.lineage.hive.table.type.name=DataSet
+#atlas.lineage.hive.process.type.name=Process
+#atlas.lineage.hive.process.inputs.name=inputs
+#atlas.lineage.hive.process.outputs.name=outputs
+
+## Schema
+atlas.lineage.hive.table.schema.query.hive_table=hive_table where name='%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=400
+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
+
+#########  Security Properties  #########
+
+# SSL config
+atlas.enableTLS=false
+atlas.server.https.port=31443
+
+#########  Security Properties  #########

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/typesystem/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/typesystem/src/test/resources/application.properties b/typesystem/src/test/resources/application.properties
deleted file mode 100644
index dbd6002..0000000
--- a/typesystem/src/test/resources/application.properties
+++ /dev/null
@@ -1,29 +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.
-#
-
-#system property
-atlas.data=/var/data/${sys:user.name}/atlas
-
-#re-use existing property
-atlas.graph.data=${atlas.data}/graph
-
-#plain property
-atlas.service=atlas
-
-#invalid system property
-atlas.db=${atlasdb}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/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
new file mode 100644
index 0000000..dbd6002
--- /dev/null
+++ b/typesystem/src/test/resources/atlas-application.properties
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+#system property
+atlas.data=/var/data/${sys:user.name}/atlas
+
+#re-use existing property
+atlas.graph.data=${atlas.data}/graph
+
+#plain property
+atlas.service=atlas
+
+#invalid system property
+atlas.db=${atlasdb}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
index ba04da2..ae37314 100644
--- a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
+++ b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
@@ -56,7 +56,7 @@ public class AtlasAuthenticationFilter extends AuthenticationFilter {
             throw new ServletException(e);
         }
 
-        // transfer application.properties config items starting with defined prefix
+        // transfer atlas-application.properties config items starting with defined prefix
         Configuration subConfiguration = ApplicationProperties.getSubsetConfiguration(configuration,
PREFIX);
         Properties config = ConfigurationConverter.getProperties(subConfiguration);
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java b/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java
index e193b30..b7943e7 100644
--- a/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java
+++ b/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java
@@ -44,7 +44,7 @@ public class LoginProcessor {
 
     /**
      * Perform a SIMPLE login based on established OS identity or a kerberos based login
using the configured
-     * principal and keytab (via application.properties).
+     * principal and keytab (via atlas-application.properties).
      */
     public void login() {
         // first, let's see if we're running in a hadoop cluster and have the env configured

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
index 3e6ec26..8a3faff 100755
--- a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
+++ b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
@@ -135,7 +135,7 @@ public class SecureEmbeddedServer extends EmbeddedServer {
         try {
             return ApplicationProperties.get();
         } catch (AtlasException e) {
-            throw new RuntimeException("Unable to load configuration: application.properties");
+            throw new RuntimeException("Unable to load configuration: " + ApplicationProperties.APPLICATION_PROPERTIES);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationKerberosFilterIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationKerberosFilterIT.java
b/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationKerberosFilterIT.java
index 7bce1cb..a658497 100644
--- a/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationKerberosFilterIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationKerberosFilterIT.java
@@ -70,7 +70,7 @@ public class MetadataAuthenticationKerberosFilterIT extends BaseSecurityTest
{
         TestEmbeddedServer server = null;
 
         try {
-            // setup the application.properties file
+            // setup the atlas-application.properties file
             generateKerberosTestProperties();
 
             // need to create the web application programmatically in order to control the
injection of the test

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java b/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java
index b681fea..8909e89 100644
--- a/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.atlas.web.security;
 
+import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.web.TestUtils;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
@@ -49,11 +50,12 @@ public class BaseSecurityTest {
 
     protected void generateTestProperties(Properties props) throws ConfigurationException,
IOException {
         PropertiesConfiguration config =
-                new PropertiesConfiguration(System.getProperty("user.dir") + "/../src/conf/application.properties");
+                new PropertiesConfiguration(System.getProperty("user.dir") +
+                  "/../src/conf/" + ApplicationProperties.APPLICATION_PROPERTIES);
         for (String propName : props.stringPropertyNames()) {
             config.setProperty(propName, props.getProperty(propName));
         }
-        File file = new File(System.getProperty("user.dir"), "application.properties");
+        File file = new File(System.getProperty("user.dir"), ApplicationProperties.APPLICATION_PROPERTIES);
         file.deleteOnExit();
         Writer fileWriter = new FileWriter(file);
         config.save(fileWriter);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
index 1182fd3..6fc43c9 100755
--- a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.atlas.web.security;
 
+import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.AtlasClient;
 import org.apache.atlas.AtlasException;
 import org.apache.atlas.web.TestUtils;
@@ -65,9 +66,9 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest {
         String confLocation = System.getProperty("atlas.conf");
         URL url;
         if (confLocation == null) {
-            url = NegativeSSLAndKerberosTest.class.getResource("/application.properties");
+            url = NegativeSSLAndKerberosTest.class.getResource("/" + ApplicationProperties.APPLICATION_PROPERTIES);
         } else {
-            url = new File(confLocation, "application.properties").toURI().toURL();
+            url = new File(confLocation, ApplicationProperties.APPLICATION_PROPERTIES).toURI().toURL();
         }
         configuration.load(url);
 
@@ -78,7 +79,8 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest {
         configuration.setProperty("atlas.http.authentication.kerberos.name.rules",
                 "RULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//\nDEFAULT");
 
-        TestUtils.writeConfiguration(configuration, persistDir + File.separator + "application.properties");
+        TestUtils.writeConfiguration(configuration, persistDir + File.separator +
+                ApplicationProperties.APPLICATION_PROPERTIES);
 
         dgiClient = new AtlasClient(DGI_URL) {
             @Override

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cd139e50/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
index f402a20..90b6a14 100755
--- a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.atlas.web.security;
 
+import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.AtlasClient;
 import org.apache.atlas.AtlasException;
 import org.apache.atlas.web.TestUtils;
@@ -74,9 +75,9 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
         String confLocation = System.getProperty("atlas.conf");
         URL url;
         if (confLocation == null) {
-            url = SSLAndKerberosTest.class.getResource("/application.properties");
+            url = SSLAndKerberosTest.class.getResource("/" + ApplicationProperties.APPLICATION_PROPERTIES);
         } else {
-            url = new File(confLocation, "application.properties").toURI().toURL();
+            url = new File(confLocation, ApplicationProperties.APPLICATION_PROPERTIES).toURI().toURL();
         }
         configuration.load(url);
         configuration.setProperty(TLS_ENABLED, true);
@@ -86,7 +87,8 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
         configuration.setProperty("atlas.http.authentication.kerberos.name.rules",
                 "RULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//\nDEFAULT");
 
-        TestUtils.writeConfiguration(configuration, persistDir + File.separator + "application.properties");
+        TestUtils.writeConfiguration(configuration, persistDir + File.separator +
+          "atlas-application.properties");
 
         subject = loginTestUser();
         UserGroupInformation.loginUserFromSubject(subject);


Mime
View raw message