aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cummi...@apache.org
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 GMT
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>



Mime
View raw message