You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/05/23 15:29:05 UTC
svn commit: r1597091 - in /tomee/tomee/trunk: arquillian/arquillian-tck/pom.xml tomee/tomee-juli/pom.xml tomee/tomee-loader/pom.xml tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java

Author: andygumbrecht
Date: Fri May 23 13:29:04 2014
New Revision: 1597091

URL: http://svn.apache.org/r1597091
Log:
arquillian-tck 1.0.0.Alpha1

Modified:
    tomee/tomee/trunk/arquillian/arquillian-tck/pom.xml
    tomee/tomee/trunk/tomee/tomee-juli/pom.xml
    tomee/tomee/trunk/tomee/tomee-loader/pom.xml
    tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java

Modified: tomee/tomee/trunk/arquillian/arquillian-tck/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tck/pom.xml?rev=1597091&r1=1597090&r2=1597091&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tck/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tck/pom.xml Fri May 23 13:29:04 2014
@@ -31,7 +31,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <tck.version>1.0.0.Final-SNAPSHOT</tck.version>
+    <tck.version>1.0.0.Alpha1</tck.version>
   </properties>
 
   <dependencies>

Modified: tomee/tomee/trunk/tomee/tomee-juli/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-juli/pom.xml?rev=1597091&r1=1597090&r2=1597091&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-juli/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-juli/pom.xml Fri May 23 13:29:04 2014
@@ -34,7 +34,7 @@
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-juli</artifactId>
       <version>${tomcat.version}</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: tomee/tomee/trunk/tomee/tomee-loader/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/pom.xml?rev=1597091&r1=1597090&r2=1597091&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/pom.xml Fri May 23 13:29:04 2014
@@ -53,6 +53,7 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>tomee-juli</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
@@ -63,7 +64,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java?rev=1597091&r1=1597090&r2=1597091&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/log/Slf4jLogFactory.java Fri May 23 13:29:04 2014
@@ -18,10 +18,9 @@ package org.apache.tomee.loader.log;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogConfigurationException;
-import org.apache.juli.logging.LogFactory;
 import org.slf4j.LoggerFactory;
 
-public class Slf4jLogFactory extends LogFactory {
+public class Slf4jLogFactory extends org.apache.juli.logging.LogFactory {
     @Override
     public Log getInstance(final String name) throws LogConfigurationException {
         try {