Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert logging to logback predominantly via slf4j #1006

Merged
merged 33 commits into from
Apr 11, 2013
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fe24c2f
Initial commit after using SLF4J Migrator.
ximenesuk Feb 19, 2013
6766ed3
Two changes made by hand to preserve the original encoding and minimi…
ximenesuk Feb 19, 2013
46f9929
Fix two-line log factory invocations missed by migrator.
ximenesuk Feb 18, 2013
14dd05e
Change argument types to Logger.
ximenesuk Feb 18, 2013
4c7dbdb
Add logback jars.
ximenesuk Feb 18, 2013
e5313a2
Update slf4j jars.
ximenesuk Feb 19, 2013
2a1efd0
Update omero.properties
ximenesuk Feb 19, 2013
24e3e45
Remove unused CommonsLoggingAdapter.
ximenesuk Feb 19, 2013
00bb2cf
Resolve conflict between slf4j.Logger and log4j.Logger
ximenesuk Feb 18, 2013
94e34ee
Change fatal() to error().
ximenesuk Feb 18, 2013
8277002
Force log arguments to Strings.
ximenesuk Feb 18, 2013
c1855d5
Fix a few tests missed by the migrator and not picked up in other com…
ximenesuk Feb 19, 2013
3ee1480
Translated log4j-cli.properties to logback-cli.xml
ximenesuk Feb 19, 2013
5add9ff
Reverting changes under dsl as velocity is dependent on log4j
ximenesuk Feb 26, 2013
5537cde
Add logback dependency, remove slf4j-log4j12 dependency.
ximenesuk Feb 26, 2013
90fadd9
Update perf4j to exploit logback more fully.
ximenesuk Feb 27, 2013
2eb1812
Update configuration to logback with minimal logback.xml file
ximenesuk Feb 27, 2013
cdcae3d
Replicate most of log4j config
ximenesuk Feb 27, 2013
df19371
Replicate and add indexing logging.
ximenesuk Feb 27, 2013
b8fe39d
Removing configureLogging.
ximenesuk Apr 1, 2013
f9d96cf
Upgrade ehcache to 2.1.0, remove jsr107cache.
ximenesuk Mar 5, 2013
75a7c08
Change perf4j to use slf4j logging and add config.
ximenesuk Apr 4, 2013
6549890
Add jcl-over-slf4j to catch springframework logging.
ximenesuk Apr 4, 2013
4ebc238
Add back config for build logging.
ximenesuk Apr 5, 2013
a2e5bde
Remove log4j config files from etc.
ximenesuk Apr 8, 2013
56a4686
Move apacheds server dependencies to allow other unit tests to run.
ximenesuk Apr 9, 2013
2b01d50
Temporary commit for files that need further work.
ximenesuk Feb 25, 2013
c5c4711
Modify two blitz tests to use logback directly.
ximenesuk Apr 9, 2013
136452b
Fix comment errors
ximenesuk Apr 11, 2013
29c0c61
Fix dsl errors
ximenesuk Apr 11, 2013
2589d8e
Reverting EOL changes.
ximenesuk Apr 11, 2013
0fc1f8c
Changes to log config.
ximenesuk Apr 11, 2013
50cd930
Removing unnecessary imports.
ximenesuk Apr 11, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update omero.properties
  • Loading branch information
ximenesuk committed Apr 9, 2013
commit 2a1efd07dfa111ad327521937fc6cf62401bf47d
3 changes: 2 additions & 1 deletion etc/omero.properties
Original file line number Diff line number Diff line change
@@ -406,6 +406,7 @@ versions.jsr107cache=1.0
versions.jta=1.0.1B
versions.jts=1.10
versions.log4j=1.2.14
versions.logback=1.0.9
# Change url in antlib/resources/release.xml when changing lucene version
versions.lucene=2.4.1
versions.mail=1.4.1
@@ -423,7 +424,7 @@ versions.quartz=1.5.2
versions.reportng=1.1.1
versions.saaj=1.2
versions.shared-ldap=0.9.15
versions.slf4j=1.5.8
versions.slf4j=1.7.2
versions.spring=3.0.1.RELEASE-A
versions.spring-ldap=1.3.0.RELEASE
versions.spring-security=3.0.2.RELEASE