ATLAS-392 Rename application.properties to atlas-application.properties…

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;

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():

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

docs/src/site/twiki/Configuration.twiki

 ---+ 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

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>

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

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.

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)

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);
 

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

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);
         }
     }
 }

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

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);

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

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);