Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
azinman committed Mar 17, 2011
2 parents 03a5068 + 23d35ea commit eba8bb6db125b45052f838e924fd053d551c0d85
Showing with 11 additions and 10 deletions.
  1. +4 −0 README.textile
  2. +4 −8 pom.xml
  3. +3 −2 src/main/scala/com/shorrockin/cascal/utils/Logging.scala
View
@@ -1,3 +1,7 @@
h3. Project Status
I am no longer actively developing Cascal due to some work changes and the non-existence of free-time at this point in my life. This is not to say I won't return to this project at some point in the future, however I can make no current commitments to quality on this. If you would like to fork and continue the project please feel free to do so. If you happen to do so, let me know and I'll link to your fork from this page. Cheers.
h3. Cascal - Cassandra Simplified
|_. Primary Author|Chris Shorrock|
View
12 pom.xml
@@ -133,13 +133,13 @@
<repositories>
<repository>
<id>scala-tools.org</id>
<id>scala-tools.org-snapshots</id>
<name>Scala-Tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-snapshots/</url>
</repository>
<repository>
<id>scala-tools.org</id>
<id>scala-tools.org-releases</id>
<name>Scala-Tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases/</url>
</repository>
@@ -187,18 +187,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.5.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -1,12 +1,13 @@
package com.shorrockin.cascal.utils
import org.apache.commons.logging.LogFactory
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* simple logging trait to access the commons logging trait.
*
* @author Chris Shorrock
*/
trait Logging {
lazy val log = LogFactory.getLog(this.getClass.getName)
lazy val log = LoggerFactory.getLogger(this.getClass.getName)
}

0 comments on commit eba8bb6

Please sign in to comment.