From 86fe0801e394cc37d16a60f4e21a1b770d09134f Mon Sep 17 00:00:00 2001
From: Shwetha GS <sshivalingamurthy@hortonworks.com>
Date: Wed, 15 Apr 2015 15:27:38 +0530
Subject: [PATCH] fixed misc build issues
---
pom.xml | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------
repository/src/main/java/org/apache/hadoop/metadata/PropertiesUtil.java | 30 ++++++++++++++++++++++++++++++
repository/src/main/java/org/apache/hadoop/metadata/repository/graph/TitanGraphProvider.java | 5 ++---
src/conf/log4j.xml | 1 -
typesystem/src/main/resources/application.properties | 40 ++++++++++++++++++++++++++++++++++++++++
typesystem/src/main/resources/log4j.xml | 13 ++++---------
typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/EnumTest.java | 4 ++--
typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/StructTest.java | 6 +++---
typesystem/src/test/resources/log4j.xml | 92 --------------------------------------------------------------------------------------------
typesystem/src/test/scala/org/apache/hadoop/metadata/typesystem/json/SerializationTest.scala | 2 +-
webapp/pom.xml | 1 -
webapp/src/main/java/org/apache/hadoop/metadata/Main.java | 3 +--
webapp/src/main/resources/application.properties | 40 ----------------------------------------
13 files changed, 184 insertions(+), 278 deletions(-)
create mode 100644 repository/src/main/java/org/apache/hadoop/metadata/PropertiesUtil.java
create mode 100644 typesystem/src/main/resources/application.properties
delete mode 100755 typesystem/src/test/resources/log4j.xml
delete mode 100755 webapp/src/main/resources/application.properties
diff --git a/pom.xml b/pom.xml
index 15de418..2942887 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
-->
<project 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"
- xmlns="http://maven.apache.org/POM/4.0.0">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>org.apache</groupId>
@@ -95,110 +95,6 @@
<MaxPermGen>512m</MaxPermGen>
</properties>
- <profiles>
- <profile>
- <id>test-patch</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <useDefaultExcludes>true</useDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <excludeSubProjects>true</excludeSubProjects>
- <excludes>
- <exclude>*.txt</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.json</exclude>
- <exclude>.git/**</exclude>
- <exclude>.gitignore</exclude>
- <exclude>**/.idea/**</exclude>
- <exclude>**/*.twiki</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.uml</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/build/**</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>derby.log</exclude>
- <exclude>**/logs/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/test-output/**</exclude>
- <exclude>**/data.txt</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
- <exclude>**/.externalToolBuilders/**</exclude>
- <exclude>dashboard/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>rat-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>src/build/checkstyle.xml</configLocation>
- <headerLocation>src/build/checkstyle-java-header.txt</headerLocation>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <!--debug>true</debug -->
- <xmlOutput>true</xmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <id>findbugs-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
-
- <!-- Source code metrics: mvn javancss:report or mvn site -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <properties>
- <excluded.test.groups/>
- </properties>
- </profile>
- </profiles>
-
<modules>
<module>typesystem</module>
<module>client</module>
@@ -686,17 +582,6 @@
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
- <includes>
- <include>metadata-buildinfo.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/conf</directory>
- <filtering>false</filtering>
- <includes>
- <include>application.properties</include>
- <include>log4j.xml</include>
- </includes>
</resource>
<resource>
<directory>..</directory>
@@ -893,21 +778,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
+ <version>2.16</version>
<configuration>
<!--<skipTests>true</skipTests>-->
<forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <groups></groups>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>2.7.2</version>
+ <artifactId>surefire-testng</artifactId>
+ <version>2.18.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-testng</artifactId>
- <version>2.7.2</version>
+ <artifactId>surefire-junit4</artifactId>
+ <version>2.18.1</version>
</dependency>
</dependencies>
</plugin>
@@ -979,8 +866,98 @@
<doUpdate>false</doUpdate>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <exclude>*.txt</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.twiki</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.uml</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>derby.log</exclude>
+ <exclude>**/logs/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/test-output/**</exclude>
+ <exclude>**/data.txt</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
+ <exclude>**/.externalToolBuilders/**</exclude>
+ <exclude>dashboard/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>rat-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>checkstyle-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <configLocation>src/build/checkstyle.xml</configLocation>
+ <headerLocation>src/build/checkstyle-java-header.txt</headerLocation>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <!--debug>true</debug -->
+ <xmlOutput>true</xmlOutput>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <id>findbugs-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Source code metrics: mvn javancss:report or mvn site -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
- <reporting/>
</project>
diff --git a/repository/src/main/java/org/apache/hadoop/metadata/PropertiesUtil.java b/repository/src/main/java/org/apache/hadoop/metadata/PropertiesUtil.java
new file mode 100644
index 0000000..e62ceae
--- /dev/null
+++ b/repository/src/main/java/org/apache/hadoop/metadata/PropertiesUtil.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.metadata;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+public class PropertiesUtil {
+ private static final String APPLICATION_PROPERTIES = "/application.properties";
+
+ public static final PropertiesConfiguration getApplicationProperties() throws ConfigurationException {
+ return new PropertiesConfiguration(PropertiesUtil.class.getResource(APPLICATION_PROPERTIES));
+ }
+}
diff --git a/repository/src/main/java/org/apache/hadoop/metadata/repository/graph/TitanGraphProvider.java b/repository/src/main/java/org/apache/hadoop/metadata/repository/graph/TitanGraphProvider.java
index 617fb20..c83d083 100755
--- a/repository/src/main/java/org/apache/hadoop/metadata/repository/graph/TitanGraphProvider.java
+++ b/repository/src/main/java/org/apache/hadoop/metadata/repository/graph/TitanGraphProvider.java
@@ -23,6 +23,7 @@ import com.thinkaurelius.titan.core.TitanGraph;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.hadoop.metadata.PropertiesUtil;
import javax.inject.Singleton;
import java.util.Iterator;
@@ -32,15 +33,13 @@ import java.util.Iterator;
*/
public class TitanGraphProvider implements GraphProvider<TitanGraph> {
- private static final String CONFIG_PATH = "application.properties";
-
/**
* Constant for the configuration property that indicates the prefix.
*/
private static final String METADATA_PREFIX = "metadata.graph.";
private static Configuration getConfiguration() throws ConfigurationException {
- PropertiesConfiguration configProperties = new PropertiesConfiguration(CONFIG_PATH);
+ PropertiesConfiguration configProperties = PropertiesUtil.getApplicationProperties();
Configuration graphConfig = new PropertiesConfiguration();
diff --git a/src/conf/log4j.xml b/src/conf/log4j.xml
index c80b10f..441a5f8 100755
--- a/src/conf/log4j.xml
+++ b/src/conf/log4j.xml
@@ -47,7 +47,6 @@
<logger name="org.apache.hadoop.metadata" additivity="false">
<level value="debug"/>
- <appender-ref ref="console"/>
<appender-ref ref="FILE"/>
</logger>
diff --git a/typesystem/src/main/resources/application.properties b/typesystem/src/main/resources/application.properties
new file mode 100644
index 0000000..62f81f3
--- /dev/null
+++ b/typesystem/src/main/resources/application.properties
@@ -0,0 +1,40 @@
+#
+# 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.
+#
+
+######### Graph Database Configs #########
+# Graph Storage
+metadata.graph.storage.backend=inmemory
+
+# Graph Search Index
+metadata.graph.index.search.backend=lucene
+metadata.graph.index.search.directory=target/data/lucene
+
+
+######### Hive Lineage Configs #########
+metadata.lineage.hive.table.type.name=hive_table
+metadata.lineage.hive.column.type.name=hive_column
+metadata.lineage.hive.table.column.name=columns
+metadata.lineage.hive.process.type.name=hive_process
+metadata.lineage.hive.process.inputs.name=inputTables
+metadata.lineage.hive.process.outputs.name=outputTables
+
+
+######### Security Properties #########
+
+# SSL config
+metadata.enableTLS=false
diff --git a/typesystem/src/main/resources/log4j.xml b/typesystem/src/main/resources/log4j.xml
index a17ab76..d356cbd 100755
--- a/typesystem/src/main/resources/log4j.xml
+++ b/typesystem/src/main/resources/log4j.xml
@@ -56,12 +56,12 @@
<logger name="AUDIT" additivity="false">
<level value="debug"/>
- <appender-ref ref="AUDIT"/>
+ <appender-ref ref="console"/>
</logger>
<logger name="METRIC" additivity="false">
<level value="debug"/>
- <appender-ref ref="METRIC"/>
+ <appender-ref ref="console"/>
</logger>
<logger name="org.apache.hadoop.metadata" additivity="false">
@@ -84,14 +84,9 @@
<appender-ref ref="FILE"/>
</logger>
- <logger name="com.google" additivity="false">
- <level value="info"/>
- <appender-ref ref="FILE"/>
- </logger>
-
<root>
- <priority value="info"/>
- <appender-ref ref="FILE"/>
+ <priority value="debug"/>
+ <appender-ref ref="console"/>
</root>
</log4j:configuration>
diff --git a/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/EnumTest.java b/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/EnumTest.java
index 5191918..0e4d0a7 100755
--- a/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/EnumTest.java
+++ b/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/EnumTest.java
@@ -179,7 +179,7 @@ public class EnumTest extends BaseTest {
"\tj : \t1\n" +
"\tk : \t1\n" +
"\tenum3 : \tCOMMITTED\n" +
- "\tl : \t2014-12-10\n" +
+ "\tl : \t2014-12-11\n" +
"\tm : \t[1, 1]\n" +
"\tn : \t[1.1, 1.1]\n" +
"\to : \t{b=2.0, a=1.0}\n" +
@@ -211,7 +211,7 @@ public class EnumTest extends BaseTest {
"\tj : \t1\n" +
"\tk : \t1\n" +
"\tenum3 : \tCOMMITTED\n" +
- "\tl : \t2014-12-10\n" +
+ "\tl : \t2014-12-11\n" +
"\tm : \t[1, 1]\n" +
"\tn : \t[1.1, 1.1]\n" +
"\to : \t{b=2.0, a=1.0}\n" +
diff --git a/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/StructTest.java b/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/StructTest.java
index 1a30015..7651689 100755
--- a/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/StructTest.java
+++ b/typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/StructTest.java
@@ -33,8 +33,8 @@ public class StructTest extends BaseTest {
@Before
public void setup() throws Exception {
super.setup();
- structType = (StructType) getTypeSystem().getDataType(StructType.class, STRUCT_TYPE_1);
- recursiveStructType = (StructType) getTypeSystem()
+ structType = getTypeSystem().getDataType(StructType.class, STRUCT_TYPE_1);
+ recursiveStructType = getTypeSystem()
.getDataType(StructType.class, STRUCT_TYPE_2);
}
@@ -54,7 +54,7 @@ public class StructTest extends BaseTest {
"\ti : \t1.0\n" +
"\tj : \t1\n" +
"\tk : \t1\n" +
- "\tl : \t2014-12-10\n" +
+ "\tl : \t2014-12-11\n" +
"\tm : \t[1, 1]\n" +
"\tn : \t[1.1, 1.1]\n" +
"\to : \t{b=2.0, a=1.0}\n" +
diff --git a/typesystem/src/test/resources/log4j.xml b/typesystem/src/test/resources/log4j.xml
deleted file mode 100755
index d356cbd..0000000
--- a/typesystem/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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.
- -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${user.dir}/target/logs/application.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
- </layout>
- </appender>
-
- <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${user.dir}/target/logs/audit.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %x %m%n"/>
- </layout>
- </appender>
-
- <appender name="METRIC" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${user.dir}/target/logs/metric.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %m%n"/>
- </layout>
- </appender>
-
- <logger name="AUDIT" additivity="false">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </logger>
-
- <logger name="METRIC" additivity="false">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </logger>
-
- <logger name="org.apache.hadoop.metadata" additivity="false">
- <level value="debug"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="com.thinkaurelius.titan" additivity="false">
- <level value="warn"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="org.elasticsearch" additivity="false">
- <level value="warn"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="org.apache.lucene" additivity="false">
- <level value="warn"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <root>
- <priority value="debug"/>
- <appender-ref ref="console"/>
- </root>
-
-</log4j:configuration>
diff --git a/typesystem/src/test/scala/org/apache/hadoop/metadata/typesystem/json/SerializationTest.scala b/typesystem/src/test/scala/org/apache/hadoop/metadata/typesystem/json/SerializationTest.scala
index c11e15d..8161d34 100755
--- a/typesystem/src/test/scala/org/apache/hadoop/metadata/typesystem/json/SerializationTest.scala
+++ b/typesystem/src/test/scala/org/apache/hadoop/metadata/typesystem/json/SerializationTest.scala
@@ -45,7 +45,7 @@ class SerializationTest extends BaseTest {
val s: Struct = BaseTest.createStruct()
val ts: ITypedStruct = structType.convert(s, Multiplicity.REQUIRED)
- Assert.assertEquals(ts.toString, "{\n\ta : \t1\n\tb : \ttrue\n\tc : \t1\n\td : \t2\n\te : \t1\n\tf : \t1\n\tg : \t1\n\th : \t1.0\n\ti : \t1.0\n\tj : \t1\n\tk : \t1\n\tl : \t2014-12-10\n\tm : \t[1, 1]\n\tn : \t[1.1, 1.1]\n\to : \t{b=2.0, a=1.0}\n}")
+ Assert.assertEquals(ts.toString, "{\n\ta : \t1\n\tb : \ttrue\n\tc : \t1\n\td : \t2\n\te : \t1\n\tf : \t1\n\tg : \t1\n\th : \t1.0\n\ti : \t1.0\n\tj : \t1\n\tk : \t1\n\tl : \t2014-12-11\n\tm : \t[1, 1]\n\tn : \t[1.1, 1.1]\n\to : \t{b=2.0, a=1.0}\n}")
implicit val formats = org.json4s.native.Serialization.formats(NoTypeHints) + new TypedStructSerializer +
new BigDecimalSerializer + new BigIntegerSerializer
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 829e9f6..b757b7d 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -183,7 +183,6 @@
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
-
</dependencies>
<build>
diff --git a/webapp/src/main/java/org/apache/hadoop/metadata/Main.java b/webapp/src/main/java/org/apache/hadoop/metadata/Main.java
index 0a676dc..1f7c7c2 100755
--- a/webapp/src/main/java/org/apache/hadoop/metadata/Main.java
+++ b/webapp/src/main/java/org/apache/hadoop/metadata/Main.java
@@ -70,8 +70,7 @@ public final class Main {
appPath = cmd.getOptionValue(APP_PATH);
}
- PropertiesConfiguration configuration =
- new PropertiesConfiguration("application.properties");
+ PropertiesConfiguration configuration = PropertiesUtil.getApplicationProperties();
final String enableTLSFlag = configuration.getString("metadata.enableTLS");
final int appPort = getApplicationPort(cmd, enableTLSFlag);
final boolean enableTLS = isTLSEnabled(enableTLSFlag, appPort);
diff --git a/webapp/src/main/resources/application.properties b/webapp/src/main/resources/application.properties
deleted file mode 100755
index c2a9dcb..0000000
--- a/webapp/src/main/resources/application.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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.
-#
-
-######### Graph Database Configs #########
-# Graph Storage
-metadata.graph.storage.backend=inmemory
-
-# Graph Search Index
-metadata.graph.index.search.backend=lucene
-metadata.graph.index.search.directory=webapp/target/data/lucene
-
-
-######### Hive Lineage Configs #########
-metadata.lineage.hive.table.type.name=hive_table
-metadata.lineage.hive.column.type.name=hive_column
-metadata.lineage.hive.table.column.name=columns
-metadata.lineage.hive.process.type.name=hive_process
-metadata.lineage.hive.process.inputs.name=inputTables
-metadata.lineage.hive.process.outputs.name=outputTables
-
-
-######### Security Properties #########
-
-# SSL config
-metadata.enableTLS=false
--
libgit2 0.27.1