Minor bug fix and filter properties fix

pom.xml

@@ -686,6 +686,9 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <includes>
+                    <include>metadata-buildinfo.properties</include>
+                </includes>
             </resource>
             <resource>
                 <directory>src/conf</directory>

repository/src/test/java/org/apache/hadoop/metadata/discovery/HiveLineageServiceTest.java

@@ -258,7 +258,7 @@ public class HiveLineageServiceTest {
                         new AttributeDefinition("db", DATABASE_TYPE,
                                 Multiplicity.REQUIRED, false, null),
                         new AttributeDefinition("sd", STORAGE_DESC_TYPE,
-                                Multiplicity.REQUIRED, false, null),
+                                Multiplicity.REQUIRED, true, null),
                         new AttributeDefinition("columns",
                                 DataTypes.arrayTypeName(COLUMN_TYPE),
                                 Multiplicity.COLLECTION, true, null)
@@ -457,9 +457,7 @@ public class HiveLineageServiceTest {
         referenceable.set("retention", System.currentTimeMillis());
 
         referenceable.set("db", dbId);
-        // todo: fix this bug with object walker
-//         referenceable.set("sd", sd);
-        referenceable.set("sd", createInstance(sd));
+        referenceable.set("sd", sd);
         referenceable.set("columns", columns);
 
         return createInstance(referenceable);

src/conf/application.properties

@@ -19,11 +19,11 @@
 #########  Graph Database Configs  #########
 # Graph Storage
 metadata.graph.storage.backend=berkeleyje
-metadata.graph.storage.directory=./target/data/berkeley
+metadata.graph.storage.directory=./data/berkeley
 
 # Graph Search Index
 metadata.graph.index.search.backend=elasticsearch
-metadata.graph.index.search.directory=./target/data/es
+metadata.graph.index.search.directory=./data/es
 metadata.graph.index.search.elasticsearch.client-only=false
 metadata.graph.index.search.elasticsearch.local-mode=true
 

webapp/pom.xml

@@ -233,29 +233,6 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}/conf</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.codehaus.enunciate</groupId>
                 <artifactId>maven-enunciate-plugin</artifactId>
                 <executions>
@@ -311,13 +288,13 @@
                     <!--only skip int tests -->
                     <connectors>
                         <!--
-                                                    <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
-                                                        <port>21443</port>
-                                                        <maxIdleTime>60000</maxIdleTime>
-                                                        <keystore>${project.build.directory}/../../webapp/target/metadata.keystore</keystore>
-                                                        <keyPassword>metadata-passwd</keyPassword>
-                                                        <password>metadata-passwd</password>
-                                                    </connector>
+                        <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
+                            <port>21443</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                            <keystore>${project.build.directory}/../../webapp/target/metadata.keystore</keystore>
+                            <keyPassword>metadata-passwd</keyPassword>
+                            <password>metadata-passwd</password>
+                        </connector>
                         -->
                         <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
                             <port>21000</port>

webapp/src/main/java/org/apache/hadoop/metadata/examples/QuickStart.java

@@ -134,7 +134,7 @@ public class QuickStart {
                         new AttributeDefinition("db", DATABASE_TYPE,
                                 Multiplicity.REQUIRED, false, null),
                         new AttributeDefinition("sd", STORAGE_DESC_TYPE,
-                                Multiplicity.OPTIONAL, false, null),
+                                Multiplicity.REQUIRED, true, null),
                         attrDef("owner", DataTypes.STRING_TYPE),
                         attrDef("createTime", DataTypes.INT_TYPE),
                         attrDef("lastAccessTime", DataTypes.INT_TYPE),
@@ -356,8 +356,7 @@ public class QuickStart {
         referenceable.set("lastAccessTime", System.currentTimeMillis());
         referenceable.set("retention", System.currentTimeMillis());
         referenceable.set("db", dbId);
-        // todo: fix this bug with object walker
-        // referenceable.set("sd", sd);
+        referenceable.set("sd", sd);
         referenceable.set("columns", columns);
 
         return createInstance(referenceable);