atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject incubator-atlas git commit: ATLAS-16 jersey jaxb exception (shwethags)
Date Tue, 04 Aug 2015 04:19:44 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 39c52b2b7 -> 7fc68497c


ATLAS-16 jersey jaxb exception (shwethags)


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

Branch: refs/heads/master
Commit: 7fc68497caac671427cc3032f5e8834b1dc22f69
Parents: 39c52b2
Author: Shwetha GS <sshivalingamurthy@hortonworks.com>
Authored: Tue Aug 4 09:49:37 2015 +0530
Committer: Shwetha GS <sshivalingamurthy@hortonworks.com>
Committed: Tue Aug 4 09:49:37 2015 +0530

----------------------------------------------------------------------
 client/pom.xml                                  | 10 --------
 docs/src/site/twiki/InstallationSteps.twiki     |  2 +-
 pom.xml                                         | 26 +++++++++++++++++++-
 release-log.txt                                 |  1 +
 repository/pom.xml                              | 10 --------
 src/conf/log4j.xml                              | 20 ---------------
 typesystem/src/main/resources/log4j.xml         | 14 -----------
 .../atlas/web/listeners/GuiceServletConfig.java | 15 +++++++++++
 webapp/src/main/resources/log4j.xml             | 20 ---------------
 9 files changed, 42 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 2f883cd..d393b3a 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -63,16 +63,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index a75498f..0391c2d 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -14,7 +14,7 @@ Once the build successfully completes, artifacts can be packaged for deployment.
 
 <verbatim>
 
-mvn clean verify assembly:assembly -DskipTests
+mvn clean verify assembly:assembly -DskipTests -DskipCheck=true
 
 </verbatim>
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b98e02b..66182e7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,7 @@
 
         <slf4j.version>1.7.7</slf4j.version>
         <jetty.version>9.2.12.v20150709</jetty.version>
-        <jersey.version>1.9</jersey.version>
+        <jersey.version>1.10</jersey.version>
         <jackson.version>1.8.3</jackson.version>
         <tinkerpop.version>2.6.0</tinkerpop.version>
         <titan.version>0.5.4</titan.version>
@@ -487,6 +487,7 @@
             <url>${SnapshotsUrl}</url>
         </snapshotRepository>
     </distributionManagement>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -515,6 +516,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jul-to-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.17</version>
@@ -1110,6 +1117,23 @@
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <directory>target</directory>
         <outputDirectory>target/classes</outputDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0965bf6..b8eda97 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-16 jersey jaxb exception (shwethags)
 ATLAS-79 Unique constraint is not honoured (shwethags)
 ATLAS-25 Fix Atlas on Java 8 (sandeep.samudrala via shwethags)
 ATLAS-86 Jenkins build failing as of build #41 (shwethags)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index 03aa792..a2f8e08 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -45,16 +45,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/src/conf/log4j.xml
----------------------------------------------------------------------
diff --git a/src/conf/log4j.xml b/src/conf/log4j.xml
index 11cf10a..887cae5 100755
--- a/src/conf/log4j.xml
+++ b/src/conf/log4j.xml
@@ -51,26 +51,6 @@
     </logger>
 
 
-    <logger name="com.thinkaurelius.titan" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="org.elasticsearch" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="org.apache.lucene" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="com.google" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
     <logger name="AUDIT">
         <level value="info"/>
         <appender-ref ref="AUDIT"/>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/typesystem/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/typesystem/src/main/resources/log4j.xml b/typesystem/src/main/resources/log4j.xml
index 742f674..999caad 100755
--- a/typesystem/src/main/resources/log4j.xml
+++ b/typesystem/src/main/resources/log4j.xml
@@ -45,25 +45,11 @@
         </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.atlas" additivity="false">
         <level value="debug"/>
         <appender-ref ref="console"/>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java b/webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java
index 8371d9c..bcf115f 100755
--- a/webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java
+++ b/webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java
@@ -40,6 +40,7 @@ import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import javax.servlet.ServletContextEvent;
 import java.util.HashMap;
@@ -104,11 +105,25 @@ public class GuiceServletConfig extends GuiceServletContextListener
{
     public void contextInitialized(ServletContextEvent servletContextEvent) {
         super.contextInitialized(servletContextEvent);
 
+        installLogBridge();
+
         // perform login operations
         LoginProcessor loginProcessor = new LoginProcessor();
         loginProcessor.login();
     }
 
+    /**
+     * Maps jersey's java.util.logging to slf4j
+     */
+    private void installLogBridge() {
+        // Optionally remove existing handlers attached to j.u.l root logger
+        SLF4JBridgeHandler.removeHandlersForRootLogger();  // (since SLF4J 1.6.5)
+
+        // add SLF4JBridgeHandler to j.u.l's root logger, should be done once during
+        // the initialization phase of your application
+        SLF4JBridgeHandler.install();
+    }
+
     @Override
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
         super.contextDestroyed(servletContextEvent);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7fc68497/webapp/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/webapp/src/main/resources/log4j.xml b/webapp/src/main/resources/log4j.xml
index 42d3c47..5c42c98 100755
--- a/webapp/src/main/resources/log4j.xml
+++ b/webapp/src/main/resources/log4j.xml
@@ -51,26 +51,6 @@
     </logger>
 
 
-    <logger name="com.thinkaurelius.titan" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="org.elasticsearch" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="org.apache.lucene" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
-    <logger name="com.google" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="FILE"/>
-    </logger>
-
     <logger name="AUDIT">
         <level value="info"/>
         <appender-ref ref="AUDIT"/>


Mime
View raw message