Repository: atlas Updated Branches: refs/heads/ATLAS-2251 2e24da428 -> c2b9846dd
ATLAS-2256: Make JanusGraph as the default graph-provider in atlas Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c2b9846d Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c2b9846d Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c2b9846d Branch: refs/heads/ATLAS-2251 Commit: c2b9846dd5c59c938a5eefb2e825584381338e13 Parents: 2e24da4 Author: Sarath Subramanian <ssubraman...@hortonworks.com> Authored: Thu Nov 9 13:51:38 2017 -0800 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Thu Nov 9 17:21:39 2017 -0800 ---------------------------------------------------------------------- distro/pom.xml | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/conf/atlas-application.properties | 4 ++-- pom.xml | 4 ++-- .../java/org/apache/atlas/util/AtlasRepositoryConfiguration.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/c2b9846d/distro/pom.xml ---------------------------------------------------------------------- diff --git a/distro/pom.xml b/distro/pom.xml index 9db742d..0c4e302 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -40,7 +40,7 @@ atlas.graph.storage.hostname= atlas.graph.storage.hbase.regions-per-server=1 atlas.graph.storage.lock.wait-time=10000 </graph.storage.properties> - <graph.index.backend>solr5</graph.index.backend> + <graph.index.backend>solr</graph.index.backend> <graph.index.properties>#Solr #Solr cloud mode properties atlas.graph.index.search.solr.mode=cloud http://git-wip-us.apache.org/repos/asf/atlas/blob/c2b9846d/distro/src/bin/atlas_config.py ---------------------------------------------------------------------- diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 4d13b30..e6415cf 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -62,7 +62,7 @@ ON_POSIX = 'posix' in sys.builtin_module_names CONF_FILE="atlas-application.properties" HBASE_STORAGE_CONF_ENTRY="atlas.graph.storage.backend\s*=\s*hbase" HBASE_STORAGE_LOCAL_CONF_ENTRY="atlas.graph.storage.hostname\s*=\s*localhost" -SOLR_INDEX_CONF_ENTRY="atlas.graph.index.search.backend\s*=\s*solr5" +SOLR_INDEX_CONF_ENTRY="atlas.graph.index.search.backend\s*=\s*solr" SOLR_INDEX_LOCAL_CONF_ENTRY="atlas.graph.index.search.solr.zookeeper-url\s*=\s*localhost" SOLR_INDEX_ZK_URL="atlas.graph.index.search.solr.zookeeper-url" TOPICS_TO_CREATE="atlas.notification.topics" http://git-wip-us.apache.org/repos/asf/atlas/blob/c2b9846d/distro/src/conf/atlas-application.properties ---------------------------------------------------------------------- diff --git a/distro/src/conf/atlas-application.properties b/distro/src/conf/atlas-application.properties index b61c2bc..1f38705 100755 --- a/distro/src/conf/atlas-application.properties +++ b/distro/src/conf/atlas-application.properties @@ -20,8 +20,8 @@ # Graph Database -#Configures the graph database to use. Defaults to Titan 0.5.4. -#atlas.graphdb.backend=org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase +#Configures the graph database to use. Defaults to JanusGraph 0.1.1 +#atlas.graphdb.backend=org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase # Graph Storage atlas.graph.storage.backend=${graph.storage.backend} http://git-wip-us.apache.org/repos/asf/atlas/blob/c2b9846d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fdf42a7..8277414 100644 --- a/pom.xml +++ b/pom.xml @@ -649,9 +649,9 @@ <properties> <!-- Define graph dependency type/version --> <graphGroup>org.apache.atlas</graphGroup> - <graphArtifact>atlas-graphdb-titan0</graphArtifact> + <graphArtifact>atlas-graphdb-janus</graphArtifact> <skipDocs>false</skipDocs> - <graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase</graphdb.backend.impl> + <graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl> </properties> </profile> http://git-wip-us.apache.org/repos/asf/atlas/blob/c2b9846d/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java b/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java index f0c7500..0e1e5b6 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java @@ -122,7 +122,7 @@ public class AtlasRepositoryConfiguration { } private static final String GRAPH_DATABASE_IMPLEMENTATION_PROPERTY = "atlas.graphdb.backend"; - private static final String DEFAULT_GRAPH_DATABASE_IMPLEMENTATION_CLASS = "org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase"; + private static final String DEFAULT_GRAPH_DATABASE_IMPLEMENTATION_CLASS = "org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase"; @SuppressWarnings("unchecked") public static Class<? extends GraphDatabase> getGraphDatabaseImpl() {
