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

Slf4j #3

Merged
merged 22 commits into from
Jul 3, 2012
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
19 changes: 11 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
Next Release
============

1.5 SNAPSHOT (6/25/2012)
===============

Misc
----

* Added master test cases
* Upgraded thirdparty Guava to 12.0
* Upgraded thirdparty JUnit to 4.10.
* Adjusted some logging levels to make waffle less noisy
* [#4](https://github.com/dblock/waffle/pull/4): Upgraded thirdparty tomcat to 6.0.35 - [@hazendaz](https://github.com/hazendaz).
* [#3](https://github.com/dblock/waffle/pull/3): Converted commons-logging to slf4j logging - [@hazendaz](https://github.com/hazendaz).
* Added slf4j with additional jars for jcl, jdk, log4j, nop, simple logging solutions.
* Added jcl over slf4j jar for spring as it still uses commons-logging.
* Added logback for native slf4j solution.
* Added sample xml files for logback solution to all demos.
* [#2](https://github.com/dblock/waffle/pull/2): Upgraded thirdparty Guava to 12.0 - [@hazendaz](https://github.com/hazendaz).
* [#2](https://github.com/dblock/waffle/pull/2): Upgraded thirdparty JUnit to 4.10 - [@hazendaz](https://github.com/hazendaz).
* [#1](https://github.com/dblock/waffle/pull/1): Adjusted logging from info to debug to reduce noise level - [@mcfly83](https://github.com/mcfly83).

First release off [Github](http://github.com/dblock/waffle).

1.4 (6/21/2011)
===============

First release off [Github](http://github.com/dblock/waffle).

Features
--------

Expand Down
57 changes: 30 additions & 27 deletions Source/JNAWindowsAuthProvider/.classpath
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src"/>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="lib" path="/ThirdParty/jna/jna.jar"/>
<classpathentry kind="lib" path="/ThirdParty/jna/platform.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/catalina.jar" sourcepath="C:/Users/dblock/Source/Misc/tomcat/tc6"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/tomcat-coyote.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/bin/tomcat-juli.jar"/>
<classpathentry kind="lib" path="/ThirdParty/commons-logging/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="/ThirdParty/groboutils/lib/GroboUtils-5-core.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-core-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-web-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.web-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.beans-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.context-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.core-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.asm-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-config-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.aop-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.expression-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/guava/guava-r07.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src"/>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/ThirdParty/junit/junit4.10/junit-4.10.jar" sourcepath="/ThirdParty/junit/junit4.10/junit-4.10-src.jar"/>
<classpathentry kind="lib" path="/ThirdParty/jna/jna.jar"/>
<classpathentry kind="lib" path="/ThirdParty/jna/platform.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/catalina.jar" sourcepath="C:/Users/dblock/Source/Misc/tomcat/tc6"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/lib/tomcat-coyote.jar"/>
<classpathentry kind="lib" path="/ThirdParty/tomcat/bin/tomcat-juli.jar"/>
<classpathentry kind="lib" path="/ThirdParty/slf4j/slf4j-1.6.6/slf4j-api-1.6.6.jar"/>
<classpathentry kind="lib" path="C:/Users/Jeremy Landis/My Programs/Java/slf4j/slf4j-1.6.6/jcl-over-slf4j-1.6.6.jar"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a ThirdParty path, not an absolute path to C:/Users/Jeremy Landis/....

<classpathentry kind="lib" path="/ThirdParty/groboutils/lib/GroboUtils-5-core.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-core-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-web-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.web-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.beans-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.context-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.core-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.asm-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring-security/dist/spring-security-config-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.aop-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/spring/dist/org.springframework.expression-3.0.3.RELEASE.jar"/>
<classpathentry kind="lib" path="/ThirdParty/guava/guava-12.0.jar"/>
<classpathentry kind="lib" path="/ThirdParty/logback/logback-1.0.6/logback-classic-1.0.6.jar"/>
<classpathentry kind="lib" path="/ThirdParty/logback/logback-1.0.6/logback-core-1.0.6.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Loading