BUG-32766 Code cleanup and refactoring. Contributed by Venkatesh Seetharam

falcontypes/pom.xml → addons/falcontypes/pom.xml

@@ -17,14 +17,16 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <!--
         <parent>
             <artifactId>metadata-governance</artifactId>
             <groupId>org.apache.hadoop.metadata</groupId>
             <version>0.1-incubating-SNAPSHOT</version>
         </parent>
+    -->
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>metadata-falcontypes</artifactId>

falcontypes/src/main/java/org/apache/metadata/falcon/FalconImporter.java → addons/falcontypes/src/main/java/org/apache/metadata/falcon/FalconImporter.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,11 +34,11 @@ import org.apache.hadoop.metadata.MetadataException;
 import org.apache.hadoop.metadata.Referenceable;
 import org.apache.hadoop.metadata.Struct;
 import org.apache.hadoop.metadata.repository.MetadataRepository;
-import org.apache.hadoop.metadata.types.EnumType;
-import org.apache.hadoop.metadata.types.Multiplicity;
-import org.apache.hadoop.metadata.types.StructType;
-import org.apache.hadoop.metadata.types.TraitType;
-import org.apache.hadoop.metadata.types.TypeSystem;
+import org.apache.hadoop.metadata.typesystem.types.EnumType;
+import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
+import org.apache.hadoop.metadata.typesystem.types.StructType;
+import org.apache.hadoop.metadata.typesystem.types.TraitType;
+import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.parboiled.common.StringUtils;
 
 import javax.xml.bind.JAXBException;

falcontypes/src/main/java/org/apache/metadata/falcon/FalconTypeSystem.java → addons/falcontypes/src/main/java/org/apache/metadata/falcon/FalconTypeSystem.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,16 +20,17 @@ package org.apache.metadata.falcon;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.types.AttributeDefinition;
-import org.apache.hadoop.metadata.types.ClassType;
-import org.apache.hadoop.metadata.types.DataTypes;
-import org.apache.hadoop.metadata.types.EnumTypeDefinition;
-import org.apache.hadoop.metadata.types.EnumValue;
-import org.apache.hadoop.metadata.types.HierarchicalTypeDefinition;
-import org.apache.hadoop.metadata.types.Multiplicity;
-import org.apache.hadoop.metadata.types.StructTypeDefinition;
-import org.apache.hadoop.metadata.types.TraitType;
-import org.apache.hadoop.metadata.types.TypeSystem;
+import org.apache.hadoop.metadata.typesystem.types.AttributeDefinition;
+import org.apache.hadoop.metadata.typesystem.types.ClassType;
+import org.apache.hadoop.metadata.typesystem.types.DataTypes;
+import org.apache.hadoop.metadata.typesystem.types.EnumTypeDefinition;
+import org.apache.hadoop.metadata.typesystem.types.EnumValue;
+import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
+import org.apache.hadoop.metadata.typesystem.types.IDataType;
+import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
+import org.apache.hadoop.metadata.typesystem.types.StructTypeDefinition;
+import org.apache.hadoop.metadata.typesystem.types.TraitType;
+import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,16 +39,22 @@ import java.util.List;
 
 public class FalconTypeSystem {
     public static final Logger LOG = LoggerFactory.getLogger(FalconTypeSystem.class);
-
-    private static FalconTypeSystem INSTANCE;
     public static final TypeSystem TYPE_SYSTEM = TypeSystem.getInstance();
 
     private List<StructTypeDefinition> structTypeDefinitions = new ArrayList<>();
     private List<HierarchicalTypeDefinition<TraitType>> traitTypeDefinitions = new ArrayList<>();
 
+    private FalconTypeSystem() throws MetadataException {
+        HierarchicalTypeDefinition<ClassType> cluster = defineCluster();
+        //TODO define feed and process
+
+        TYPE_SYSTEM.defineTypes(ImmutableList.copyOf(structTypeDefinitions), ImmutableList.copyOf(traitTypeDefinitions),
+                ImmutableList.of(cluster));
+    }
+
     public static FalconTypeSystem getInstance() throws MetadataException {
         if (INSTANCE == null) {
-            synchronized(LOG) {
+            synchronized (LOG) {
                 if (INSTANCE == null) {
                     INSTANCE = new FalconTypeSystem();
                 }
@@ -56,15 +63,6 @@ public class FalconTypeSystem {
         return INSTANCE;
     }
 
-    private FalconTypeSystem() throws MetadataException {
-        HierarchicalTypeDefinition<ClassType> cluster = defineCluster();
-        //TODO define feed and process
-
-        TYPE_SYSTEM.defineTypes(ImmutableList.copyOf(structTypeDefinitions), ImmutableList.copyOf(traitTypeDefinitions),
-                ImmutableList.of(cluster));
-
-    }
-
     private HierarchicalTypeDefinition<ClassType> defineCluster() throws MetadataException {
         defineACL();
         defineClusterInterface();
@@ -80,7 +78,8 @@ public class FalconTypeSystem {
                 new AttributeDefinition("properties", TYPE_SYSTEM.defineMapType(DataTypes.STRING_TYPE, DataTypes.STRING_TYPE).getName(), Multiplicity.OPTIONAL, false, null),
         };
         HierarchicalTypeDefinition<ClassType> cluster =
-                new HierarchicalTypeDefinition<>(ClassType.class, DefinedTypes.CLUSTER.name(), ImmutableList.<String>of(), attributeDefinitions);
+                new HierarchicalTypeDefinition<>(ClassType.class, DefinedTypes.CLUSTER.name(),
+                        ImmutableList.<String>of(), attributeDefinitions);
         LOG.debug("Created definition for " + DefinedTypes.CLUSTER.name());
         return cluster;
     }
@@ -109,8 +108,10 @@ public class FalconTypeSystem {
         TYPE_SYSTEM.defineEnumType(locationType);
 
         AttributeDefinition[] attributeDefinitions = new AttributeDefinition[]{
-                new AttributeDefinition("type", DefinedTypes.CLUSTER_LOCATION_TYPE.name(), Multiplicity.REQUIRED, false, null),
-                new AttributeDefinition("path", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("type", DefinedTypes.CLUSTER_LOCATION_TYPE.name(),
+                        Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("path", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.REQUIRED, false, null),
         };
         LOG.debug("Created definition for " + DefinedTypes.CLUSTER_LOCATION.name());
         StructTypeDefinition location = new StructTypeDefinition(DefinedTypes.CLUSTER_LOCATION.name(), attributeDefinitions);
@@ -133,9 +134,12 @@ public class FalconTypeSystem {
         TYPE_SYSTEM.defineEnumType(interfaceType);
 
         AttributeDefinition[] attributeDefinitions = new AttributeDefinition[]{
-                new AttributeDefinition("type", DefinedTypes.CLUSTER_INTERFACE_TYPE.name(), Multiplicity.REQUIRED, false, null),
-                new AttributeDefinition("endpoint", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null),
-                new AttributeDefinition("version", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("type", DefinedTypes.CLUSTER_INTERFACE_TYPE.name(),
+                        Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("endpoint", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("version", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.REQUIRED, false, null),
         };
         LOG.debug("Created definition for " + DefinedTypes.CLUSTER_INTERFACE.name());
         StructTypeDefinition interfaceEntity = new StructTypeDefinition(DefinedTypes.CLUSTER_INTERFACE.name(), attributeDefinitions);
@@ -156,9 +160,12 @@ public class FalconTypeSystem {
 
     private StructTypeDefinition defineACL() {
         AttributeDefinition[] attributeDefinitions = new AttributeDefinition[]{
-                new AttributeDefinition("owner", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null),
-                new AttributeDefinition("group", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null),
-                new AttributeDefinition("permission", DataTypes.STRING_TYPE.getName(), Multiplicity.OPTIONAL, false, null),
+                new AttributeDefinition("owner", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("group", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.REQUIRED, false, null),
+                new AttributeDefinition("permission", DataTypes.STRING_TYPE.getName(),
+                        Multiplicity.OPTIONAL, false, null),
         };
         LOG.debug("Created definition for " + DefinedTypes.ACL.name());
         StructTypeDefinition acl = new StructTypeDefinition(DefinedTypes.ACL.name(), attributeDefinitions);

falcontypes/src/test/java/org/apache/metadata/falcon/FalconImporterTest.java → addons/falcontypes/src/test/java/org/apache/metadata/falcon/FalconImporterTest.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

falcontypes/src/test/java/org/apache/metadata/falcon/FalconTypeSystemTest.java → addons/falcontypes/src/test/java/org/apache/metadata/falcon/FalconTypeSystemTest.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hivetypes/pom.xml → addons/hivetypes/pom.xml

@@ -17,14 +17,16 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <!--
         <parent>
             <artifactId>metadata-governance</artifactId>
             <groupId>org.apache.hadoop.metadata</groupId>
             <version>0.1-incubating-SNAPSHOT</version>
         </parent>
+    -->
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>metadata-hivetypes</artifactId>

hivetypes/src/main/java/org/apache/hadoop/metadata/hivetypes/HiveImporter.java → addons/hivetypes/src/main/java/org/apache/hadoop/metadata/hivetypes/HiveImporter.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,12 +34,12 @@ import org.apache.hadoop.metadata.MetadataException;
 import org.apache.hadoop.metadata.Referenceable;
 import org.apache.hadoop.metadata.Struct;
 import org.apache.hadoop.metadata.repository.MetadataRepository;
-import org.apache.hadoop.metadata.storage.IRepository;
-import org.apache.hadoop.metadata.storage.Id;
-import org.apache.hadoop.metadata.storage.RepositoryException;
-import org.apache.hadoop.metadata.types.IDataType;
-import org.apache.hadoop.metadata.types.Multiplicity;
-import org.apache.hadoop.metadata.types.StructType;
+import org.apache.hadoop.metadata.typesystem.persistence.IRepository;
+import org.apache.hadoop.metadata.typesystem.persistence.Id;
+import org.apache.hadoop.metadata.typesystem.persistence.RepositoryException;
+import org.apache.hadoop.metadata.typesystem.types.IDataType;
+import org.apache.hadoop.metadata.typesystem.types.Multiplicity;
+import org.apache.hadoop.metadata.typesystem.types.StructType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,10 +48,9 @@ import java.util.List;
 
 public class HiveImporter {
 
-    private final HiveMetaStoreClient hiveMetastoreClient;
-
     private static final Logger LOG =
             LoggerFactory.getLogger(HiveImporter.class);
+    private final HiveMetaStoreClient hiveMetastoreClient;
     private IRepository repository;
     private MetadataRepository graphRepository;
     private HiveTypeSystem hiveTypeSystem;
@@ -64,32 +63,7 @@ public class HiveImporter {
     private List<Id> processInstances;
 
 
-    private class Pair<L, R> {
-        final L left;
-        final R right;
-
-        public Pair(L left, R right) {
-            this.left = left;
-            this.right = right;
-        }
-
-        public L left() {
-            return this.left;
-        }
-
-        public R right() {
-            return this.right;
-        }
-    }
-
-
-    private class InstancePair extends Pair<ITypedReferenceableInstance, Referenceable> {
-        public InstancePair(ITypedReferenceableInstance left, Referenceable right) {
-            super(left, right);
-        }
-    }
-
-    public HiveImporter( MetadataRepository repo, HiveTypeSystem hts, HiveMetaStoreClient hmc)
+    public HiveImporter(MetadataRepository repo, HiveTypeSystem hts, HiveMetaStoreClient hmc)
     throws RepositoryException {
         this(hts, hmc);
 
@@ -102,6 +76,7 @@ public class HiveImporter {
 
     }
 
+
     public HiveImporter(IRepository repo, HiveTypeSystem hts, HiveMetaStoreClient hmc)
     throws RepositoryException {
         this(hts, hmc);
@@ -187,7 +162,8 @@ public class HiveImporter {
             System.out.println("creating instance of type " + typeName + " dataType " + dataType
                     + ", guid: " + guid);
 
-            return new InstancePair(null, new Referenceable(guid, ref.getTypeName(), ref.getValuesMap()));
+            return new InstancePair(null,
+                    new Referenceable(guid, ref.getTypeName(), ref.getValuesMap()));
         }
     }
 
@@ -200,7 +176,6 @@ public class HiveImporter {
         }
     }
 
-
     private void importDatabase(String db) throws MetadataException {
         try {
             LOG.info("Importing objects from database : " + db);
@@ -235,13 +210,15 @@ public class HiveImporter {
         }
     }
 
-    private void importTable(String db, String table, InstancePair dbRefTyped) throws MetadataException {
+    private void importTable(String db, String table, InstancePair dbRefTyped)
+    throws MetadataException {
         try {
             LOG.info("Importing objects from " + db + "." + table);
 
             Table hiveTable = hiveMetastoreClient.getTable(db, table);
 
-            Referenceable tableRef = new Referenceable(HiveTypeSystem.DefinedTypes.HIVE_TABLE.name());
+            Referenceable tableRef = new Referenceable(
+                    HiveTypeSystem.DefinedTypes.HIVE_TABLE.name());
             setReferenceInstanceAttribute(tableRef, "dbName", dbRefTyped);
             tableRef.set("tableName", hiveTable.getTableName());
             tableRef.set("owner", hiveTable.getOwner());
@@ -311,7 +288,8 @@ public class HiveImporter {
                                   InstancePair tableRefTyped, InstancePair sdRefTyped)
     throws MetadataException {
         try {
-            List<Partition> tableParts = hiveMetastoreClient.listPartitions(db, table, Short.MAX_VALUE);
+            List<Partition> tableParts = hiveMetastoreClient
+                    .listPartitions(db, table, Short.MAX_VALUE);
             if (tableParts.size() > 0) {
                 for (Partition hivePart : tableParts) {
                     importPartition(hivePart, dbRefTyped, tableRefTyped, sdRefTyped);
@@ -322,19 +300,21 @@ public class HiveImporter {
         }
     }
 
-
     private void importPartition(Partition hivePart,
-                                 InstancePair dbRefTyped, InstancePair tableRefTyped, InstancePair sdRefTyped)
+                                 InstancePair dbRefTyped, InstancePair tableRefTyped,
+                                 InstancePair sdRefTyped)
     throws MetadataException {
         try {
-            Referenceable partRef = new Referenceable(HiveTypeSystem.DefinedTypes.HIVE_PARTITION.name());
+            Referenceable partRef = new Referenceable(
+                    HiveTypeSystem.DefinedTypes.HIVE_PARTITION.name());
             partRef.set("values", hivePart.getValues());
             setReferenceInstanceAttribute(partRef, "dbName", dbRefTyped);
             setReferenceInstanceAttribute(partRef, "tableName", tableRefTyped);
             partRef.set("createTime", hivePart.getCreateTime());
             partRef.set("lastAccessTime", hivePart.getLastAccessTime());
             //sdStruct = fillStorageDescStruct(hivePart.getSd());
-            // Instead of creating copies of the sdstruct for partitions we are reusing existing ones
+            // Instead of creating copies of the sdstruct for partitions we are reusing existing
+            // ones
             // will fix to identify partitions with differing schema.
             setReferenceInstanceAttribute(partRef, "sd", sdRefTyped);
             partRef.set("parameters", hivePart.getParameters());
@@ -347,8 +327,8 @@ public class HiveImporter {
         }
     }
 
-
-    private void importIndexes(String db, String table, InstancePair dbRefTyped, Referenceable tableRef)
+    private void importIndexes(String db, String table, InstancePair dbRefTyped,
+                               Referenceable tableRef)
     throws MetadataException {
         try {
             List<Index> indexes = hiveMetastoreClient.listIndexes(db, table, Short.MAX_VALUE);
@@ -366,7 +346,8 @@ public class HiveImporter {
                              InstancePair dbRefTyped, Referenceable tableRef)
     throws MetadataException {
         try {
-            Referenceable indexRef = new Referenceable(HiveTypeSystem.DefinedTypes.HIVE_INDEX.name());
+            Referenceable indexRef = new Referenceable(
+                    HiveTypeSystem.DefinedTypes.HIVE_INDEX.name());
             indexRef.set("indexName", index.getIndexName());
             indexRef.set("indexHandlerClass", index.getIndexHandlerClass());
             setReferenceInstanceAttribute(indexRef, "dbName", dbRefTyped);
@@ -389,7 +370,8 @@ public class HiveImporter {
     }
 
     private InstancePair fillStorageDescStruct(StorageDescriptor storageDesc) throws Exception {
-        Referenceable sdRef = new Referenceable(HiveTypeSystem.DefinedTypes.HIVE_STORAGEDESC.name());
+        Referenceable sdRef = new Referenceable(
+                HiveTypeSystem.DefinedTypes.HIVE_STORAGEDESC.name());
 
         SerDeInfo serdeInfo = storageDesc.getSerdeInfo();
         // SkewedInfo skewedInfo = storageDesc.getSkewedInfo();
@@ -421,7 +403,8 @@ public class HiveImporter {
         //if (skewedInfo.getSkewedColNames().size() > 0) {
         //    skewedInfoStruct.set("skewedColNames", skewedInfo.getSkewedColNames());
         //    skewedInfoStruct.set("skewedColValues", skewedInfo.getSkewedColValues());
-        //    skewedInfoStruct.set("skewedColValueLocationMaps", skewedInfo.getSkewedColValueLocationMaps());
+        //    skewedInfoStruct.set("skewedColValueLocationMaps", skewedInfo
+        // .getSkewedColValueLocationMaps());
         //    StructType skewedInfotype = (StructType) hiveTypeSystem.getDataType(skewedInfoName);
         //    ITypedStruct skewedInfoStructTyped =
         //            skewedInfotype.convert(skewedInfoStruct, Multiplicity.OPTIONAL);
@@ -487,4 +470,28 @@ public class HiveImporter {
 
         return sdRefTyped;
     }
+
+    private class Pair<L, R> {
+        final L left;
+        final R right;
+
+        public Pair(L left, R right) {
+            this.left = left;
+            this.right = right;
+        }
+
+        public L left() {
+            return this.left;
+        }
+
+        public R right() {
+            return this.right;
+        }
+    }
+
+    private class InstancePair extends Pair<ITypedReferenceableInstance, Referenceable> {
+        public InstancePair(ITypedReferenceableInstance left, Referenceable right) {
+            super(left, right);
+        }
+    }
 }

hivetypes/src/main/resources/core-site.xml → addons/hivetypes/src/main/resources/core-site.xml

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!--Wed Feb  4 03:23:58 2015-->
-    <configuration>
+<configuration>
 
     <property>
         <name>fs.defaultFS</name>
@@ -55,7 +73,8 @@
             RULE:[2:$1@$0]([nd]n@.*)s/.*/hdfs/
             RULE:[2:$1@$0](hm@.*)s/.*/hbase/
             RULE:[2:$1@$0](rs@.*)s/.*/hbase/
-        DEFAULT</value>
+            DEFAULT
+        </value>
     </property>
 
     <property>
@@ -70,7 +89,9 @@
 
     <property>
         <name>io.compression.codecs</name>
-      <value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
+        <value>
+            org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec
+        </value>
     </property>
 
     <property>
@@ -113,4 +134,4 @@
         <value>users</value>
     </property>
 
-  </configuration>
+</configuration>

hivetypes/src/main/resources/hdfs-site.xml → addons/hivetypes/src/main/resources/hdfs-site.xml

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!--Wed Feb  4 03:23:35 2015-->
-    <configuration>
+<configuration>
 
     <property>
         <name>dfs.block.access.token.enable</name>
@@ -28,7 +46,7 @@
 
     <property>
         <name>dfs.cluster.administrators</name>
-      <value> hdfs</value>
+        <value>hdfs</value>
     </property>
 
     <property>
@@ -238,4 +256,4 @@
         <value>022</value>
     </property>
 
-  </configuration>
+</configuration>

hivetypes/src/main/resources/hive-site.xml → addons/hivetypes/src/main/resources/hive-site.xml

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!--Wed Feb  4 03:19:28 2015-->
-    <configuration>
+<configuration>
 
     <property>
         <name>ambari.hive.db.schema.name</name>
@@ -108,7 +126,9 @@
 
     <property>
         <name>hive.conf.restricted.list</name>
-      <value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
+        <value>
+            hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role
+        </value>
     </property>
 
     <property>
@@ -383,7 +403,8 @@
 
     <property>
         <name>hive.metastore.pre.event.listeners</name>
-      <value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
+        <value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener
+        </value>
     </property>
 
     <property>
@@ -488,7 +509,9 @@
 
     <property>
         <name>hive.security.authorization.manager</name>
-      <value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory</value>
+        <value>
+            org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory
+        </value>
     </property>
 
     <property>
@@ -503,7 +526,9 @@
 
     <property>
         <name>hive.security.metastore.authorization.manager</name>
-      <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly</value>
+        <value>
+            org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly
+        </value>
     </property>
 
     <property>
@@ -678,7 +703,9 @@
 
     <property>
         <name>hive.tez.java.opts</name>
-      <value>-server -Xmx546m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps</value>
+        <value>-server -Xmx546m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA
+            -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps
+        </value>
     </property>
 
     <property>
@@ -776,4 +803,4 @@
         <value>hive</value>
     </property>
 
-  </configuration>
+</configuration>

hivetypes/src/main/resources/mapred-site.xml → addons/hivetypes/src/main/resources/mapred-site.xml

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!--Wed Feb  4 03:23:58 2015-->
-    <configuration>
+<configuration>
 
     <property>
         <name>mapreduce.admin.map.child.java.opts</name>
-      <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
+        <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}
+        </value>
     </property>
 
     <property>
         <name>mapreduce.admin.reduce.child.java.opts</name>
-      <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
+        <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}
+        </value>
     </property>
 
     <property>
         <name>mapreduce.admin.user.env</name>
-      <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value>
+        <value>
+            LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64
+        </value>
     </property>
 
     <property>
@@ -23,7 +45,9 @@
 
     <property>
         <name>mapreduce.application.classpath</name>
-      <value>$PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure</value>
+        <value>
+            $PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure
+        </value>
     </property>
 
     <property>
@@ -33,7 +57,7 @@
 
     <property>
         <name>mapreduce.cluster.administrators</name>
-      <value> hadoop</value>
+        <value>hadoop</value>
     </property>
 
     <property>
@@ -216,4 +240,4 @@
         <value>/user</value>
     </property>
 
-  </configuration>
+</configuration>

hivetypes/src/main/resources/yarn-site.xml → addons/hivetypes/src/main/resources/yarn-site.xml

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!--Wed Feb  4 03:23:58 2015-->
-    <configuration>
+<configuration>
 
     <property>
         <name>hadoop.registry.rm.enabled</name>
@@ -23,7 +41,9 @@
 
     <property>
         <name>yarn.application.classpath</name>
-      <value>$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*</value>
+        <value>
+            $HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*
+        </value>
     </property>
 
     <property>
@@ -63,7 +83,8 @@
 
     <property>
         <name>yarn.node-labels.manager-class</name>
-      <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager</value>
+        <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager
+        </value>
     </property>
 
     <property>
@@ -273,7 +294,7 @@
 
     <property>
         <name>yarn.resourcemanager.fs.state-store.uri</name>
-      <value> </value>
+        <value></value>
     </property>
 
     <property>
@@ -308,7 +329,8 @@
 
     <property>
         <name>yarn.resourcemanager.scheduler.class</name>
-      <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
+        <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler
+        </value>
     </property>
 
     <property>
@@ -418,7 +440,8 @@
 
     <property>
         <name>yarn.timeline-service.generic-application-history.store-class</name>
-      <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
+        <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore
+        </value>
     </property>
 
     <property>
@@ -481,4 +504,4 @@
         <value>c6501.ambari.apache.org:8190</value>
     </property>
 
-  </configuration>
+</configuration>

hivetypes/src/test/java/org/apache/hadoop/metadata/hivetypes/HiveGraphRepositoryTest.java → addons/hivetypes/src/test/java/org/apache/hadoop/metadata/hivetypes/HiveGraphRepositoryTest.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,17 +43,16 @@ import java.io.File;
 import java.io.FileWriter;
 import java.util.List;
 
-@Test (enabled = false)
+@Test(enabled = false)
 public class HiveGraphRepositoryTest {
 
-    protected HiveTypeSystem hts;
-    private GraphBackedMetadataRepository repository;
-    private GraphService gs;
     public static final String HIVE_L4J_PROPS = "target/hive-log4j.properties";
     public static final String HIVE_EXEC_L4J_PROPS = "target/hive-exec-log4j.properties";
-
     private static final Logger LOG =
             LoggerFactory.getLogger(HiveGraphRepositoryTest.class);
+    protected HiveTypeSystem hts;
+    private GraphBackedMetadataRepository repository;
+    private GraphService gs;
 
     @BeforeClass
     public void setup() throws ConfigurationException, MetadataException {
@@ -79,7 +78,7 @@ public class HiveGraphRepositoryTest {
         System.out.println("*******************Graph Dump****************************");
     }
 
-    @Test (enabled = false)
+    @Test(enabled = false)
     public void testHiveImport() throws Exception {
         HiveConf conf = new HiveConf();
         HiveMetaStoreClient hiveMetaStoreClient;

hivetypes/src/test/java/org/apache/hadoop/metadata/hivetypes/HiveTypeSystemTest.java → addons/hivetypes/src/test/java/org/apache/hadoop/metadata/hivetypes/HiveTypeSystemTest.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,9 +23,9 @@ import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.metadata.ITypedReferenceableInstance;
 import org.apache.hadoop.metadata.MetadataException;
-import org.apache.hadoop.metadata.storage.Id;
-import org.apache.hadoop.metadata.storage.memory.MemRepository;
-import org.apache.hadoop.metadata.types.TypeSystem;
+import org.apache.hadoop.metadata.typesystem.persistence.Id;
+import org.apache.hadoop.metadata.typesystem.persistence.memory.MemRepository;
+import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeClass;
@@ -39,15 +39,15 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 
-@Test (enabled = true)
+@Test(enabled = true)
 public class HiveTypeSystemTest {
 
-    protected MemRepository mr;
-    protected HiveTypeSystem hts;
     private static final String hiveHost = "c6501.ambari.apache.org";
     private static final short hivePort = 10000;
     private static final Logger LOG =
             LoggerFactory.getLogger(HiveTypeSystemTest.class);
+    protected MemRepository mr;
+    protected HiveTypeSystem hts;
 
     @BeforeClass
     public void setup() throws MetadataException {
@@ -58,7 +58,7 @@ public class HiveTypeSystemTest {
         hts = HiveTypeSystem.getInstance();
     }
 
-    @Test (enabled = true)
+    @Test(enabled = true)
     public void testHiveImport() throws MetaException, MetadataException, IOException {
         HiveConf conf = new HiveConf();
         HiveMetaStoreClient hiveMetaStoreClient;
@@ -69,7 +69,8 @@ public class HiveTypeSystemTest {
         LOG.info("Defined DB instances");
         File f = new File("./target/logs/hiveobjs.txt");
         f.getParentFile().mkdirs();
-        FileWriter fw = new FileWriter(f);        BufferedWriter bw = new BufferedWriter(fw);
+        FileWriter fw = new FileWriter(f);
+        BufferedWriter bw = new BufferedWriter(fw);
         for (Id id : hImporter.getDBInstances()) {
             ITypedReferenceableInstance instance = mr.get(id);
             bw.write(instance.toString());
@@ -103,7 +104,7 @@ public class HiveTypeSystemTest {
         bw.close();
     }
 
-    @Test (enabled = true)
+    @Test(enabled = true)
     public void testHiveLineage() throws MetaException, MetadataException, IOException, Exception {
         Class.forName("org.apache.hive.jdbc.HiveDriver");
         String url = "jdbc:hive2://" + hiveHost + ":" + hivePort;
@@ -117,5 +118,4 @@ public class HiveTypeSystemTest {
     }
 
 
-
 }
\ No newline at end of file

addons/hivetypes/src/test/resources/hive-init.sql

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

addons/hivetypes/src/test/resources/hive-queries.sql

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+drop table if exists t;
+create table t(a int, b string);
+drop table if exists t2;
+create table t2 as select * from t;

common/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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>
-        <version>0.1-incubating-SNAPSHOT</version>
-    </parent>
-    <artifactId>metadata-common</artifactId>
-    <description>Apache Metadata Common Module</description>
-    <name>Apache Metadata Commons</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.findbugs</groupId>
-            <artifactId>annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tinkerpop.blueprints</groupId>
-            <artifactId>blueprints-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/log4j.xml</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

common/src/main/java/org/apache/hadoop/metadata/MetadataException.java

-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.metadata;
-
-public class MetadataException extends Exception {
-    /**
-     * Constructs a new exception with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for
-     *                later retrieval by the {@link #getMessage()} method.
-     */
-    public MetadataException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this exception's detail message.
-     *
-     * @param message the detail message (which is saved for later retrieval
-     *                by the {@link #getMessage()} method).
-     * @param cause   the cause (which is saved for later retrieval by the
-     *                {@link #getCause()} method).  (A <tt>null</tt> value is
-     *                permitted, and indicates that the cause is nonexistent or
-     *                unknown.)
-     * @since 1.4
-     */
-    public MetadataException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
-     * typically contains the class and detail message of <tt>cause</tt>).
-     * This constructor is useful for exceptions that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param cause the cause (which is saved for later retrieval by the
-     *              {@link #getCause()} method).  (A <tt>null</tt> value is
-     *              permitted, and indicates that the cause is nonexistent or
-     *              unknown.)
-     * @since 1.4
-     */
-    public MetadataException(Throwable cause) {
-        super(cause);
-    }
-}

common/src/main/java/org/apache/hadoop/metadata/util/ReflectionUtils.java

-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.metadata.util;
-
-import org.apache.hadoop.metadata.MetadataException;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-/**
- * Helper methods for class instantiation through reflection.
- */
-public final class ReflectionUtils {
-
-    private ReflectionUtils() {}
-
-    @SuppressWarnings("unchecked")
-    public static <T> T getInstanceByClassName(String clazzName) throws MetadataException {
-        try {
-            Class<T> clazz = (Class<T>) ReflectionUtils.class.getClassLoader().loadClass(clazzName);
-            try {
-                return clazz.newInstance();
-            } catch (IllegalAccessException e) {
-                Method method = clazz.getMethod("get");
-                return (T) method.invoke(null);
-            }
-        } catch (Exception e) {
-            throw new MetadataException("Unable to get instance for " + clazzName, e);
-        }
-    }
-
-    /**
-     * Invokes constructor with one argument.
-     * @param clazzName - classname
-     * @param argCls - Class of the argument
-     * @param arg - constructor argument
-     * @param <T> - instance type
-     * @return Class instance
-     * @throws MetadataException
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T getInstanceByClassName(String clazzName, Class<?> argCls,
-                                               Object arg) throws MetadataException {
-        try {
-            Class<T> clazz = (Class<T>) ReflectionUtils.class.getClassLoader().loadClass(clazzName);
-            Constructor<T> constructor = clazz.getConstructor(argCls);
-            return constructor.newInstance(arg);
-        } catch (Exception e) {
-            throw new MetadataException("Unable to get instance for " + clazzName, e);
-        }
-    }
-}

dashboard/dashboard-v1/partials/attribute.html

-<h4 class="titletxt2">{{key}}:</h4>
-<p class="sm-txt2">{{value | date:'medium'}}</p>

dashboard/dashboard-v1/partials/lineage.html

-<div class="container" ng-controller="LineageController">
-<div class="lineage"></div>
-  <svg ng-attr-width="{{width}}"
-                 ng-attr-height="{{height}}">
-              
-            </svg>
-
-</div>

dashboard/dashboard-v2/public/modules/details/detailsModule.js

-'use strict';
-
-angular.module('dgc.details', ['dgc.lineage']);

dashboard/dashboard-v2/public/modules/details/views/attribute.html

-<h4>{{key}}:</h4>
-<p>{{value | date:'medium'}}</p>
\ No newline at end of file

dashboard/dashboard-v2/public/modules/home/homeModule.js

-'use strict';
-
-angular.module('dgc.home', ['dgc.home.routes']);

dashboard/dashboard-v2/public/modules/home/views/home.html

-<section class="text-center">
-    <img data-ui-sref="search" data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/>
-</section>
\ No newline at end of file

dashboard/dashboard-v2/public/modules/lineage/lineageModule.js

-'use strict';
-
-angular.module('dgc.lineage', []);

dashboard/dashboard-v2/public/modules/lineage/views/lineage.html

-<div data-ng-controller="LineageController">
-    <svg></svg>
-</div>

dashboard/dashboard-v2/public/modules/search/searchModule.js

-'use strict';
-
-angular.module('dgc.search', ['dgc.details']);

dashboard/dashboard-v2/public/modules/search/views/types/guid.html

-<a data-ui-sref="details({id:result.guid})">{{result.guid}}</a>
\ No newline at end of file

dashboard/dashboard-v2/public/modules/search/views/types/hiveLineage.html

-<a data-ui-sref="details({id:result.guid})">{{result.guid}}</a>
\ No newline at end of file

dashboard/dashboard-v2/public/modules/search/views/types/hive_table.html

-<a data-ui-sref="details({id:result.guid})">{{result["hive_table.name"]}}</a>
\ No newline at end of file

dashboard/dashboard-v1/Search.html → dashboard/v1/Search.html

 <!DOCTYPE html>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <html ng-app="DgcApp" lang="en">
 <head>
     <meta charset="utf-8">

dashboard/dashboard-v1/css/style.css → dashboard/v1/css/style.css

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .bg-top2{
 background: #eeeded; /* for non-css3 browsers */
 

dashboard/dashboard-v1/index.html → dashboard/v1/index.html

 <!DOCTYPE html>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <html lang="en">
   <head>
     <meta charset="utf-8">

dashboard/dashboard-v1/js/app.js → dashboard/v1/js/app.js

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 var DgcApp = angular.module('DgcApp', [
   'ngRoute',
   'DgcControllers',

dashboard/dashboard-v1/js/controllers.js → dashboard/v1/js/controllers.js

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 var DgcControllers = angular.module("DgcControllers", []);
 
 DgcControllers.controller("ListController", ['$scope','$http', function($scope, $http)

dashboard/v1/partials/attribute.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4 class="titletxt2">{{key}}:</h4>
+<p class="sm-txt2">{{value | date:'medium'}}</p>

dashboard/v1/partials/lineage.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<div class="container" ng-controller="LineageController">
+<div class="lineage"></div>
+  <svg ng-attr-width="{{width}}"
+                 ng-attr-height="{{height}}">
+              
+            </svg>
+
+</div>

dashboard/dashboard-v1/partials/search.html → dashboard/v1/partials/search.html

-       <!-- Page Content -->
+       <!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->       <!-- Page Content -->
 <div style="margin-top:-20px;padding-top:20px; background-color:#eeeded;padding-bottom:10px;border-bottom:solid 1px #d9d9d8;">
    	
 <form name=form" class="container">

dashboard/dashboard-v1/partials/wiki.html → dashboard/v1/partials/wiki.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <div class="content">
 <div class="container">
  <div class="col-lg-12">

dashboard/dashboard-v2/.gitignore → dashboard/v2/.gitignore

+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 .DS_Store
 .bower-*/
 .idea/

dashboard/dashboard-v2/public/css/common.css → dashboard/v2/public/css/common.css

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 div.separator {
     position: relative;
     font-size: 18px;

dashboard/dashboard-v2/public/css/d3tip.css → dashboard/v2/public/css/d3tip.css

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .d3-tip {
     line-height: 1;
     font-weight: bold;

dashboard/dashboard-v2/public/css/lineage.css → dashboard/v2/public/css/lineage.css

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 g circle {
     cursor: pointer;
     stroke: green;