Return-Path: 
 <commits-return-4852-apmail-aries-commits-archive=aries.apache.org@aries.apache.org>
X-Original-To: apmail-aries-commits-archive@www.apache.org
Delivered-To: apmail-aries-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C6A9D9A9A
	for <apmail-aries-commits-archive@www.apache.org>;
 Thu, 29 Mar 2012 16:47:05 +0000 (UTC)
Received: (qmail 99461 invoked by uid 500); 29 Mar 2012 16:47:05 -0000
Delivered-To: apmail-aries-commits-archive@aries.apache.org
Received: (qmail 99394 invoked by uid 500); 29 Mar 2012 16:47:05 -0000
Mailing-List: contact commits-help@aries.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aries.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aries.apache.org>
List-Post: <mailto:commits@aries.apache.org>
List-Id: <commits.aries.apache.org>
Reply-To: dev@aries.apache.org
Delivered-To: mailing list commits@aries.apache.org
Received: (qmail 99372 invoked by uid 99); 29 Mar 2012 16:47:04 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 16:47:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 16:47:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1884F23888FE;
	Thu, 29 Mar 2012 16:46:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1306980 - in /aries/branches/1.0-prototype/ejb:
 ejb-modeller/pom.xml
 ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java
 openejb-extender/pom.xml
Date: Thu, 29 Mar 2012 16:46:42 -0000
To: commits@aries.apache.org
From: cumminsh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120329164643.1884F23888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cumminsh
Date: Thu Mar 29 16:46:42 2012
New Revision: 1306980

URL: http://svn.apache.org/viewvc?rev=1306980&view=rev
Log:
Moving up to trunk level r1306779

Modified:
    aries/branches/1.0-prototype/ejb/ejb-modeller/pom.xml
    aries/branches/1.0-prototype/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java
    aries/branches/1.0-prototype/ejb/openejb-extender/pom.xml

Modified: aries/branches/1.0-prototype/ejb/ejb-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/ejb-modeller/pom.xml?rev=1306980&r1=1306979&r2=1306980&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/ejb-modeller/pom.xml (original)
+++ aries/branches/1.0-prototype/ejb/ejb-modeller/pom.xml Thu Mar 29 16:46:42 2012
@@ -71,6 +71,10 @@
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>javaee-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
             </exclusions>
     	</dependency>
     	<dependency>
@@ -83,12 +87,17 @@
     		<artifactId>org.apache.aries.application.utils</artifactId>
     		<version>0.3.1-SNAPSHOT</version>
     	</dependency>
-        <dependency>
+         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
         	<groupId>org.apache.aries.testsupport</groupId>
         	<artifactId>org.apache.aries.testsupport.unit</artifactId>
         	<version>0.4</version>

Modified: aries/branches/1.0-prototype/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java?rev=1306980&r1=1306979&r2=1306980&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java (original)
+++ aries/branches/1.0-prototype/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java Thu Mar 29 16:46:42 2012
@@ -63,7 +63,7 @@ public class EJBModeller implements Serv
     ejbServices.setAllowedNames(allowedNames);
     locator.findEJBs(manifest, bundle, ejbServices);
     
-    logger.debug("modelServices", ejbServices);
+    logger.debug("ejbServices", ejbServices);
     return ejbServices;
   }
 

Modified: aries/branches/1.0-prototype/ejb/openejb-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/openejb-extender/pom.xml?rev=1306980&r1=1306979&r2=1306980&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/openejb-extender/pom.xml (original)
+++ aries/branches/1.0-prototype/ejb/openejb-extender/pom.xml Thu Mar 29 16:46:42 2012
@@ -66,6 +66,10 @@
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>javaee-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
             </exclusions>
     	</dependency>
     	<dependency>