Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
7fc68497
Commit
7fc68497
authored
9 years ago
by
Shwetha GS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-16 jersey jaxb exception (shwethags)
parent
39c52b2b
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
42 additions
and
76 deletions
+42
-76
pom.xml
client/pom.xml
+0
-10
InstallationSteps.twiki
docs/src/site/twiki/InstallationSteps.twiki
+1
-1
pom.xml
pom.xml
+25
-1
release-log.txt
release-log.txt
+1
-0
pom.xml
repository/pom.xml
+0
-10
log4j.xml
src/conf/log4j.xml
+0
-20
log4j.xml
typesystem/src/main/resources/log4j.xml
+0
-14
GuiceServletConfig.java
...va/org/apache/atlas/web/listeners/GuiceServletConfig.java
+15
-0
log4j.xml
webapp/src/main/resources/log4j.xml
+0
-20
No files found.
client/pom.xml
View file @
7fc68497
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
docs/src/site/twiki/InstallationSteps.twiki
View file @
7fc68497
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
pom.xml
View file @
7fc68497
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
release-log.txt
View file @
7fc68497
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
repository/pom.xml
View file @
7fc68497
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
src/conf/log4j.xml
View file @
7fc68497
...
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
typesystem/src/main/resources/log4j.xml
View file @
7fc68497
...
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
webapp/src/main/java/org/apache/atlas/web/listeners/GuiceServletConfig.java
View file @
7fc68497
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
webapp/src/main/resources/log4j.xml
View file @
7fc68497
...
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment