atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jma...@apache.org
Subject [02/51] [abbrv] incubator-atlas git commit: Refactor packages and scripts to Atlas (cherry picked from commit 414beba)
Date Sun, 14 Jun 2015 17:44:42 GMT
Refactor packages and scripts to Atlas
(cherry picked from commit 414beba)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/26048109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/26048109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/26048109

Branch: refs/heads/dal
Commit: 260481095a603943c1715a36a7b6ed2788229d7d
Parents: c71b5b3
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Mon Jun 8 17:41:01 2015 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Mon Jun 8 20:33:35 2015 -0700

----------------------------------------------------------------------
 InstallationSteps.txt                           | 10 +--
 addons/falcon-bridge/pom.xml                    | 16 ++--
 addons/hive-bridge/pom.xml                      | 32 ++++----
 addons/hive-bridge/src/bin/import-hive.sh       |  2 +-
 .../src/site/twiki/Bridge-Hive.twiki            | 10 +--
 .../src/test/resources/application.properties   | 18 ++---
 .../metadata-bridge-core/pom.xml                | 10 +--
 .../apache/hadoop/metadata/bridge/ABridge.java  | 24 +++---
 .../hadoop/metadata/bridge/AEntityBean.java     |  2 +-
 .../hadoop/metadata/bridge/BridgeException.java |  2 +-
 .../hadoop/metadata/bridge/BridgeManager.java   | 16 ++--
 .../metadata/bridge/BridgeTypeBootstrapper.java | 14 ++--
 .../apache/hadoop/metadata/bridge/IBridge.java  |  2 +-
 .../bridge/hivelineage/HiveLineageBridge.java   |  8 +-
 .../bridge/hivelineage/hook/HiveLineage.java    |  4 +-
 .../bridge/hivestructure/HiveMetaImporter.java  | 16 ++--
 .../hivestructure/HiveStructureBridge.java      | 20 ++---
 .../metadata/bridge/module/BridgeModule.java    |  8 +-
 .../web/resources/HiveLineageResource.java      |  4 +-
 .../main/resources/bridge-manager.properties    |  2 +-
 .../metadata/bridge/BridgeManagerTest.java      |  6 +-
 .../metadata/bridge/TestBridgeModule.java       |  4 +-
 .../metadata/bridge/TestGenericBridges.java     |  2 +-
 .../hivelineage/TestHiveLineageBridge.java      | 12 +--
 .../test/resources/bridge-manager.properties    |  2 +-
 .../resources/test-bridge-manager.properties    |  2 +-
 .../metadata-bridge-hive/pom.xml                | 10 +--
 .../bridge/hivelineage/hook/HiveLineage.java    |  2 +-
 .../hivelineage/hook/HiveLineageInfo.java       | 12 +--
 .../metadata/bridge/hivelineage/hook/Hook.java  |  6 +-
 .../hivelineage/hook/HiveLineageInfoTest.java   |  2 +-
 addons/metadata-bridge-parent/pom.xml           | 10 +--
 client/pom.xml                                  | 14 ++--
 dashboard/v1/js/controllers.js                  |  8 +-
 .../public/modules/details/detailsResource.js   |  2 +-
 .../public/modules/lineage/lineageResource.js   |  2 +-
 .../v2/public/modules/search/searchResource.js  |  2 +-
 dashboard/v3/js/controllers.js                  | 24 +++---
 docs/pom.xml                                    | 10 +--
 pom.xml                                         | 30 +++----
 repository/pom.xml                              | 18 ++---
 .../src/test/resources/application.properties   | 22 ++---
 src/bin/cputil.py                               |  4 +-
 src/bin/quick_start.py                          |  6 +-
 src/build/enunciate.xml                         |  4 +-
 src/conf/application.properties                 | 26 +++---
 src/conf/client.properties                      |  6 +-
 src/conf/log4j.xml                              |  6 +-
 src/main/assemblies/src-package.xml             |  2 +-
 src/main/assemblies/standalone-package.xml      |  6 +-
 src/main/examples/hive-data-model.json          | 20 ++---
 src/test/python/scripts/TestMetadata.py         |  6 +-
 tools/pom.xml                                   | 18 ++---
 .../org/apache/atlas/tools/cli/Console.scala    | 67 +++++++++++++++
 .../hadoop/metadata/tools/cli/Console.scala     | 67 ---------------
 typesystem/pom.xml                              | 10 +--
 .../apache/atlas/typesystem/ITypedInstance.java | 85 ++++++++++++++++++++
 .../metadata/typesystem/ITypedInstance.java     | 85 --------------------
 .../src/main/resources/application.properties   |  6 +-
 typesystem/src/main/resources/log4j.xml         |  2 +-
 typesystem/src/test/resources/sampleTypes.json  | 18 ++---
 webapp/pom.xml                                  | 48 +++++------
 .../src/main/resources/application.properties   | 26 +++---
 .../main/resources/atlas-buildinfo.properties   | 28 +++++++
 webapp/src/main/resources/log4j.xml             |  6 +-
 .../resources/metadata-buildinfo.properties     | 28 -------
 webapp/src/main/webapp/WEB-INF/web.xml          |  8 +-
 67 files changed, 505 insertions(+), 505 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/InstallationSteps.txt
----------------------------------------------------------------------
diff --git a/InstallationSteps.txt b/InstallationSteps.txt
index 13f08d4..10d220b 100755
--- a/InstallationSteps.txt
+++ b/InstallationSteps.txt
@@ -83,21 +83,21 @@ c. Using DGI
 ~~~~~~~~~~~~~~~
 
 * Verify if the server is up and running
-  curl -v http://localhost:21000/api/metadata/admin/version
+  curl -v http://localhost:21000/api/atlas/admin/version
   {"Version":"v0.1"}
 
 * List the types in the repository
-  curl -v http://localhost:21000/api/metadata/types
+  curl -v http://localhost:21000/api/atlas/types
   {"list":["biginteger","short","byte","int","string","bigdecimal","boolean","date","double","long","float"],"requestId":"902580786@qtp-1479771328-0"}
 
 * List the instances for a given type
-  curl -v http://localhost:21000/api/metadata/entities?type=hive_table
+  curl -v http://localhost:21000/api/atlas/entities?type=hive_table
   {"requestId":"788558007@qtp-44808654-5","list":["cb9b5513-c672-42cb-8477-b8f3e537a162","ec985719-a794-4c98-b98f-0509bd23aac0","48998f81-f1d3-45a2-989a-223af5c1ed6e","a54b386e-c759-4651-8779-a099294244c4"]}
 
-  curl -v http://localhost:21000/api/metadata/entities/list/hive_db
+  curl -v http://localhost:21000/api/atlas/entities/list/hive_db
 
 * Search for entities (instances) in the repository
