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 2015/12/22 11:55:35 UTC
incubator-atlas git commit: ATLAS-20 Rename env variables from
METADATA to ATLAS (rishabhbhardwaj via shwethags)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 611ac3028 -> be6971f2d
ATLAS-20 Rename env variables from METADATA to ATLAS (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/be6971f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/be6971f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/be6971f2
Branch: refs/heads/master
Commit: be6971f2dc82c90761635dda197d7819729311d9
Parents: 611ac30
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Dec 22 16:10:23 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Dec 22 16:10:23 2015 +0530
----------------------------------------------------------------------
addons/hive-bridge/src/bin/import-hive.sh | 29 +++---
.../java/org/apache/atlas/AtlasException.java | 2 +-
distro/src/bin/atlas_config.py | 38 ++++----
distro/src/bin/atlas_start.py | 42 ++++-----
distro/src/bin/atlas_stop.py | 18 ++--
distro/src/bin/cputil.py | 20 ++---
distro/src/bin/quick_start.py | 28 +++---
distro/src/conf/atlas-env.sh | 20 ++---
distro/src/test/python/scripts/TestMetadata.py | 22 ++---
docs/src/site/twiki/InstallationSteps.twiki | 30 +++----
docs/src/site/twiki/Search.twiki | 3 +-
docs/src/site/twiki/security.twiki | 2 +-
release-log.txt | 1 +
typesystem/doc/IDataType.uml | 92 ++++++++++----------
typesystem/doc/Instance.uml | 52 +++++------
.../atlas/web/listeners/LoginProcessor.java | 8 +-
.../MetadataAuthenticationKerberosFilterIT.java | 8 +-
.../MetadataAuthenticationSimpleFilterIT.java | 8 +-
18 files changed, 213 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/addons/hive-bridge/src/bin/import-hive.sh
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh
index 21b84f7..8df94f2 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -31,13 +31,13 @@ done
BASEDIR=`dirname ${PRG}`
BASEDIR=`cd ${BASEDIR}/..;pwd`
-if [ -z "$METADATA_CONF" ]; then
- METADATA_CONF=${BASEDIR}/conf
+if [ -z "$ATLAS_CONF" ]; then
+ ATLAS_CONF=${BASEDIR}/conf
fi
-export METADATA_CONF
+export ATLAS_CONF
-if [ -f "${METADATA_CONF}/atlas-env.sh" ]; then
- . "${METADATA_CONF}/atlas-env.sh"
+if [ -f "${ATLAS_CONF}/atlas-env.sh" ]; then
+ . "${ATLAS_CONF}/atlas-env.sh"
fi
if test -z "${JAVA_HOME}"
@@ -57,20 +57,20 @@ fi
# Construct classpath using Atlas conf directory
# and jars from bridge/hive and hook/hive directories.
-METADATACPPATH="$METADATA_CONF"
+ATLASCPPATH="$ATLAS_CONF"
for i in "${BASEDIR}/bridge/hive/"*.jar; do
- METADATACPPATH="${METADATACPPATH}:$i"
+ ATLASCPPATH="${ATLASCPPATH}:$i"
done
for i in "${BASEDIR}/hook/hive/"*.jar; do
- METADATACPPATH="${METADATACPPATH}:$i"
+ ATLASCPPATH="${ATLASCPPATH}:$i"
done
# log dir for applications
-METADATA_LOG_DIR="${METADATA_LOG_DIR:-$BASEDIR/logs}"
-export METADATA_LOG_DIR
-LOGFILE="$METADATA_LOG_DIR/import-hive.log"
+ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-$BASEDIR/logs}"
+export ATLAS_LOG_DIR
+LOGFILE="$ATLAS_LOG_DIR/import-hive.log"
TIME=`date +%Y%m%d%H%M%s`
@@ -87,18 +87,19 @@ else
fi
export HIVE_CP
-CP="${HIVE_CP}:${METADATACPPATH}"
+CP="${HIVE_CP}:${ATLASCPPATH}"
# If running in cygwin, convert pathnames and classpath to Windows format.
if [ "${CYGWIN}" == "true" ]
then
- METADATA_LOG_DIR=`cygpath -w ${METADATA_LOG_DIR}`
+ ATLAS_LOG_DIR=`cygpath -w ${ATLAS_LOG_DIR}`
LOGFILE=`cygpath -w ${LOGFILE}`
HIVE_CP=`cygpath -w ${HIVE_CP}`
CP=`cygpath -w -p ${CP}`
fi
-JAVA_PROPERTIES="$METADATA_OPTS -Datlas.log.dir=$METADATA_LOG_DIR -Datlas.log.file=import-hive.log -Dlog4j.configuration=atlas-log4j.xml"
+JAVA_PROPERTIES="$ATLAS_OPTS -Datlas.log.dir=$ATLAS_LOG_DIR -Datlas.log.file=import-hive.log
+-Dlog4j.configuration=atlas-log4j.xml"
shift
while [[ ${1} =~ ^\-D ]]; do
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/common/src/main/java/org/apache/atlas/AtlasException.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/atlas/AtlasException.java b/common/src/main/java/org/apache/atlas/AtlasException.java
index 2eb0658..9340af0 100644
--- a/common/src/main/java/org/apache/atlas/AtlasException.java
+++ b/common/src/main/java/org/apache/atlas/AtlasException.java
@@ -19,7 +19,7 @@
package org.apache.atlas;
/**
- * Base Exception class for metadata API.
+ * Base Exception class for Atlas API.
*/
public class AtlasException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/bin/atlas_config.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py
index 5326d5d..0723b3d 100755
--- a/distro/src/bin/atlas_config.py
+++ b/distro/src/bin/atlas_config.py
@@ -32,14 +32,14 @@ CONF = "conf"
LOG="logs"
WEBAPP="server" + os.sep + "webapp"
DATA="data"
-ENV_KEYS = ["JAVA_HOME", "METADATA_OPTS", "METADATA_LOG_DIR", "METADATA_PID_DIR", "METADATA_CONF", "METADATACPPATH", "METADATA_DATA_DIR", "METADATA_HOME_DIR", "METADATA_EXPANDED_WEBAPP_DIR", "HBASE_CONF_DIR"]
-METADATA_CONF = "METADATA_CONF"
-METADATA_LOG = "METADATA_LOG_DIR"
-METADATA_PID = "METADATA_PID_DIR"
-METADATA_WEBAPP = "METADATA_EXPANDED_WEBAPP_DIR"
-METADATA_OPTS = "METADATA_OPTS"
-METADATA_DATA = "METADATA_DATA_DIR"
-METADATA_HOME = "METADATA_HOME_DIR"
+ENV_KEYS = ["JAVA_HOME", "ATLAS_OPTS", "ATLAS_LOG_DIR", "ATLAS_PID_DIR", "ATLAS_CONF", "ATLASCPPATH", "ATLAS_DATA_DIR", "ATLAS_HOME_DIR", "ATLAS_EXPANDED_WEBAPP_DIR", "HBASE_CONF_DIR"]
+ATLAS_CONF = "ATLAS_CONF"
+ATLAS_LOG = "ATLAS_LOG_DIR"
+ATLAS_PID = "ATLAS_PID_DIR"
+ATLAS_WEBAPP = "ATLAS_EXPANDED_WEBAPP_DIR"
+ATLAS_OPTS = "ATLAS_OPTS"
+ATLAS_DATA = "ATLAS_DATA_DIR"
+ATLAS_HOME = "ATLAS_HOME_DIR"
HBASE_CONF_DIR = "HBASE_CONF_DIR"
IS_WINDOWS = platform.system() == "Windows"
ON_POSIX = 'posix' in sys.builtin_module_names
@@ -51,16 +51,16 @@ def scriptDir():
"""
return os.path.dirname(os.path.realpath(__file__))
-def metadataDir():
+def atlasDir():
home = os.path.dirname(scriptDir())
- return os.environ.get(METADATA_HOME, home)
+ return os.environ.get(ATLAS_HOME, home)
def libDir(dir) :
return os.path.join(dir, LIB)
def confDir(dir):
localconf = os.path.join(dir, CONF)
- return os.environ.get(METADATA_CONF, localconf)
+ return os.environ.get(ATLAS_CONF, localconf)
def hbaseConfDir(atlasConfDir):
parentDir = os.path.dirname(atlasConfDir)
@@ -68,19 +68,19 @@ def hbaseConfDir(atlasConfDir):
def logDir(dir):
localLog = os.path.join(dir, LOG)
- return os.environ.get(METADATA_LOG, localLog)
+ return os.environ.get(ATLAS_LOG, localLog)
def pidFile(dir):
localPid = os.path.join(dir, LOG)
- return os.path.join(os.environ.get(METADATA_PID, localPid), 'atlas.pid')
+ return os.path.join(os.environ.get(ATLAS_PID, localPid), 'atlas.pid')
def dataDir(dir):
data = os.path.join(dir, DATA)
- return os.environ.get(METADATA_DATA, data)
+ return os.environ.get(ATLAS_DATA, data)
def webAppDir(dir):
webapp = os.path.join(dir, WEBAPP)
- return os.environ.get(METADATA_WEBAPP, webapp)
+ return os.environ.get(ATLAS_WEBAPP, webapp)
def expandWebApp(dir):
webappDir = webAppDir(dir)
@@ -94,7 +94,7 @@ def expandWebApp(dir):
raise e
pass
os.chdir(webAppMetadataDir)
- jar(os.path.join(metadataDir(), "server", "webapp", "atlas.war"))
+ jar(os.path.join(atlasDir(), "server", "webapp", "atlas.war"))
def dirMustExist(dirname):
if not os.path.exists(dirname):
@@ -176,7 +176,7 @@ def runProcess(commandline, logdir=None):
"""
global finished
debug ("Executing : %s" % commandline)
- timestr = time.strftime("metadata.%Y%m%d-%H%M%S")
+ timestr = time.strftime("atlas.%Y%m%d-%H%M%S")
stdoutFile = None
stderrFile = None
if logdir:
@@ -290,8 +290,8 @@ def read(pipe, line):
else:
return line, False
-def writePid(metadata_pid_file, process):
- f = open(metadata_pid_file, 'w')
+def writePid(atlas_pid_file, process):
+ f = open(atlas_pid_file, 'w')
f.write(str(process.pid))
f.close()
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/bin/atlas_start.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py
index fc5860e..352494a 100755
--- a/distro/src/bin/atlas_start.py
+++ b/distro/src/bin/atlas_start.py
@@ -21,60 +21,60 @@ import traceback
import atlas_config as mc
-METADATA_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=application.log"
-METADATA_COMMAND_OPTS="-Datlas.home=%s"
-METADATA_CONFIG_OPTS="-Datlas.conf=%s"
+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"
HBASE_STORAGE_CONF_ENTRY="atlas.graph.storage.backend\s*=\s*hbase"
def main():
- metadata_home = mc.metadataDir()
- confdir = mc.dirMustExist(mc.confDir(metadata_home))
+ atlas_home = mc.atlasDir()
+ confdir = mc.dirMustExist(mc.confDir(atlas_home))
mc.executeEnvSh(confdir)
- logdir = mc.dirMustExist(mc.logDir(metadata_home))
+ logdir = mc.dirMustExist(mc.logDir(atlas_home))
#create sys property for conf dirs
- jvm_opts_list = (METADATA_LOG_OPTS % logdir).split()
+ jvm_opts_list = (ATLAS_LOG_OPTS % logdir).split()
- cmd_opts = (METADATA_COMMAND_OPTS % metadata_home)
+ cmd_opts = (ATLAS_COMMAND_OPTS % atlas_home)
jvm_opts_list.extend(cmd_opts.split())
- config_opts = (METADATA_CONFIG_OPTS % confdir)
+ config_opts = (ATLAS_CONFIG_OPTS % confdir)
jvm_opts_list.extend(config_opts.split())
default_jvm_opts = DEFAULT_JVM_OPTS
- metadata_jvm_opts = os.environ.get(mc.METADATA_OPTS, default_jvm_opts)
- jvm_opts_list.extend(metadata_jvm_opts.split())
+ atlas_jvm_opts = os.environ.get(mc.ATLAS_OPTS, default_jvm_opts)
+ jvm_opts_list.extend(atlas_jvm_opts.split())
#expand web app dir
- web_app_dir = mc.webAppDir(metadata_home)
- mc.expandWebApp(metadata_home)
+ web_app_dir = mc.webAppDir(atlas_home)
+ mc.expandWebApp(atlas_home)
#add hbase-site.xml to classpath
hbase_conf_dir = mc.hbaseConfDir(confdir)
p = os.pathsep
- metadata_classpath = confdir + p \
+ atlas_classpath = confdir + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "classes" ) + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "atlas-titan-${project.version}.jar" ) + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "*" ) + p \
- + os.path.join(metadata_home, "libext", "*")
+ + os.path.join(atlas_home, "libext", "*")
if os.path.exists(hbase_conf_dir):
- metadata_classpath = metadata_classpath + p \
+ atlas_classpath = atlas_classpath + p \
+ hbase_conf_dir
else:
storage_backend = mc.grep(os.path.join(confdir, CONF_FILE), HBASE_STORAGE_CONF_ENTRY)
if storage_backend != None:
raise Exception("Could not find hbase-site.xml in %s. Please set env var HBASE_CONF_DIR to the hbase client conf dir", hbase_conf_dir)
- metadata_pid_file = mc.pidFile(metadata_home)
+ atlas_pid_file = mc.pidFile(atlas_home)
- if os.path.isfile(metadata_pid_file):
+ if os.path.isfile(atlas_pid_file):
#Check if process listed in atlas.pid file is still running
- pf = file(metadata_pid_file, 'r')
+ pf = file(atlas_pid_file, 'r')
pid = pf.read().strip()
pf.close()
@@ -103,8 +103,8 @@ def main():
args = ["-app", os.path.join(web_app_dir, "atlas")]
args.extend(sys.argv[1:])
- process = mc.java("org.apache.atlas.Atlas", args, metadata_classpath, jvm_opts_list, logdir)
- mc.writePid(metadata_pid_file, process)
+ process = mc.java("org.apache.atlas.Atlas", args, atlas_classpath, jvm_opts_list, logdir)
+ mc.writePid(atlas_pid_file, process)
print "Apache Atlas Server started!!!\n"
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/bin/atlas_stop.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/atlas_stop.py b/distro/src/bin/atlas_stop.py
index 574f555..c189707 100755
--- a/distro/src/bin/atlas_stop.py
+++ b/distro/src/bin/atlas_stop.py
@@ -24,15 +24,15 @@ import atlas_config as mc
def main():
- metadata_home = mc.metadataDir()
- confdir = mc.dirMustExist(mc.confDir(metadata_home))
+ atlas_home = mc.atlasDir()
+ confdir = mc.dirMustExist(mc.confDir(atlas_home))
mc.executeEnvSh(confdir)
- piddir = mc.dirMustExist(mc.logDir(metadata_home))
+ piddir = mc.dirMustExist(mc.logDir(atlas_home))
- metadata_pid_file = mc.pidFile(metadata_home)
+ atlas_pid_file = mc.pidFile(atlas_home)
try:
- pf = file(metadata_pid_file, 'r')
+ pf = file(atlas_pid_file, 'r')
pid = int(pf.read().strip())
pf.close()
except:
@@ -44,20 +44,20 @@ def main():
if not mc.unix_exist_pid(pid):
sys.stderr.write("Server no longer running with pid %s\nImproper shutdown?\npid file deleted.\n" %pid)
- os.remove(metadata_pid_file)
+ os.remove(atlas_pid_file)
return
else:
if mc.IS_WINDOWS:
if not mc.win_exist_pid((str)(pid)):
sys.stderr.write("Server no longer running with pid %s\nImproper shutdown?\npid file deleted.\n" %pid)
- os.remove(metadata_pid_file)
+ os.remove(atlas_pid_file)
return
os.kill(pid, SIGTERM)
# assuming kill worked since process check on windows is more involved...
- if os.path.exists(metadata_pid_file):
- os.remove(metadata_pid_file)
+ if os.path.exists(atlas_pid_file):
+ os.remove(atlas_pid_file)
if __name__ == '__main__':
try:
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/bin/cputil.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/cputil.py b/distro/src/bin/cputil.py
index 3b2d96c..98a9dc3 100755
--- a/distro/src/bin/cputil.py
+++ b/distro/src/bin/cputil.py
@@ -24,28 +24,28 @@ DEFAULT_JVM_OPTS="-Xmx1024m"
def main():
- metadata_home = mc.metadataDir()
- confdir = mc.dirMustExist(mc.confDir(metadata_home))
- logdir = mc.dirMustExist(mc.logDir(metadata_home))
+ atlas_home = mc.atlasDir()
+ confdir = mc.dirMustExist(mc.confDir(atlas_home))
+ logdir = mc.dirMustExist(mc.logDir(atlas_home))
mc.executeEnvSh(confdir)
jvm_opts_list = []
default_jvm_opts = DEFAULT_JVM_OPTS
- metadata_jvm_opts = os.environ.get(mc.METADATA_OPTS, default_jvm_opts)
- jvm_opts_list.extend(metadata_jvm_opts.split())
+ atlas_jvm_opts = os.environ.get(mc.ATLAS_OPTS, default_jvm_opts)
+ jvm_opts_list.extend(atlas_jvm_opts.split())
#expand web app dir
- web_app_dir = mc.webAppDir(metadata_home)
- mc.expandWebApp(metadata_home)
+ web_app_dir = mc.webAppDir(atlas_home)
+ mc.expandWebApp(atlas_home)
p = os.pathsep
- metadata_classpath = confdir + p \
+ atlas_classpath = confdir + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "classes" ) + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "*" ) + p \
- + os.path.join(metadata_home, "libext", "*")
+ + os.path.join(atlas_home, "libext", "*")
- process = mc.java("org.apache.atlas.util.CredentialProviderUtility", sys.argv[1:], metadata_classpath, jvm_opts_list)
+ process = mc.java("org.apache.atlas.util.CredentialProviderUtility", sys.argv[1:], atlas_classpath, jvm_opts_list)
process.wait()
if __name__ == '__main__':
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/bin/quick_start.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/quick_start.py b/distro/src/bin/quick_start.py
index e30ba3d..b96115b 100755
--- a/distro/src/bin/quick_start.py
+++ b/distro/src/bin/quick_start.py
@@ -20,38 +20,38 @@ import sys
import atlas_config as mc
-METADATA_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=quick_start.log"
-METADATA_COMMAND_OPTS="-Dmetadata.home=%s"
+ATLAS_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=quick_start.log"
+ATLAS_COMMAND_OPTS="-Datlas.home=%s"
DEFAULT_JVM_OPTS="-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml"
def main():
- metadata_home = mc.metadataDir()
- confdir = mc.dirMustExist(mc.confDir(metadata_home))
+ atlas_home = mc.atlasDir()
+ confdir = mc.dirMustExist(mc.confDir(atlas_home))
mc.executeEnvSh(confdir)
- logdir = mc.dirMustExist(mc.logDir(metadata_home))
+ logdir = mc.dirMustExist(mc.logDir(atlas_home))
#create sys property for conf dirs
- jvm_opts_list = (METADATA_LOG_OPTS % logdir).split()
+ jvm_opts_list = (ATLAS_LOG_OPTS % logdir).split()
- cmd_opts = (METADATA_COMMAND_OPTS % metadata_home)
+ cmd_opts = (ATLAS_COMMAND_OPTS % atlas_home)
jvm_opts_list.extend(cmd_opts.split())
default_jvm_opts = DEFAULT_JVM_OPTS
- metadata_jvm_opts = os.environ.get(mc.METADATA_OPTS, default_jvm_opts)
- jvm_opts_list.extend(metadata_jvm_opts.split())
+ atlas_jvm_opts = os.environ.get(mc.ATLAS_OPTS, default_jvm_opts)
+ jvm_opts_list.extend(atlas_jvm_opts.split())
#expand web app dir
- web_app_dir = mc.webAppDir(metadata_home)
- mc.expandWebApp(metadata_home)
+ web_app_dir = mc.webAppDir(atlas_home)
+ mc.expandWebApp(atlas_home)
p = os.pathsep
- metadata_classpath = confdir + p \
+ atlas_classpath = confdir + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "classes" ) + p \
+ os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "*" ) + p \
- + os.path.join(metadata_home, "libext", "*")
+ + os.path.join(atlas_home, "libext", "*")
- process = mc.java("org.apache.atlas.examples.QuickStart", sys.argv[1:], metadata_classpath, jvm_opts_list)
+ process = mc.java("org.apache.atlas.examples.QuickStart", sys.argv[1:], atlas_classpath, jvm_opts_list)
process.wait()
print "Example data added to Apache Atlas Server!!!\n"
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/conf/atlas-env.sh
----------------------------------------------------------------------
diff --git a/distro/src/conf/atlas-env.sh b/distro/src/conf/atlas-env.sh
index 4b82e0c..7029ba1 100644
--- a/distro/src/conf/atlas-env.sh
+++ b/distro/src/conf/atlas-env.sh
@@ -19,31 +19,31 @@
#export JAVA_HOME=
# any additional java opts you want to set. This will apply to both client and server operations
-#export METADATA_OPTS=
+#export ATLAS_OPTS=
# any additional java opts that you want to set for client only
-#export METADATA_CLIENT_OPTS=
+#export ATLAS_CLIENT_OPTS=
# java heap size we want to set for the client. Default is 1024MB
-#export METADATA_CLIENT_HEAP=
+#export ATLAS_CLIENT_HEAP=
# any additional opts you want to set for atlas service.
-#export METADATA_SERVER_OPTS=
+#export ATLAS_SERVER_OPTS=
# java heap size we want to set for the atlas server. Default is 1024MB
-#export METADATA_SERVER_HEAP=
+#export ATLAS_SERVER_HEAP=
# What is is considered as atlas home dir. Default is the base locaion of the installed software
-#export METADATA_HOME_DIR=
+#export ATLAS_HOME_DIR=
# Where log files are stored. Defatult is logs directory under the base install location
-#export METADATA_LOG_DIR=
+#export ATLAS_LOG_DIR=
# Where pid files are stored. Defatult is logs directory under the base install location
-#export METADATA_PID_DIR=
+#export ATLAS_PID_DIR=
# where the atlas titan db data is stored. Defatult is logs/data directory under the base install location
-#export METADATA_DATA_DIR=
+#export ATLAS_DATA_DIR=
# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
-#export METADATA_EXPANDED_WEBAPP_DIR=
+#export ATLAS_EXPANDED_WEBAPP_DIR=
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/distro/src/test/python/scripts/TestMetadata.py
----------------------------------------------------------------------
diff --git a/distro/src/test/python/scripts/TestMetadata.py b/distro/src/test/python/scripts/TestMetadata.py
index 349059f..441126e 100644
--- a/distro/src/test/python/scripts/TestMetadata.py
+++ b/distro/src/test/python/scripts/TestMetadata.py
@@ -23,7 +23,7 @@ from mock import patch
import unittest
import logging
import atlas_config as mc
-import atlas_start as metadata
+import atlas_start as atlas
import platform
IS_WINDOWS = platform.system() == "Windows"
@@ -34,37 +34,37 @@ class TestMetadata(unittest.TestCase):
@patch.object(mc,"unix_exist_pid")
@patch.object(mc,"writePid")
@patch.object(mc, "executeEnvSh")
- @patch.object(mc,"metadataDir")
+ @patch.object(mc,"atlasDir")
@patch.object(mc, "expandWebApp")
@patch("os.path.exists")
@patch.object(mc, "java")
- def test_main(self, java_mock, exists_mock, expandWebApp_mock, metadataDir_mock, executeEnvSh_mock, writePid_mock, unix_exist_pid_mock, win_exist_pid_mock):
+ def test_main(self, java_mock, exists_mock, expandWebApp_mock, atlasDir_mock, executeEnvSh_mock, writePid_mock, unix_exist_pid_mock, win_exist_pid_mock):
sys.argv = []
exists_mock.return_value = True
expandWebApp_mock.return_value = "webapp"
- metadataDir_mock.return_value = "metadata_home"
+ atlasDir_mock.return_value = "atlas_home"
win_exist_pid_mock("789")
win_exist_pid_mock.assert_called_with((str)(789))
unix_exist_pid_mock(789)
unix_exist_pid_mock.assert_called_with(789)
- metadata.main()
+ atlas.main()
self.assertTrue(java_mock.called)
if IS_WINDOWS:
java_mock.assert_called_with(
'org.apache.atlas.Atlas',
- ['-app', 'metadata_home\\server\\webapp\\atlas'],
- 'metadata_home\\conf;metadata_home\\server\\webapp\\atlas\\WEB-INF\\classes;metadata_home\\server\\webapp\\atlas\\WEB-INF\\lib\\atlas-titan-${project.version}.jar;metadata_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*;metadata_home\\libext\\*;metadata_home\\hbase\\conf',
- ['-Datlas.log.dir=metadata_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home\\logs')
+ ['-app', 'atlas_home\\server\\webapp\\atlas'],
+ 'atlas_home\\conf;atlas_home\\server\\webapp\\atlas\\WEB-INF\\classes;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\atlas-titan-${project.version}.jar;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*;atlas_home\\libext\\*;atlas_home\\hbase\\conf',
+ ['-Datlas.log.dir=atlas_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home', '-Datlas.conf=atlas_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'atlas_home\\logs')
else:
java_mock.assert_called_with(
'org.apache.atlas.Atlas',
- ['-app', 'metadata_home/server/webapp/atlas'],
- 'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib/atlas-titan-${project.version}.jar:metadata_home/server/webapp/atlas/WEB-INF/lib/*:metadata_home/libext/*:metadata_home/hbase/conf',
- ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home/logs')
+ ['-app', 'atlas_home/server/webapp/atlas'],
+ 'atlas_home/conf:atlas_home/server/webapp/atlas/WEB-INF/classes:atlas_home/server/webapp/atlas/WEB-INF/lib/atlas-titan-${project.version}.jar:atlas_home/server/webapp/atlas/WEB-INF/lib/*:atlas_home/libext/*:atlas_home/hbase/conf',
+ ['-Datlas.log.dir=atlas_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home', '-Datlas.conf=atlas_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'atlas_home/logs')
pass
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 11a38e8..86b3e0a 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -68,7 +68,7 @@ cd atlas-${project.version}
*Configuring Atlas*
By default config directory used by Atlas is {package dir}/conf. To override this set environment
-variable METADATA_CONF to the path of the conf dir.
+variable ATLAS_CONF to the path of the conf dir.
atlas-env.sh has been added to the Atlas conf. This file can be used to set various environment
variables that you need for you services. In addition you can set any other environment
@@ -80,48 +80,48 @@ executed. The following environment variables are available to set.
#export JAVA_HOME=
# any additional java opts you want to set. This will apply to both client and server operations
-#export METADATA_OPTS=
+#export ATLAS_OPTS=
# any additional java opts that you want to set for client only
-#export METADATA_CLIENT_OPTS=
+#export ATLAS_CLIENT_OPTS=
# java heap size we want to set for the client. Default is 1024MB
-#export METADATA_CLIENT_HEAP=
+#export ATLAS_CLIENT_HEAP=
# any additional opts you want to set for atlas service.
-#export METADATA_SERVER_OPTS=
+#export ATLAS_SERVER_OPTS=
# java heap size we want to set for the atlas server. Default is 1024MB
-#export METADATA_SERVER_HEAP=
+#export ATLAS_SERVER_HEAP=
# What is is considered as atlas home dir. Default is the base locaion of the installed software
-#export METADATA_HOME_DIR=
+#export ATLAS_HOME_DIR=
# Where log files are stored. Defatult is logs directory under the base install location
-#export METADATA_LOG_DIR=
+#export ATLAS_LOG_DIR=
# Where pid files are stored. Defatult is logs directory under the base install location
-#export METADATA_PID_DIR=
+#export ATLAS_PID_DIR=
# where the atlas titan db data is stored. Defatult is logs/data directory under the base install location
-#export METADATA_DATA_DIR=
+#export ATLAS_DATA_DIR=
# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
-#export METADATA_EXPANDED_WEBAPP_DIR=
+#export ATLAS_EXPANDED_WEBAPP_DIR=
</verbatim>
*NOTE for Mac OS users*
-If you are using a Mac OS, you will need to configure the METADATA_SERVER_OPTS (explained above).
+If you are using a Mac OS, you will need to configure the ATLAS_SERVER_OPTS (explained above).
In {package dir}/conf/atlas-env.sh uncomment the following line
<verbatim>
-#export METADATA_SERVER_OPTS=
+#export ATLAS_SERVER_OPTS=
</verbatim>
and change it to look as below
<verbatim>
-export METADATA_SERVER_OPTS="-Djava.awt.headless=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc="
+export ATLAS_SERVER_OPTS="-Djava.awt.headless=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc="
</verbatim>
*Hbase as the Storage Backend for the Graph Repository*
@@ -192,7 +192,7 @@ bin/atlas_start.py [-port <port>]
By default,
* To change the port, use -port option.
- * atlas server starts with conf from {package dir}/conf. To override this (to use the same conf with multiple atlas upgrades), set environment variable METADATA_CONF to the path of conf dir
+ * atlas server starts with conf from {package dir}/conf. To override this (to use the same conf with multiple atlas upgrades), set environment variable ATLAS_CONF to the path of conf dir
*Using Atlas*
* Quick start model - sample model and data
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/docs/src/site/twiki/Search.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Search.twiki b/docs/src/site/twiki/Search.twiki
index 92a5300..b5b1c85 100644
--- a/docs/src/site/twiki/Search.twiki
+++ b/docs/src/site/twiki/Search.twiki
@@ -77,7 +77,8 @@ Language Notes:
* The transitive closure of an Entity relationship can be expressed via the _Loop_ expression. A
_Loop_ expression can be any traversal (recursively a query) that represents a _Path_ that ends in an Entity of the same _Type_ as the starting Entity.
* The _WithPath_ clause can be used with transitive closure queries to retrieve the Path that
- connects the two related Entities. (We also provide a higher level interface for Closure Queries see scaladoc for 'org.apache.metadata.query.ClosureQuery')
+ connects the two related Entities. (We also provide a higher level interface for Closure Queries
+ see scaladoc for 'org.apache.atlas.query.ClosureQuery')
* There are couple of Predicate functions different from SQL:
* _is_ or _isa_can be used to filter Entities that have a particular Trait.
* _has_ can be used to filter Entities that have a value for a particular Attribute.
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/docs/src/site/twiki/security.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/security.twiki b/docs/src/site/twiki/security.twiki
index b3e496f..a4eb096 100755
--- a/docs/src/site/twiki/security.twiki
+++ b/docs/src/site/twiki/security.twiki
@@ -62,7 +62,7 @@ When Atlas is configured with HBase as the storage backend in a secure cluster,
};
</verbatim>
- * Update Atlas METADATA_OPTS to include ‘java.security.auth.login.config’ set to the above Atlas JAAS configuration file.
+ * Update Atlas ATLAS_OPTS to include ‘java.security.auth.login.config’ set to the above Atlas JAAS configuration file.
* For example, <code>-Djava.security.auth.login.config=/etc/atlas/conf/atlas-jaas.conf</code>
---+++ SPNEGO-based HTTP Authentication
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 6be3fff..2552586 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -5,6 +5,7 @@ Apache Atlas Release Notes
INCOMPATIBLE CHANGES:
ALL CHANGES:
+ATLAS-20 Rename env variables from METADATA to ATLAS (rishabhbhardwaj via shwethags)
ATLAS-360 Secure cluster Atlas-solr integration instructions (tbeerbower via shwethags)
ATLAS-368 Change trunk version to 0.7-incubating-SNAPSHOT (sumasai via shwethags)
ATLAS-383 tests for classtype.convert() with id (sumasai via shwethags)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/typesystem/doc/IDataType.uml
----------------------------------------------------------------------
diff --git a/typesystem/doc/IDataType.uml b/typesystem/doc/IDataType.uml
index 0302342..68051c3 100755
--- a/typesystem/doc/IDataType.uml
+++ b/typesystem/doc/IDataType.uml
@@ -18,79 +18,79 @@
-->
<Diagram>
<ID>JAVA</ID>
- <OriginalElement>org.apache.metadata.types.IDataType</OriginalElement>
+ <OriginalElement>org.apache.atlas.types.IDataType</OriginalElement>
<nodes>
- <node x="2063.5" y="401.0">org.apache.metadata.types.DataTypes.PrimitiveType</node>
- <node x="1307.0" y="687.0">org.apache.metadata.types.DataTypes.BigIntegerType</node>
- <node x="3098.0" y="687.0">org.apache.metadata.types.DataTypes.ShortType</node>
- <node x="2899.0" y="687.0">org.apache.metadata.types.DataTypes.DoubleType</node>
- <node x="1705.0" y="687.0">org.apache.metadata.types.DataTypes.FloatType</node>
- <node x="2650.5" y="335.0">org.apache.metadata.types.DataTypes.MapType</node>
- <node x="2501.0" y="687.0">org.apache.metadata.types.DataTypes.BooleanType</node>
- <node x="2073.5" y="168.0">org.apache.metadata.types.AbstractDataType</node>
- <node x="1108.0" y="687.0">org.apache.metadata.types.DataTypes.StringType</node>
- <node x="0.0" y="632.0">org.apache.metadata.types.ClassType</node>
- <node x="9.75" y="302.0">org.apache.metadata.types.HierarchicalType</node>
- <node x="2103.0" y="687.0">org.apache.metadata.types.DataTypes.BigDecimalType</node>
- <node x="736.0" y="632.0">org.apache.metadata.types.StructType</node>
- <node x="1506.0" y="687.0">org.apache.metadata.types.DataTypes.DateType</node>
- <node x="2341.5" y="357.0">org.apache.metadata.types.DataTypes.ArrayType</node>
- <node x="398.0" y="665.0">org.apache.metadata.types.TraitType</node>
- <node x="2700.0" y="687.0">org.apache.metadata.types.DataTypes.IntType</node>
- <node x="1904.0" y="687.0">org.apache.metadata.types.DataTypes.ByteType</node>
- <node x="2302.0" y="687.0">org.apache.metadata.types.DataTypes.LongType</node>
- <node x="544.0" y="390.0">org.apache.metadata.types.IConstructableType</node>
- <node x="1305.0" y="0.0">org.apache.metadata.types.IDataType</node>
+ <node x="2063.5" y="401.0">org.apache.atlas.types.DataTypes.PrimitiveType</node>
+ <node x="1307.0" y="687.0">org.apache.atlas.types.DataTypes.BigIntegerType</node>
+ <node x="3098.0" y="687.0">org.apache.atlas.types.DataTypes.ShortType</node>
+ <node x="2899.0" y="687.0">org.apache.atlas.types.DataTypes.DoubleType</node>
+ <node x="1705.0" y="687.0">org.apache.atlas.types.DataTypes.FloatType</node>
+ <node x="2650.5" y="335.0">org.apache.atlas.types.DataTypes.MapType</node>
+ <node x="2501.0" y="687.0">org.apache.atlas.types.DataTypes.BooleanType</node>
+ <node x="2073.5" y="168.0">org.apache.atlas.types.AbstractDataType</node>
+ <node x="1108.0" y="687.0">org.apache.atlas.types.DataTypes.StringType</node>
+ <node x="0.0" y="632.0">org.apache.atlas.types.ClassType</node>
+ <node x="9.75" y="302.0">org.apache.atlas.types.HierarchicalType</node>
+ <node x="2103.0" y="687.0">org.apache.atlas.types.DataTypes.BigDecimalType</node>
+ <node x="736.0" y="632.0">org.apache.atlas.types.StructType</node>
+ <node x="1506.0" y="687.0">org.apache.atlas.types.DataTypes.DateType</node>
+ <node x="2341.5" y="357.0">org.apache.atlas.types.DataTypes.ArrayType</node>
+ <node x="398.0" y="665.0">org.apache.atlas.types.TraitType</node>
+ <node x="2700.0" y="687.0">org.apache.atlas.types.DataTypes.IntType</node>
+ <node x="1904.0" y="687.0">org.apache.atlas.types.DataTypes.ByteType</node>
+ <node x="2302.0" y="687.0">org.apache.atlas.types.DataTypes.LongType</node>
+ <node x="544.0" y="390.0">org.apache.atlas.types.IConstructableType</node>
+ <node x="1305.0" y="0.0">org.apache.atlas.types.IDataType</node>
</nodes>
<notes />
<edges>
- <edge source="org.apache.metadata.types.StructType" target="org.apache.metadata.types.AbstractDataType">
+ <edge source="org.apache.atlas.types.StructType" target="org.apache.atlas.types.AbstractDataType">
<point x="88.0" y="-92.0" />
<point x="1000.0" y="282.0" />
<point x="2144.9" y="282.0" />
<point x="-47.59999999999991" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.BooleanType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.BooleanType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="2590.5" y="602.0" />
<point x="2239.409090909091" y="602.0" />
<point x="46.90909090909099" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.IntType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.IntType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="2789.5" y="592.0" />
<point x="2262.863636363636" y="592.0" />
<point x="70.36363636363626" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.ByteType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.ByteType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="1993.5" y="612.0" />
<point x="2169.0454545454545" y="612.0" />
<point x="-23.454545454545496" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.MapType" target="org.apache.metadata.types.AbstractDataType">
+ <edge source="org.apache.atlas.types.DataTypes.MapType" target="org.apache.atlas.types.AbstractDataType">
<point x="0.0" y="-92.0" />
<point x="2811.0" y="272.0" />
<point x="2287.7" y="272.0" />
<point x="95.20000000000005" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.StringType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.StringType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="-5.6843418860808015E-14" y="-37.0" />
<point x="1197.5" y="572.0" />
<point x="2075.227272727273" y="572.0" />
<point x="-117.27272727272725" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.PrimitiveType" target="org.apache.metadata.types.AbstractDataType">
+ <edge source="org.apache.atlas.types.DataTypes.PrimitiveType" target="org.apache.atlas.types.AbstractDataType">
<point x="0.0" y="-26.0" />
<point x="0.0" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.ArrayType" target="org.apache.metadata.types.AbstractDataType">
+ <edge source="org.apache.atlas.types.DataTypes.ArrayType" target="org.apache.atlas.types.AbstractDataType">
<point x="0.0" y="-70.0" />
<point x="2486.0" y="282.0" />
<point x="2240.1" y="282.0" />
<point x="47.59999999999991" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.IConstructableType" target="org.apache.metadata.types.IDataType">
+ <edge source="org.apache.atlas.types.IConstructableType" target="org.apache.atlas.types.IDataType">
<point x="0.0" y="-37.0" />
<point x="636.5" y="262.0" />
<point x="511.03656126482247" y="262.0" />
@@ -98,79 +98,79 @@
<point x="1359.75" y="143.0" />
<point x="-54.75" y="59.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.LongType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.LongType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="2391.5" y="612.0" />
<point x="2215.9545454545455" y="612.0" />
<point x="23.454545454545496" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.DateType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.DateType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="1595.5" y="592.0" />
<point x="2122.1363636363635" y="592.0" />
<point x="-70.36363636363637" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.TraitType" target="org.apache.metadata.types.HierarchicalType">
+ <edge source="org.apache.atlas.types.TraitType" target="org.apache.atlas.types.HierarchicalType">
<point x="-79.5" y="-59.0" />
<point x="477.5" y="602.0" />
<point x="264.0" y="602.0" />
<point x="84.75" y="125.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.DoubleType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.DoubleType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="2988.5" y="582.0" />
<point x="2286.318181818182" y="582.0" />
<point x="93.81818181818176" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.ShortType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.ShortType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="3187.5" y="572.0" />
<point x="2309.772727272727" y="572.0" />
<point x="117.27272727272725" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.StructType" target="org.apache.metadata.types.IConstructableType">
+ <edge source="org.apache.atlas.types.StructType" target="org.apache.atlas.types.IConstructableType">
<point x="-88.0" y="-92.0" />
<point x="824.0" y="612.0" />
<point x="698.1666666666666" y="612.0" />
<point x="61.66666666666663" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.HierarchicalType" target="org.apache.metadata.types.AbstractDataType">
+ <edge source="org.apache.atlas.types.HierarchicalType" target="org.apache.atlas.types.AbstractDataType">
<point x="0.0" y="-125.0" />
<point x="179.25" y="272.0" />
<point x="2097.3" y="272.0" />
<point x="-95.20000000000005" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.BigDecimalType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.BigDecimalType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="0.0" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.FloatType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.FloatType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="1794.5" y="602.0" />
<point x="2145.590909090909" y="602.0" />
<point x="-46.90909090909099" y="26.0" />
</edge>
- <edge source="org.apache.metadata.types.ClassType" target="org.apache.metadata.types.HierarchicalType">
+ <edge source="org.apache.atlas.types.ClassType" target="org.apache.atlas.types.HierarchicalType">
<point x="-94.5" y="-92.0" />
<point x="-84.75" y="125.0" />
</edge>
- <edge source="org.apache.metadata.types.AbstractDataType" target="org.apache.metadata.types.IDataType">
+ <edge source="org.apache.atlas.types.AbstractDataType" target="org.apache.atlas.types.IDataType">
<point x="0.0" y="-37.0" />
<point x="2192.5" y="143.0" />
<point x="1469.25" y="143.0" />
<point x="54.75" y="59.0" />
</edge>
- <edge source="org.apache.metadata.types.TraitType" target="org.apache.metadata.types.IConstructableType">
+ <edge source="org.apache.atlas.types.TraitType" target="org.apache.atlas.types.IConstructableType">
<point x="79.5" y="-59.0" />
<point x="0.0" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.ClassType" target="org.apache.metadata.types.IConstructableType">
+ <edge source="org.apache.atlas.types.ClassType" target="org.apache.atlas.types.IConstructableType">
<point x="94.5" y="-92.0" />
<point x="283.5" y="612.0" />
<point x="574.8333333333333" y="612.0" />
<point x="-61.66666666666666" y="37.0" />
</edge>
- <edge source="org.apache.metadata.types.DataTypes.BigIntegerType" target="org.apache.metadata.types.DataTypes.PrimitiveType">
+ <edge source="org.apache.atlas.types.DataTypes.BigIntegerType" target="org.apache.atlas.types.DataTypes.PrimitiveType">
<point x="0.0" y="-37.0" />
<point x="1396.5" y="582.0" />
<point x="2098.681818181818" y="582.0" />
@@ -179,7 +179,7 @@
</edges>
<settings layout="Hierarchic Group" zoom="1.0" x="1212.0" y="-764.5" />
<SelectedNodes>
- <node>org.apache.metadata.types.DataTypes.StringType</node>
+ <node>org.apache.atlas.types.DataTypes.StringType</node>
</SelectedNodes>
<Categories>
<Category>Methods</Category>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/typesystem/doc/Instance.uml
----------------------------------------------------------------------
diff --git a/typesystem/doc/Instance.uml b/typesystem/doc/Instance.uml
index 4556f24..e11c685 100755
--- a/typesystem/doc/Instance.uml
+++ b/typesystem/doc/Instance.uml
@@ -18,99 +18,99 @@
-->
<Diagram>
<ID>JAVA</ID>
- <OriginalElement>org.apache.metadata.storage.ReferenceableInstance</OriginalElement>
+ <OriginalElement>org.apache.atlas.storage.ReferenceableInstance</OriginalElement>
<nodes>
- <node x="698.875" y="259.0">org.apache.metadata.storage.DownCastStructInstance</node>
- <node x="30.536458333333258" y="628.0">org.apache.metadata.storage.ReferenceableInstance</node>
- <node x="369.875" y="259.0">org.apache.metadata.IReferenceableInstance</node>
- <node x="0.0" y="146.0">org.apache.metadata.ITypedInstance</node>
- <node x="4.7864583333332575" y="482.0">org.apache.metadata.ITypedReferenceableInstance</node>
- <node x="269.40624999999994" y="0.0">org.apache.metadata.IInstance</node>
- <node x="947.875" y="248.0">org.apache.metadata.Struct</node>
- <node x="651.96875" y="449.0">org.apache.metadata.Referenceable</node>
- <node x="240.7864583333333" y="416.0">org.apache.metadata.storage.StructInstance</node>
- <node x="236.87499999999997" y="292.0">org.apache.metadata.ITypedStruct</node>
- <node x="593.1770833333333" y="157.0">org.apache.metadata.IStruct</node>
+ <node x="698.875" y="259.0">org.apache.atlas.storage.DownCastStructInstance</node>
+ <node x="30.536458333333258" y="628.0">org.apache.atlas.storage.ReferenceableInstance</node>
+ <node x="369.875" y="259.0">org.apache.atlas.IReferenceableInstance</node>
+ <node x="0.0" y="146.0">org.apache.atlas.ITypedInstance</node>
+ <node x="4.7864583333332575" y="482.0">org.apache.atlas.ITypedReferenceableInstance</node>
+ <node x="269.40624999999994" y="0.0">org.apache.atlas.IInstance</node>
+ <node x="947.875" y="248.0">org.apache.atlas.Struct</node>
+ <node x="651.96875" y="449.0">org.apache.atlas.Referenceable</node>
+ <node x="240.7864583333333" y="416.0">org.apache.atlas.storage.StructInstance</node>
+ <node x="236.87499999999997" y="292.0">org.apache.atlas.ITypedStruct</node>
+ <node x="593.1770833333333" y="157.0">org.apache.atlas.IStruct</node>
</nodes>
<notes />
<edges>
- <edge source="org.apache.metadata.storage.ReferenceableInstance" target="org.apache.metadata.storage.StructInstance">
+ <edge source="org.apache.atlas.storage.ReferenceableInstance" target="org.apache.atlas.storage.StructInstance">
<point x="82.25" y="-59.0" />
<point x="277.28645833333326" y="603.0" />
<point x="385.28645833333326" y="603.0" />
<point x="0.0" y="81.0" />
</edge>
- <edge source="org.apache.metadata.Referenceable" target="org.apache.metadata.IReferenceableInstance">
+ <edge source="org.apache.atlas.Referenceable" target="org.apache.atlas.IReferenceableInstance">
<point x="-77.25" y="-48.0" />
<point x="729.21875" y="396.0" />
<point x="601.625" y="396.0" />
<point x="77.25" y="48.0" />
</edge>
- <edge source="org.apache.metadata.storage.DownCastStructInstance" target="org.apache.metadata.IStruct">
+ <edge source="org.apache.atlas.storage.DownCastStructInstance" target="org.apache.atlas.IStruct">
<point x="0.0" y="-48.0" />
<point x="813.375" y="228.0" />
<point x="640.0520833333333" y="228.0" />
<point x="9.375" y="15.0" />
</edge>
- <edge source="org.apache.metadata.Struct" target="org.apache.metadata.IStruct">
+ <edge source="org.apache.atlas.Struct" target="org.apache.atlas.IStruct">
<point x="0.0" y="-59.0" />
<point x="1072.375" y="218.0" />
<point x="658.8020833333333" y="218.0" />
<point x="28.125" y="15.0" />
</edge>
- <edge source="org.apache.metadata.ITypedInstance" target="org.apache.metadata.IInstance">
+ <edge source="org.apache.atlas.ITypedInstance" target="org.apache.atlas.IInstance">
<point x="0.0" y="-26.0" />
<point x="116.0" y="121.0" />
<point x="326.65624999999994" y="121.0" />
<point x="-57.25" y="48.0" />
</edge>
- <edge source="org.apache.metadata.IStruct" target="org.apache.metadata.IInstance">
+ <edge source="org.apache.atlas.IStruct" target="org.apache.atlas.IInstance">
<point x="0.0" y="-15.0" />
<point x="630.6770833333333" y="121.0" />
<point x="441.15624999999994" y="121.0" />
<point x="57.25" y="48.0" />
</edge>
- <edge source="org.apache.metadata.IReferenceableInstance" target="org.apache.metadata.IStruct">
+ <edge source="org.apache.atlas.IReferenceableInstance" target="org.apache.atlas.IStruct">
<point x="0.0" y="-48.0" />
<point x="524.375" y="228.0" />
<point x="621.3020833333333" y="228.0" />
<point x="-9.375" y="15.0" />
</edge>
- <edge source="org.apache.metadata.Referenceable" target="org.apache.metadata.Struct">
+ <edge source="org.apache.atlas.Referenceable" target="org.apache.atlas.Struct">
<point x="77.25" y="-48.0" />
<point x="883.71875" y="396.0" />
<point x="1072.375" y="396.0" />
<point x="0.0" y="59.0" />
</edge>
- <edge source="org.apache.metadata.ITypedStruct" target="org.apache.metadata.IStruct">
+ <edge source="org.apache.atlas.ITypedStruct" target="org.apache.atlas.IStruct">
<point x="28.25" y="-15.0" />
<point x="321.625" y="218.0" />
<point x="602.5520833333333" y="218.0" />
<point x="-28.125" y="15.0" />
</edge>
- <edge source="org.apache.metadata.ITypedStruct" target="org.apache.metadata.ITypedInstance">
+ <edge source="org.apache.atlas.ITypedStruct" target="org.apache.atlas.ITypedInstance">
<point x="-28.25" y="-15.0" />
<point x="265.125" y="228.0" />
<point x="174.0" y="228.0" />
<point x="58.0" y="26.0" />
</edge>
- <edge source="org.apache.metadata.storage.StructInstance" target="org.apache.metadata.ITypedStruct">
+ <edge source="org.apache.atlas.storage.StructInstance" target="org.apache.atlas.ITypedStruct">
<point x="0.0" y="-81.0" />
<point x="385.28645833333326" y="386.0" />
<point x="293.375" y="386.0" />
<point x="0.0" y="15.0" />
</edge>
- <edge source="org.apache.metadata.ITypedReferenceableInstance" target="org.apache.metadata.ITypedInstance">
+ <edge source="org.apache.atlas.ITypedReferenceableInstance" target="org.apache.atlas.ITypedInstance">
<point x="-54.0" y="-15.0" />
<point x="-58.0" y="26.0" />
</edge>
- <edge source="org.apache.metadata.ITypedReferenceableInstance" target="org.apache.metadata.IReferenceableInstance">
+ <edge source="org.apache.atlas.ITypedReferenceableInstance" target="org.apache.atlas.IReferenceableInstance">
<point x="54.0" y="-15.0" />
<point x="166.78645833333326" y="396.0" />
<point x="447.125" y="396.0" />
<point x="-77.25" y="48.0" />
</edge>
- <edge source="org.apache.metadata.storage.ReferenceableInstance" target="org.apache.metadata.ITypedReferenceableInstance">
+ <edge source="org.apache.atlas.storage.ReferenceableInstance" target="org.apache.atlas.ITypedReferenceableInstance">
<point x="-82.25" y="-59.0" />
<point x="0.0" y="15.0" />
</edge>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/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 e17d669..e193b30 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
@@ -37,10 +37,10 @@ import java.net.UnknownHostException;
public class LoginProcessor {
private static final Logger LOG = LoggerFactory.getLogger(LoginProcessor.class);
- public static final String METADATA_AUTHENTICATION_PREFIX = "atlas.authentication.";
- public static final String AUTHENTICATION_METHOD = METADATA_AUTHENTICATION_PREFIX + "method";
- public static final String AUTHENTICATION_PRINCIPAL = METADATA_AUTHENTICATION_PREFIX + "principal";
- public static final String AUTHENTICATION_KEYTAB = METADATA_AUTHENTICATION_PREFIX + "keytab";
+ public static final String ATLAS_AUTHENTICATION_PREFIX = "atlas.authentication.";
+ public static final String AUTHENTICATION_METHOD = ATLAS_AUTHENTICATION_PREFIX + "method";
+ public static final String AUTHENTICATION_PRINCIPAL = ATLAS_AUTHENTICATION_PREFIX + "principal";
+ public static final String AUTHENTICATION_KEYTAB = ATLAS_AUTHENTICATION_PREFIX + "keytab";
/**
* Perform a SIMPLE login based on established OS identity or a kerberos based login using the configured
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/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 bb42dcf..7bce1cb 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
@@ -63,8 +63,8 @@ public class MetadataAuthenticationKerberosFilterIT extends BaseSecurityTest {
@Test(enabled = false)
public void testKerberosBasedLogin() throws Exception {
- String originalConf = System.getProperty("metadata.conf");
- System.setProperty("metadata.conf", System.getProperty("user.dir"));
+ String originalConf = System.getProperty("atlas.conf");
+ System.setProperty("atlas.conf", System.getProperty("user.dir"));
setupKDCAndPrincipals();
TestEmbeddedServer server = null;
@@ -110,9 +110,9 @@ public class MetadataAuthenticationKerberosFilterIT extends BaseSecurityTest {
kdc.stop();
if (originalConf != null) {
- System.setProperty("metadata.conf", originalConf);
+ System.setProperty("atlas.conf", originalConf);
} else {
- System.clearProperty("metadata.conf");
+ System.clearProperty("atlas.conf");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/be6971f2/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationSimpleFilterIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationSimpleFilterIT.java b/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationSimpleFilterIT.java
index 477ac4e..77659ee 100644
--- a/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationSimpleFilterIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/filters/MetadataAuthenticationSimpleFilterIT.java
@@ -45,8 +45,8 @@ public class MetadataAuthenticationSimpleFilterIT extends BaseSecurityTest {
@Test(enabled = false)
public void testSimpleLogin() throws Exception {
- String originalConf = System.getProperty("metadata.conf");
- System.setProperty("metadata.conf", System.getProperty("user.dir"));
+ String originalConf = System.getProperty("atlas.conf");
+ System.setProperty("atlas.conf", System.getProperty("user.dir"));
generateSimpleLoginConfiguration();
TestEmbeddedServer server = new TestEmbeddedServer(23001, "webapp/target/apache-atlas");
@@ -74,9 +74,9 @@ public class MetadataAuthenticationSimpleFilterIT extends BaseSecurityTest {
} finally {
server.getServer().stop();
if (originalConf != null) {
- System.setProperty("metadata.conf", originalConf);
+ System.setProperty("atlas.conf", originalConf);
} else {
- System.clearProperty("metadata.conf");
+ System.clearProperty("atlas.conf");
}
}