-  curl -v http://localhost:21000/api/metadata/discovery/search/dsl?query="from hive_table"
+  curl -v http://localhost:21000/api/atlas/discovery/search/dsl?query="from hive_table"
 
 d. Stopping DGI Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index d94caee..fd71258 100755
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -22,14 +22,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>metadata-governance</artifactId>
-        <groupId>org.apache.hadoop.metadata</groupId>
+        <artifactId>apache-atlas</artifactId>
+        <groupId>org.apache.atlas</groupId>
         <version>0.1-incubating-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
     <artifactId>falcon-bridge</artifactId>
-    <description>Apache Metadata Falcon Bridge Module</description>
-    <name>Apache Metadata Falcon Bridge</name>
+    <description>Apache Atlas Falcon Bridge Module</description>
+    <name>Apache Atlas Falcon Bridge</name>
     <packaging>jar</packaging>
 
     <properties>
@@ -50,13 +50,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-typesystem</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-repository</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-repository</artifactId>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index b23fa18..5c28b0e 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -22,14 +22,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>metadata-governance</artifactId>
-        <groupId>org.apache.hadoop.metadata</groupId>
+        <artifactId>apache-atlas</artifactId>
+        <groupId>org.apache.atlas</groupId>
         <version>0.1-incubating-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
     <artifactId>hive-bridge</artifactId>
-    <description>Apache Metadata Hive Bridge Module</description>
-    <name>Apache Metadata Hive Bridge</name>
+    <description>Apache Atlas Hive Bridge Module</description>
+    <name>Apache Atlas Hive Bridge</name>
     <packaging>jar</packaging>
 
     <properties>
@@ -76,8 +76,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-client</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-client</artifactId>
             <version>${version}</version>
             <exclusions>
                 <exclusion>
@@ -90,8 +90,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-typesystem</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
         </dependency>
 
         <dependency>
@@ -110,8 +110,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-webapp</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-webapp</artifactId>
             <classifier>classes</classifier>
         </dependency>
 
@@ -194,12 +194,12 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>metadata-client</artifactId>
+                                    <artifactId>atlas-client</artifactId>
                                     <version>${project.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>metadata-typesystem</artifactId>
+                                    <artifactId>atlas-typesystem</artifactId>
                                     <version>${project.version}</version>
                                 </artifactItem>
                                 <artifactItem>
@@ -241,20 +241,20 @@
                             <maxIdleTime>60000</maxIdleTime>
                         </connector>
                     </connectors>
-                    <webApp>../../webapp/target/metadata-webapp-${project.version}.war</webApp>
+                    <webApp>../../webapp/target/atlas-webapp-${project.version}.war</webApp>
                     <contextPath>/</contextPath>
                     <useTestClasspath>true</useTestClasspath>
                     <systemProperties>
                         <systemProperty>
-                            <name>metadata.log.dir</name>
+                            <name>atlas.log.dir</name>
                             <value>${project.build.directory}/logs</value>
                         </systemProperty>
                         <systemProperty>
-                            <name>metadata.conf</name>
+                            <name>atlas.conf</name>
                             <value>addons/hive-bridge/src/test/resources</value>
                         </systemProperty>
                     </systemProperties>
-                    <stopKey>metadata-stop</stopKey>
+                    <stopKey>atlas-stop</stopKey>
                     <stopPort>41001</stopPort>
                 </configuration>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/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 68abc6c..0331d9e 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -87,7 +87,7 @@ export HIVE_CP
 echo Using Hive configuration directory [$HIVE_CP]
 echo "Logs for import are in $METADATA_LOG_DIR/import-hive.log"
 
-${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${HIVE_CP}:${METADATACPPATH} org.apache.hadoop.metadata.hive.bridge.HiveMetaStoreBridge
+${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${HIVE_CP}:${METADATACPPATH} org.apache.atlas.hive.bridge.HiveMetaStoreBridge
 
 RETVAL=$?
 [ $RETVAL -eq 0 ] && echo Hive Data Model imported successfully!!!

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki b/addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki
index 4cbf911..2c5abba 100644
--- a/addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki
+++ b/addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki
@@ -1,5 +1,5 @@
 ---+ Hive DGI Bridge
-Hive metadata can be modelled in DGI using its Type System. The default modelling is available in org.apache.hadoop.metadata.hive.model.HiveDataModelGenerator. It defines the following types:
+Hive metadata can be modelled in DGI using its Type System. The default modelling is available in org.apache.atlas.hive.model.HiveDataModelGenerator. It defines the following types:
    * hive_resource_type(EnumType) - [JAR, FILE, ARCHIVE]
    * hive_principal_type(EnumType) - [USER, ROLE, GROUP]
    * hive_function_type(EnumType) - [JAVA]
@@ -19,7 +19,7 @@ Hive metadata can be modelled in DGI using its Type System. The default modellin
 
 
 ---++ Importing Hive Metadata
-org.apache.hadoop.metadata.hive.bridge.HiveMetaStoreBridge imports the hive metadata into DGI using the typesystem defined in org.apache.hadoop.metadata.hive.model.HiveDataModelGenerator. import-hive.sh command can be used to facilitate this.
+org.apache.atlas.hive.bridge.HiveMetaStoreBridge imports the hive metadata into DGI using the typesystem defined in org.apache.atlas.hive.model.HiveDataModelGenerator. import-hive.sh command can be used to facilitate this.
 Set-up the following configs in hive-site.xml of your hive set-up and set environment variable HIVE_CONFIG to the
 hive conf directory:
    * DGI endpoint - Add the following property with the DGI endpoint for your set-up
@@ -38,13 +38,13 @@ Usage: <dgi package>/bin/import-hive.sh. The logs are in <dgi package>/logs/impo
 
 
 ---++ Hive Hook
-Hive supports listeners on hive command execution using hive hooks. This is used to add/update/remove entities in DGI using the model defined in org.apache.hadoop.metadata.hive.model.HiveDataModelGenerator.
+Hive supports listeners on hive command execution using hive hooks. This is used to add/update/remove entities in DGI using the model defined in org.apache.atlas.hive.model.HiveDataModelGenerator.
 The hook submits the request to a thread pool executor to avoid blocking the command execution. Follow the these instructions in your hive set-up to add hive hook for DGI:
-   * Add org.apache.hadoop.metadata.hive.hook.HiveHook as post execution hook in hive-site.xml
+   * Add org.apache.atlas.hive.hook.HiveHook as post execution hook in hive-site.xml
 <verbatim>
 <property>
   <name>hive.exec.post.hooks</name>
-  <value>org.apache.hadoop.metadata.hive.hook.HiveHook</value>
+  <value>org.apache.atlas.hive.hook.HiveHook</value>
 </property>
 </verbatim>
    * Add the following properties in hive-ste.xml with the DGI endpoint for your set-up

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/hive-bridge/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/resources/application.properties b/addons/hive-bridge/src/test/resources/application.properties
index 21d2d67..50eefed 100644
--- a/addons/hive-bridge/src/test/resources/application.properties
+++ b/addons/hive-bridge/src/test/resources/application.properties
@@ -18,25 +18,25 @@
 
 #########  Graph Database Configs  #########
 # Graph Storage
-metadata.graph.storage.backend=inmemory
+atlas.graph.storage.backend=inmemory
 
 # Graph Search Index
-metadata.graph.index.search.backend=lucene
-metadata.graph.index.search.directory=target/data/lucene
+atlas.graph.index.search.backend=lucene
+atlas.graph.index.search.directory=target/data/lucene
 
 
 #########  Hive Lineage Configs  #########
 # This models reflects the base super types for Data and Process
-#metadata.lineage.hive.table.type.name=DataSet
-#metadata.lineage.hive.process.type.name=Process
-#metadata.lineage.hive.process.inputs.name=inputs
-#metadata.lineage.hive.process.outputs.name=outputs
+#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
-#metadata.lineage.hive.table.schema.query=hive_table where name=?, columns
+#atlas.lineage.hive.table.schema.query=hive_table where name=?, columns
 
 
 #########  Security Properties  #########
 
 # SSL config
-metadata.enableTLS=false
+atlas.enableTLS=false

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/pom.xml
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/pom.xml b/addons/metadata-bridge-parent/metadata-bridge-core/pom.xml
index 4fbcbb8..eebf95e 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/pom.xml
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/pom.xml
@@ -21,11 +21,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.hadoop.metadata</groupId>
-        <artifactId>metadata-bridge-parent</artifactId>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>atlas-bridge-parent</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
-    <artifactId>metadata-bridge-core</artifactId>
+    <artifactId>atlas-bridge-core</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -45,8 +45,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-repository</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-repository</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/ABridge.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/ABridge.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/ABridge.java
index eaf5651..fedbc60 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/ABridge.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/ABridge.java
@@ -16,20 +16,20 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.repository.MetadataRepository;
-import org.apache.hadoop.metadata.repository.RepositoryException;
-import org.apache.hadoop.metadata.typesystem.ITypedReferenceableInstance;
-import org.apache.hadoop.metadata.typesystem.Referenceable;
-import org.apache.hadoop.metadata.typesystem.types.AttributeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.AttributeInfo;
-import org.apache.hadoop.metadata.typesystem.types.ClassType;
-import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
-import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.repository.MetadataRepository;
+import org.apache.atlas.repository.RepositoryException;
+import org.apache.atlas.typesystem.ITypedReferenceableInstance;
+import org.apache.atlas.typesystem.Referenceable;
+import org.apache.atlas.typesystem.types.AttributeDefinition;
+import org.apache.atlas.typesystem.types.AttributeInfo;
+import org.apache.atlas.typesystem.types.ClassType;
+import org.apache.atlas.typesystem.types.HierarchicalTypeDefinition;
+import org.apache.atlas.typesystem.types.Multiplicity;
+import org.apache.atlas.typesystem.types.TypeSystem;
 import org.slf4j.Logger;
 
 import java.lang.reflect.Field;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/AEntityBean.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/AEntityBean.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/AEntityBean.java
index d3272e3..81bdecb 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/AEntityBean.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/AEntityBean.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 public abstract class AEntityBean {
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java
index 5912563..e9c5ca0 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 import org.apache.hadoop.hive.metastore.api.MetaException;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java
index b30a7f9..7973c43 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java
@@ -16,21 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 //TODO - Create Index Annotation Framework for BeanConverter
 //TODO - Enhance Bean Conversion to handled nested objects
 //TODO - Enhance Bean COnversion to handle Collections
 
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.repository.MetadataRepository;
+import org.apache.atlas.typesystem.types.AttributeDefinition;
+import org.apache.atlas.typesystem.types.ClassType;
+import org.apache.atlas.typesystem.types.HierarchicalTypeDefinition;
+import org.apache.atlas.typesystem.types.Multiplicity;
+import org.apache.atlas.typesystem.types.TypeSystem;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.repository.MetadataRepository;
-import org.apache.hadoop.metadata.typesystem.types.AttributeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.ClassType;
-import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
-import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeTypeBootstrapper.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeTypeBootstrapper.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeTypeBootstrapper.java
index 2728c97..a0bb2a8 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeTypeBootstrapper.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/BridgeTypeBootstrapper.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.typesystem.types.AttributeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.ClassType;
-import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
-import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.typesystem.types.AttributeDefinition;
+import org.apache.atlas.typesystem.types.ClassType;
+import org.apache.atlas.typesystem.types.HierarchicalTypeDefinition;
+import org.apache.atlas.typesystem.types.Multiplicity;
+import org.apache.atlas.typesystem.types.TypeSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/IBridge.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/IBridge.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/IBridge.java
index 0eaa164..b2ec333 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/IBridge.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/IBridge.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/HiveLineageBridge.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/HiveLineageBridge.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/HiveLineageBridge.java
index ccb1837..4a37a79 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/HiveLineageBridge.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/HiveLineageBridge.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage;
+package org.apache.atlas.bridge.hivelineage;
 
-import org.apache.hadoop.metadata.bridge.ABridge;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage;
-import org.apache.hadoop.metadata.repository.MetadataRepository;
+import org.apache.atlas.bridge.ABridge;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage;
+import org.apache.atlas.repository.MetadataRepository;
 
 import javax.inject.Inject;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
index 7a67f83..06c010d 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage.hook;
+package org.apache.atlas.bridge.hivelineage.hook;
 
 
-import org.apache.hadoop.metadata.bridge.AEntityBean;
+import org.apache.atlas.bridge.AEntityBean;
 
 import java.io.Serializable;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveMetaImporter.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveMetaImporter.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveMetaImporter.java
index ee6d503..a8dd8b7 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveMetaImporter.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveMetaImporter.java
@@ -16,8 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivestructure;
-
+package org.apache.atlas.bridge.hivestructure;
+
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.repository.IRepository;
+import org.apache.atlas.repository.RepositoryException;
+import org.apache.atlas.typesystem.Referenceable;
+import org.apache.atlas.typesystem.types.ClassType;
+import org.apache.atlas.typesystem.types.TypeSystem;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.Database;
@@ -27,12 +33,6 @@ import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.hive.metastore.api.UnknownDBException;
 import org.apache.hadoop.hive.metastore.api.UnknownTableException;
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.repository.IRepository;
-import org.apache.hadoop.metadata.repository.RepositoryException;
-import org.apache.hadoop.metadata.typesystem.Referenceable;
-import org.apache.hadoop.metadata.typesystem.types.ClassType;
-import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.apache.thrift.TException;
 /*
  * Initial pass at one time importer TODO - needs re-write

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveStructureBridge.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveStructureBridge.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveStructureBridge.java
index 8f36b88..2ec3af2 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveStructureBridge.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/hivestructure/HiveStructureBridge.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivestructure;
-
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.bridge.ABridge;
-import org.apache.hadoop.metadata.repository.MetadataRepository;
-import org.apache.hadoop.metadata.typesystem.types.AttributeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.ClassType;
-import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
-import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
-import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
+package org.apache.atlas.bridge.hivestructure;
+
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.bridge.ABridge;
+import org.apache.atlas.repository.MetadataRepository;
+import org.apache.atlas.typesystem.types.AttributeDefinition;
+import org.apache.atlas.typesystem.types.ClassType;
+import org.apache.atlas.typesystem.types.HierarchicalTypeDefinition;
+import org.apache.atlas.typesystem.types.Multiplicity;
+import org.apache.atlas.typesystem.types.TypeSystem;
 
 import javax.inject.Inject;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/module/BridgeModule.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/module/BridgeModule.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/module/BridgeModule.java
index e1b8f63..5f058ad 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/module/BridgeModule.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/bridge/module/BridgeModule.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.module;
+package org.apache.atlas.bridge.module;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.multibindings.MapBinder;
+import org.apache.atlas.RepositoryMetadataModule;
+import org.apache.atlas.bridge.BridgeTypeBootstrapper;
+import org.apache.atlas.bridge.IBridge;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.hadoop.metadata.RepositoryMetadataModule;
-import org.apache.hadoop.metadata.bridge.BridgeTypeBootstrapper;
-import org.apache.hadoop.metadata.bridge.IBridge;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/web/resources/HiveLineageResource.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/web/resources/HiveLineageResource.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/web/resources/HiveLineageResource.java
index a5a84be..13b0838 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/web/resources/HiveLineageResource.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/java/org/apache/hadoop/metadata/web/resources/HiveLineageResource.java
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.web.resources;
+package org.apache.atlas.web.resources;
 
-import org.apache.hadoop.metadata.bridge.hivelineage.HiveLineageBridge;
+import org.apache.atlas.bridge.hivelineage.HiveLineageBridge;
 
 import javax.inject.Singleton;
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/main/resources/bridge-manager.properties
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/resources/bridge-manager.properties b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/resources/bridge-manager.properties
index 7484e32..256b795 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/main/resources/bridge-manager.properties
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/main/resources/bridge-manager.properties
@@ -19,4 +19,4 @@
 
 #BridgeManager.activebridges denotes which bridge defintions to load from the classpath (Comma seperated list of fully qualified class paths)
 #
-BridgeManager.activeBridges=org.apache.hadoop.metadata.bridge.hivelineage.HiveLineageBridge
\ No newline at end of file
+BridgeManager.activeBridges=org.apache.atlas.bridge.hivelineage.HiveLineageBridge
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/BridgeManagerTest.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/BridgeManagerTest.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/BridgeManagerTest.java
index 3690afb..50d6cb7 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/BridgeManagerTest.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/BridgeManagerTest.java
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
-import org.apache.hadoop.metadata.RepositoryMetadataModule;
-import org.apache.hadoop.metadata.repository.MetadataRepository;
+import org.apache.atlas.RepositoryMetadataModule;
+import org.apache.atlas.repository.MetadataRepository;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestBridgeModule.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestBridgeModule.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestBridgeModule.java
index 1913880..240b4b0 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestBridgeModule.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestBridgeModule.java
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
-import org.apache.hadoop.metadata.bridge.module.BridgeModule;
+import org.apache.atlas.bridge.module.BridgeModule;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestGenericBridges.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestGenericBridges.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestGenericBridges.java
index fb9181b..4f05c61 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestGenericBridges.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/TestGenericBridges.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge;
+package org.apache.atlas.bridge;
 
 public class TestGenericBridges {
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/TestHiveLineageBridge.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/TestHiveLineageBridge.java b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/TestHiveLineageBridge.java
index 80b2aa5..ba676f0 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/TestHiveLineageBridge.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/TestHiveLineageBridge.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage;
+package org.apache.atlas.bridge.hivelineage;
 
 import com.google.gson.Gson;
+import org.apache.atlas.MetadataException;
+import org.apache.atlas.bridge.BridgeTypeBootstrapper;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage;
+import org.apache.atlas.bridge.module.BridgeModule;
+import org.apache.atlas.repository.RepositoryException;
 import org.apache.commons.collections.IteratorUtils;
-import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.bridge.BridgeTypeBootstrapper;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage;
-import org.apache.hadoop.metadata.bridge.module.BridgeModule;
-import org.apache.hadoop.metadata.repository.RepositoryException;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Guice;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/bridge-manager.properties
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/bridge-manager.properties b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/bridge-manager.properties
index 7484e32..256b795 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/bridge-manager.properties
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/bridge-manager.properties
@@ -19,4 +19,4 @@
 
 #BridgeManager.activebridges denotes which bridge defintions to load from the classpath (Comma seperated list of fully qualified class paths)
 #
-BridgeManager.activeBridges=org.apache.hadoop.metadata.bridge.hivelineage.HiveLineageBridge
\ No newline at end of file
+BridgeManager.activeBridges=org.apache.atlas.bridge.hivelineage.HiveLineageBridge
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/test-bridge-manager.properties
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/test-bridge-manager.properties b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/test-bridge-manager.properties
index 1b8e8b7..eacd445 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/test-bridge-manager.properties
+++ b/addons/metadata-bridge-parent/metadata-bridge-core/src/test/resources/test-bridge-manager.properties
@@ -19,4 +19,4 @@
 
 #BridgeManager.activebridges denotes which bridge defintions to load from the classpath (Comma seperated list of fully qualified class paths)
 #
-BridgeManager.activeBridges=org.apache.hadoop.metadata.bridge.HiveLineage
\ No newline at end of file
+BridgeManager.activeBridges=org.apache.atlas.bridge.HiveLineage
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-hive/pom.xml
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-hive/pom.xml b/addons/metadata-bridge-parent/metadata-bridge-hive/pom.xml
index 82c703b..36dcee9 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-hive/pom.xml
+++ b/addons/metadata-bridge-parent/metadata-bridge-hive/pom.xml
@@ -21,11 +21,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.hadoop.metadata</groupId>
-        <artifactId>metadata-bridge-parent</artifactId>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>atlas-bridge-parent</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
-    <artifactId>metadata-bridge-hive</artifactId>
+    <artifactId>atlas-bridge-hive</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -93,8 +93,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.hadoop.metadata</groupId>
-                                    <artifactId>metadata-common</artifactId>
+                                    <groupId>org.apache.atlas</groupId>
+                                    <artifactId>atlas-common</artifactId>
                                     <version>0.1-incubating-SNAPSHOT</version>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
index 779211a..7e180d2 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineage.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage.hook;
+package org.apache.atlas.bridge.hivelineage.hook;
 
 import java.io.Serializable;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfo.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfo.java b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfo.java
index bba0649..379f82b 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfo.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfo.java
@@ -16,9 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage.hook;
+package org.apache.atlas.bridge.hivelineage.hook;
 
 import com.google.gson.Gson;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage.CreateColumns;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage.GroupBy;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage.QueryColumns;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage.SourceTables;
+import org.apache.atlas.bridge.hivelineage.hook.HiveLineage.WhereClause;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker;
@@ -34,11 +39,6 @@ import org.apache.hadoop.hive.ql.parse.HiveParser;
 import org.apache.hadoop.hive.ql.parse.ParseDriver;
 import org.apache.hadoop.hive.ql.parse.ParseException;
 import org.apache.hadoop.hive.ql.parse.SemanticException;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage.CreateColumns;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage.GroupBy;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage.QueryColumns;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage.SourceTables;
-import org.apache.hadoop.metadata.bridge.hivelineage.hook.HiveLineage.WhereClause;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/Hook.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/Hook.java b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/Hook.java
index 5d41c4e..8ce316d 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/Hook.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-hive/src/main/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/Hook.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage.hook;
+package org.apache.atlas.bridge.hivelineage.hook;
 
 
 import com.google.gson.Gson;
@@ -203,8 +203,8 @@ public class Hook implements ExecuteWithHookContext {
     throws Exception {
         String postUri = String
                 .format("http://%s:%s%s", METADATA_HOST, METADATA_PORT, METADATA_PATH);
-        if (conf.getTrimmed("hadoop.metadata.hive.hook.uri") != null) {
-            postUri = conf.getTrimmed("hadoop.metadata.hive.hook.uri");
+        if (conf.getTrimmed("atlas.hive.hook.uri") != null) {
+            postUri = conf.getTrimmed("atlas.hive.hook.uri");
         }
         Gson gson = new Gson();
         String gsonString = gson.toJson(hookData);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/metadata-bridge-hive/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfoTest.java
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/metadata-bridge-hive/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfoTest.java b/addons/metadata-bridge-parent/metadata-bridge-hive/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfoTest.java
index a2f655a..3038c99 100755
--- a/addons/metadata-bridge-parent/metadata-bridge-hive/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfoTest.java
+++ b/addons/metadata-bridge-parent/metadata-bridge-hive/src/test/java/org/apache/hadoop/metadata/bridge/hivelineage/hook/HiveLineageInfoTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.metadata.bridge.hivelineage.hook;
+package org.apache.atlas.bridge.hivelineage.hook;
 
 import com.google.gson.Gson;
 import org.apache.hadoop.hive.ql.parse.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/addons/metadata-bridge-parent/pom.xml
----------------------------------------------------------------------
diff --git a/addons/metadata-bridge-parent/pom.xml b/addons/metadata-bridge-parent/pom.xml
index 3234938..6ce816e 100755
--- a/addons/metadata-bridge-parent/pom.xml
+++ b/addons/metadata-bridge-parent/pom.xml
@@ -21,15 +21,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.hadoop.metadata</groupId>
-        <artifactId>metadata-governance</artifactId>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>apache-atlas</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
-    <artifactId>metadata-bridge-parent</artifactId>
+    <artifactId>atlas-bridge-parent</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>metadata-bridge-core</module>
-        <module>metadata-bridge-hive</module>
+        <module>atlas-bridge-core</module>
+        <module>atlas-bridge-hive</module>
     </modules>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 1072d4b..be4c77b 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,19 +22,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>metadata-governance</artifactId>
-        <groupId>org.apache.hadoop.metadata</groupId>
+        <artifactId>apache-atlas</artifactId>
+        <groupId>org.apache.atlas</groupId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
-    <artifactId>metadata-client</artifactId>
-    <description>Apache Metadata Client</description>
-    <name>Apache Metadata Client</name>
+    <artifactId>atlas-client</artifactId>
+    <description>Apache Atlas Client</description>
+    <name>Apache Atlas Client</name>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-typesystem</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/dashboard/v1/js/controllers.js
----------------------------------------------------------------------
diff --git a/dashboard/v1/js/controllers.js b/dashboard/v1/js/controllers.js
index b7d4349..8c086ab 100755
--- a/dashboard/v1/js/controllers.js
+++ b/dashboard/v1/js/controllers.js
@@ -24,9 +24,9 @@ DgcControllers.controller("ListController", ['$scope','$http', function($scope,
 			$scope.executeSearch = function executeSearch() {
 				 $scope.SearchQuery=$scope.query;   
 				$scope.iswiki=false;	
-				//$http.get('http://162.249.6.76:21000/api/metadata/entities/list/'+$scope.query)
+				//$http.get('http://162.249.6.76:21000/api/atlas/entities/list/'+$scope.query)
 		var searchQry=$scope.query.split(",");
-				$http.get('http://162.249.6.76:21000/api/metadata/discovery/search/fulltext?depth=1&'+searchQry[0]+'&'+searchQry[1])
+				$http.get('http://162.249.6.76:21000/api/atlas/discovery/search/fulltext?depth=1&'+searchQry[0]+'&'+searchQry[1])
 				.success(function (data) {
 
 					$scope.iserror=false;
@@ -59,7 +59,7 @@ DgcControllers.controller("DefinitionController", ['$scope','$http','$routeParam
 					$scope.selectedDefination={
 					"path":"wiki.html"
 					};
-					$http.get('http://162.249.6.76:21000/api/metadata/entities/definition/'+$routeParams.Id)
+					$http.get('http://162.249.6.76:21000/api/atlas/entities/definition/'+$routeParams.Id)
 					.success(function (data) {
 						$scope.iserror1=false;						
 						 $scope.details=angular.fromJson(data.definition);
@@ -87,7 +87,7 @@ DgcControllers.controller("LineageController", ['$scope','$http','$routeParams',
             
 
 
-$http.get('http://162.249.6.76:21000/api/metadata/discovery/search/relationships/'+$routeParams.Id+'?depth=3&&edgesToFollow=HiveLineage.sourceTables.0,HiveLineage.sourceTables.1,HiveLineage.tableName')
+$http.get('http://162.249.6.76:21000/api/atlas/discovery/search/relationships/'+$routeParams.Id+'?depth=3&&edgesToFollow=HiveLineage.sourceTables.0,HiveLineage.sourceTables.1,HiveLineage.tableName')
 					.success(function (data) {
 						$scope.iserror1=false;						
 						 $scope.lineage=angular.fromJson(data);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/dashboard/v2/public/modules/details/detailsResource.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/public/modules/details/detailsResource.js b/dashboard/v2/public/modules/details/detailsResource.js
index f3a207b..7ec62fe 100755
--- a/dashboard/v2/public/modules/details/detailsResource.js
+++ b/dashboard/v2/public/modules/details/detailsResource.js
@@ -19,7 +19,7 @@
 'use strict';
 
 angular.module('dgc.details').factory('DetailsResource', ['$resource', function($resource) {
-    return $resource('/api/metadata/entities/definition/:id', {}, {
+    return $resource('/api/atlas/entities/definition/:id', {}, {
         get: {
             method: 'GET',
             transformResponse: function(data) {

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/dashboard/v2/public/modules/lineage/lineageResource.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/public/modules/lineage/lineageResource.js b/dashboard/v2/public/modules/lineage/lineageResource.js
index 6aa6ada..95e6230 100755
--- a/dashboard/v2/public/modules/lineage/lineageResource.js
+++ b/dashboard/v2/public/modules/lineage/lineageResource.js
@@ -19,7 +19,7 @@
 'use strict';
 
 angular.module('dgc.lineage').factory('LineageResource', ['$resource', function($resource) {
-    return $resource('/api/metadata/discovery/search/relationships/:id', {
+    return $resource('/api/atlas/discovery/search/relationships/:id', {
         depth: 3,
         edgesToFollow: 'HiveLineage.sourceTables.0,HiveLineage.sourceTables.1,HiveLineage.sourceTables.2,HiveLineage.tableName'
     });

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/dashboard/v2/public/modules/search/searchResource.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/public/modules/search/searchResource.js b/dashboard/v2/public/modules/search/searchResource.js
index 4010bd6..74bfa4e 100755
--- a/dashboard/v2/public/modules/search/searchResource.js
+++ b/dashboard/v2/public/modules/search/searchResource.js
@@ -19,7 +19,7 @@
 'use strict';
 
 angular.module('dgc.search').factory('SearchResource', ['$resource', function($resource) {
-    return $resource('/api/metadata/discovery/search/fulltext', {}, {
+    return $resource('/api/atlas/discovery/search/fulltext', {}, {
         search: {
             'method': 'GET',
             'responseType': 'json',

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/dashboard/v3/js/controllers.js
----------------------------------------------------------------------
diff --git a/dashboard/v3/js/controllers.js b/dashboard/v3/js/controllers.js
index 70b8efe..085cbd8 100755
--- a/dashboard/v3/js/controllers.js
+++ b/dashboard/v3/js/controllers.js
@@ -52,7 +52,7 @@ DgcControllers.controller("headerController", ['$scope', '$window', '$location',
 
 DgcControllers.controller("footerController", ['$scope','$http', function($scope, $http)
     {
-        $http.get('/api/metadata/admin/version')
+        $http.get('/api/atlas/admin/version')
             .success(function (data) {
                 $scope.iserror1=false;
                 $scope.apiVersion=data.Version;
@@ -70,7 +70,7 @@ DgcControllers.controller("footerController", ['$scope','$http', function($scope
 DgcControllers.controller("NavController", ['$scope','$http', '$filter', 'sharedProperties', function($scope, $http, $filter, sharedProperties)
 {
 
-    $http.get('/api/metadata/types/traits/list')
+    $http.get('/api/atlas/types/traits/list')
         .success(function (data) {
             $scope.iserror1=false;
             $scope.leftnav=angular.fromJson(data.results);
@@ -150,7 +150,7 @@ DgcControllers.controller("ListController", ['$scope','$http', '$filter','$state
             });
 
 
-            $http.get('/api/metadata/discovery/search?query='+$scope.SearchQuery)
+            $http.get('/api/atlas/discovery/search?query='+$scope.SearchQuery)
                 .success(function (data) {
                     $scope.iserror=false;
                     $scope.entities=angular.fromJson(data.results.rows);
@@ -227,7 +227,7 @@ DgcControllers.controller("ListController", ['$scope','$http', '$filter','$state
     };
     //click value to textbox
         $scope.getGuidName=function getGuidName(val){
-            $http.get('/api/metadata/entities/definition/'+val)
+            $http.get('/api/atlas/entities/definition/'+val)
                 .success(function (data) {
                     $scope.iserror1=false;
                     if(!$scope.isUndefined(data.results)){
@@ -340,7 +340,7 @@ DgcControllers.controller("DefinitionController", ['$scope','$http', '$statePara
     };
 //onclick to textbox
 					$scope.getGuidName=function getGuidName(val){
-					$http.get('/api/metadata/entities/definition/'+val)
+					$http.get('/api/atlas/entities/definition/'+val)
 						.success(function (data) {
 						$scope.iserror1=false;
 							if(!$scope.isUndefined(data.results)){								
@@ -361,7 +361,7 @@ DgcControllers.controller("DefinitionController", ['$scope','$http', '$statePara
         $scope.searchqry=sharedProperties.getQuery();
         $scope.datatype1=sharedProperties.getProperty();
 
-        $http.get('/api/metadata/entities/definition/'+$stateParams.Id)
+        $http.get('/api/atlas/entities/definition/'+$stateParams.Id)
                 .success(function (data) {
                     $scope.iserror1=false;
                 $scope.details=  angular.fromJson(data.results);
@@ -381,7 +381,7 @@ DgcControllers.controller("DefinitionController", ['$scope','$http', '$statePara
 
         $scope.getSchema= function (tableName) {
 
-            $http.get('/api/metadata/lineage/hive/schema/'+tableName)
+            $http.get('/api/atlas/lineage/hive/schema/'+tableName)
                 .success(function (data) {
                     $scope.iserror1=false;
                     $scope.schema=  angular.fromJson(data.results.rows);
@@ -403,7 +403,7 @@ $scope.getLinegae= function (tableName) {
             var arrmyalias=[];
 			   var datatypes=[];
 			   var tags=[];
-            $http.get('/api/metadata/lineage/hive/outputs/'+tableName)
+            $http.get('/api/atlas/lineage/hive/outputs/'+tableName)
                 .success(function (data) {
                     $scope.iserror1=false;
                     $scope.lineage=  angular.fromJson(data.results.rows);
@@ -445,7 +445,7 @@ $scope.getLinegae= function (tableName) {
                             newarrvts.push(item);
                             uniquevts[item.Name] = item;
 
-							  var url="/api/metadata/entities/definition/"+item.Name;
+							  var url="/api/atlas/entities/definition/"+item.Name;
 							   arr.push($http.get(url)); 
                         }
                     });
@@ -795,7 +795,7 @@ $scope.getLinegaeforinput= function (tableName) {
             var arrmyalias=[];
 			   var datatypes=[];
 			   var tags=[];
-            $http.get('/api/metadata/lineage/hive/inputs/'+tableName)
+            $http.get('/api/atlas/lineage/hive/inputs/'+tableName)
                 .success(function (data) {
                     $scope.iserror1=false;
                     $scope.lineage=  angular.fromJson(data.results.rows);
@@ -836,7 +836,7 @@ $scope.getLinegaeforinput= function (tableName) {
                             newarrvts.push(item);
                             uniquevts[item.Name] = item;
 
-							  var url="/api/metadata/entities/definition/"+item.Name;
+							  var url="/api/atlas/entities/definition/"+item.Name;
 							   arr.push($http.get(url));
 
                             //getLienageGuidName(item.Name);
@@ -1228,7 +1228,7 @@ DgcControllers.controller("GuidController", ['$scope','$http', '$filter','$state
 $scope.getGuidName=function getGuidName(val){
   
         $scope.gnew=[];
-                    $http.get('/api/metadata/entities/definition/'+val)
+                    $http.get('/api/atlas/entities/definition/'+val)
                         .success(function (data) {
                         $scope.iserror1=false;
                             if(!$scope.isUndefined(data.results)){  

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index f24ec6d..2a98dbc 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,13 +22,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.hadoop.metadata</groupId>
-        <artifactId>metadata-governance</artifactId>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>apache-atlas</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
-    <artifactId>metadata-docs</artifactId>
-    <description>Apache Metadata Documentation</description>
-    <name>Apache Metadata Documentation</name>
+    <artifactId>atlas-docs</artifactId>
+    <description>Apache Atlas Documentation</description>
+    <name>Apache Atlas Documentation</name>
 
     <properties>
         <skipTests>true</skipTests>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81520f1..a0019d8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.hadoop.metadata</groupId>
-    <artifactId>metadata-governance</artifactId>
+    <groupId>org.apache.atlas</groupId>
+    <artifactId>apache-atlas</artifactId>
     <version>0.1-incubating-SNAPSHOT</version>
     <description>Metadata Management and Data Governance Platform over Hadoop</description>
-    <name>metadata-governance</name>
+    <name>apache-atlas</name>
     <packaging>pom</packaging>
     <url>http://www.apache.org/</url>
 
@@ -489,35 +489,35 @@
                 <version>${tinkerpop.version}</version>
             </dependency>
 
-            <!--  metadata modules -->
+            <!--  atlas modules -->
             <dependency>
-                <groupId>org.apache.hadoop.metadata</groupId>
-                <artifactId>metadata-typesystem</artifactId>
+                <groupId>org.apache.atlas</groupId>
+                <artifactId>atlas-typesystem</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.hadoop.metadata</groupId>
-                <artifactId>metadata-repository</artifactId>
+                <groupId>org.apache.atlas</groupId>
+                <artifactId>atlas-repository</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.hadoop.metadata</groupId>
-                <artifactId>metadata-webapp</artifactId>
+                <groupId>org.apache.atlas</groupId>
+                <artifactId>atlas-webapp</artifactId>
                 <version>${project.version}</version>
                 <classifier>classes</classifier>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.hadoop.metadata</groupId>
-                <artifactId>metadata-client</artifactId>
+                <groupId>org.apache.atlas</groupId>
+                <artifactId>atlas-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.hadoop.metadata</groupId>
-                <artifactId>metadata-client</artifactId>
+                <groupId>org.apache.atlas</groupId>
+                <artifactId>atlas-client</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
@@ -894,7 +894,7 @@
                         <descriptor>src/main/assemblies/standalone-package.xml</descriptor>
                         <descriptor>src/main/assemblies/src-package.xml</descriptor>
                     </descriptors>
-                    <finalName>apache-metadata-governance-${project.version}</finalName>
+                    <finalName>apache-atlas-${project.version}</finalName>
                 </configuration>
             </plugin>
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index c626962..fd9d19e 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -24,24 +24,24 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.hadoop.metadata</groupId>
-        <artifactId>metadata-governance</artifactId>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>apache-atlas</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
-    <artifactId>metadata-repository</artifactId>
-    <description>Apache Metadata Repository Module</description>
-    <name>Apache Metadata Repository</name>
+    <artifactId>atlas-repository</artifactId>
+    <description>Apache Atlas Repository Module</description>
+    <name>Apache Atlas Repository</name>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-typesystem</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hadoop.metadata</groupId>
-            <artifactId>metadata-client</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-client</artifactId>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/repository/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/repository/src/test/resources/application.properties b/repository/src/test/resources/application.properties
index e14ffb8..32d40b0 100755
--- a/repository/src/test/resources/application.properties
+++ b/repository/src/test/resources/application.properties
@@ -19,27 +19,27 @@
 #########  Graph Database Configs  #########
 #Refer http://s3.thinkaurelius.com/docs/titan/0.5.1/titan-config-ref.html
 # Graph Storage
-metadata.graph.storage.backend=inmemory
+atlas.graph.storage.backend=inmemory
 
 
 # Graph Search Index
-metadata.graph.index.search.backend=elasticsearch
-metadata.graph.index.search.directory=./target/data/es
-metadata.graph.index.search.elasticsearch.client-only=false
-metadata.graph.index.search.elasticsearch.local-mode=true
+atlas.graph.index.search.backend=elasticsearch
+atlas.graph.index.search.directory=./target/data/es
+atlas.graph.index.search.elasticsearch.client-only=false
+atlas.graph.index.search.elasticsearch.local-mode=true
 
 
 #########  Hive Lineage Configs  #########
-#metadata.lineage.hive.table.type.name=DataSet
-#metadata.lineage.hive.process.type.name=Process
-#metadata.lineage.hive.process.inputs.name=inputs
-#metadata.lineage.hive.process.outputs.name=outputs
+#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
-#metadata.lineage.hive.table.schema.query=hive_table where name=?, columns
+#atlas.lineage.hive.table.schema.query=hive_table where name=?, columns
 
 
 #########  Security Properties  #########
 
 # SSL config
-metadata.enableTLS=false
+atlas.enableTLS=false

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/bin/cputil.py
----------------------------------------------------------------------
diff --git a/src/bin/cputil.py b/src/bin/cputil.py
index a7590dc..53ba3f0 100755
--- a/src/bin/cputil.py
+++ b/src/bin/cputil.py
@@ -18,7 +18,7 @@
 import os
 import sys
 
-import metadata_config as mc
+import atlas_config as mc
 
 DEFAULT_JVM_OPTS="-Xmx1024m"
 
@@ -45,7 +45,7 @@ def main():
                        + os.path.join(web_app_dir, "metadata", "WEB-INF", "lib", "*" )  + p \
                        + os.path.join(metadata_home, "libext", "*")
 
-    process = mc.java("org.apache.hadoop.metadata.util.CredentialProviderUtility", sys.argv[1:], metadata_classpath, jvm_opts_list)
+    process = mc.java("org.apache.atlas.util.CredentialProviderUtility", sys.argv[1:], metadata_classpath, jvm_opts_list)
     process.wait()
 
 if __name__ == '__main__':

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/bin/quick_start.py
----------------------------------------------------------------------
diff --git a/src/bin/quick_start.py b/src/bin/quick_start.py
index 6f67716..73f6406 100755
--- a/src/bin/quick_start.py
+++ b/src/bin/quick_start.py
@@ -18,7 +18,7 @@
 import os
 import sys
 
-import metadata_config as mc
+import atlas_config as mc
 
 METADATA_LOG_OPTS="-Dmetadata.log.dir=%s"
 METADATA_COMMAND_OPTS="-Dmetadata.home=%s"
@@ -51,10 +51,10 @@ def main():
                        + os.path.join(web_app_dir, "metadata", "WEB-INF", "lib", "*" )  + p \
                        + os.path.join(metadata_home, "libext", "*")
 
-    process = mc.java("org.apache.hadoop.metadata.examples.QuickStart", sys.argv[1:], metadata_classpath, jvm_opts_list)
+    process = mc.java("org.apache.atlas.examples.QuickStart", sys.argv[1:], metadata_classpath, jvm_opts_list)
     process.wait()
 
-    print "Example data added to Metadata Server!!!\n"
+    print "Example data added to Apache Atlas Server!!!\n"
 
 if __name__ == '__main__':
     try:

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/build/enunciate.xml
----------------------------------------------------------------------
diff --git a/src/build/enunciate.xml b/src/build/enunciate.xml
index 89ff017..777b496 100755
--- a/src/build/enunciate.xml
+++ b/src/build/enunciate.xml
@@ -18,9 +18,9 @@
 
 <enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.29.xsd">
-    <api-import pattern="org.apache.hadoop.metadata.web.resources.*"/>
+    <api-import pattern="org.apache.atlas.web.resources.*"/>
     <services>
-        <rest defaultRestSubcontext="/api/metadata/">
+        <rest defaultRestSubcontext="/api/atlas/">
             <custom-resource-parameter-annotation
                     qualifiedName="org.glassfish.jersey.media.multipart.FormDataParam"/>
         </rest>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/conf/application.properties
----------------------------------------------------------------------
diff --git a/src/conf/application.properties b/src/conf/application.properties
index 4610232..5818701 100755
--- a/src/conf/application.properties
+++ b/src/conf/application.properties
@@ -18,30 +18,30 @@
 
 #########  Graph Database Configs  #########
 # Graph Storage
-metadata.graph.storage.backend=berkeleyje
-metadata.graph.storage.directory=data/berkley
+atlas.graph.storage.backend=berkeleyje
+atlas.graph.storage.directory=data/berkley
 
 # Graph Search Index
-metadata.graph.index.search.backend=elasticsearch
-metadata.graph.index.search.directory=data/es
-metadata.graph.index.search.elasticsearch.client-only=false
-metadata.graph.index.search.elasticsearch.local-mode=true
-metadata.graph.index.search.elasticsearch.create.sleep=2000
+atlas.graph.index.search.backend=elasticsearch
+atlas.graph.index.search.directory=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
 
 #########  Hive Lineage Configs  #########
 # This models reflects the base super types for Data and Process
-#metadata.lineage.hive.table.type.name=DataSet
-#metadata.lineage.hive.process.type.name=Process
-#metadata.lineage.hive.process.inputs.name=inputs
-#metadata.lineage.hive.process.outputs.name=outputs
+#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
-#metadata.lineage.hive.table.schema.query=hive_table where name=?, columns
+#atlas.lineage.hive.table.schema.query=hive_table where name=?, columns
 
 
 #########  Security Properties  #########
 
 # SSL config
-metadata.enableTLS=false
+atlas.enableTLS=false
 
 #########  Security Properties  #########

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/conf/client.properties
----------------------------------------------------------------------
diff --git a/src/conf/client.properties b/src/conf/client.properties
index 730c791..b64755f 100755
--- a/src/conf/client.properties
+++ b/src/conf/client.properties
@@ -20,7 +20,7 @@
 
 # SSL config
 
-metadata.enableTLS=false
+atlas.enableTLS=false
 truststore.file=/path/to/truststore.jks
 cert.stores.credential.provider.path=jceks://file/path/to/credentialstore.jceks
 # following only required for 2-way SSL
@@ -29,8 +29,8 @@ keystore.file=/path/to/keystore.jks
 # Authentication config
 
 # enabled:  true or false
-metadata.http.authentication.enabled=false
+atlas.http.authentication.enabled=false
 # type:  simple or kerberos
-metadata.http.authentication.type=simple
+atlas.http.authentication.type=simple
 
 #########  Security Properties  #########

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/conf/log4j.xml
----------------------------------------------------------------------
diff --git a/src/conf/log4j.xml b/src/conf/log4j.xml
index d6525a3..11cf10a 100755
--- a/src/conf/log4j.xml
+++ b/src/conf/log4j.xml
@@ -28,7 +28,7 @@
     </appender>
 
     <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${metadata.log.dir}/${metadata.log.file}"/>
+        <param name="File" value="${atlas.log.dir}/${atlas.log.file}"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -37,7 +37,7 @@
     </appender>
 
     <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${metadata.log.dir}/audit.log"/>
+        <param name="File" value="${atlas.log.dir}/audit.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -45,7 +45,7 @@
         </layout>
     </appender>
 
-    <logger name="org.apache.hadoop.metadata" additivity="false">
+    <logger name="org.apache.atlas" additivity="false">
         <level value="debug"/>
         <appender-ref ref="FILE"/>
     </logger>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/main/assemblies/src-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/src-package.xml b/src/main/assemblies/src-package.xml
index 3804f0c..c304b81 100755
--- a/src/main/assemblies/src-package.xml
+++ b/src/main/assemblies/src-package.xml
@@ -23,7 +23,7 @@
         <format>tar.gz</format>
     </formats>
     <id>sources</id>
-    <baseDirectory>apache-metadata-sources-${project.version}</baseDirectory>
+    <baseDirectory>apache-atlas-sources-${project.version}</baseDirectory>
     <fileSets>
         <fileSet>
             <directory>.</directory>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/main/assemblies/standalone-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/standalone-package.xml b/src/main/assemblies/standalone-package.xml
index bdfe4f5..8c48b22 100755
--- a/src/main/assemblies/standalone-package.xml
+++ b/src/main/assemblies/standalone-package.xml
@@ -25,7 +25,7 @@
         <format>dir</format>
     </formats>
     <id>bin</id>
-    <baseDirectory>metadata-${project.version}</baseDirectory>
+    <baseDirectory>apache-atlas-${project.version}</baseDirectory>
     <fileSets>
         <fileSet>
             <directory>src/conf/</directory>
@@ -103,9 +103,9 @@
 
     <files>
         <file>
-            <source>webapp/target/metadata-webapp-${project.version}.war</source>
+            <source>webapp/target/atlas-webapp-${project.version}.war</source>
             <outputDirectory>server/webapp</outputDirectory>
-            <destName>metadata.war</destName>
+            <destName>atlas.war</destName>
         </file>
     </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/main/examples/hive-data-model.json
----------------------------------------------------------------------
diff --git a/src/main/examples/hive-data-model.json b/src/main/examples/hive-data-model.json
index 56601c3..d05ecb3 100755
--- a/src/main/examples/hive-data-model.json
+++ b/src/main/examples/hive-data-model.json
@@ -157,7 +157,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_process",
       "attributeDefinitions":[
         {
@@ -256,7 +256,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_function",
       "attributeDefinitions":[
         {
@@ -337,7 +337,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_type",
       "attributeDefinitions":[
         {
@@ -382,7 +382,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_table",
       "attributeDefinitions":[
         {
@@ -508,7 +508,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_partition",
       "attributeDefinitions":[
         {
@@ -580,7 +580,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_storagedesc",
       "attributeDefinitions":[
         {
@@ -688,7 +688,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_index",
       "attributeDefinitions":[
         {
@@ -787,7 +787,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_role",
       "attributeDefinitions":[
         {
@@ -823,7 +823,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_db",
       "attributeDefinitions":[
         {
@@ -886,7 +886,7 @@
       "superTypes":[
 
       ],
-      "hierarchicalMetaTypeName":"org.apache.hadoop.metadata.typesystem.types.ClassType",
+      "hierarchicalMetaTypeName":"org.apache.atlas.typesystem.types.ClassType",
       "typeName":"hive_column",
       "attributeDefinitions":[
         {


Mime
View raw message