You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ej...@apache.org on 2012/03/29 11:56:42 UTC

svn commit: r1306772 - in /aries/trunk/ejb: ejb-modeller/pom.xml ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java openejb-extender/pom.xml

Author: ejiang
Date: Thu Mar 29 09:56:42 2012
New Revision: 1306772

URL: http://svn.apache.org/viewvc?rev=1306772&view=rev
Log:
should be able to fix the Jenkins this time:(

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

Modified: aries/trunk/ejb/ejb-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller/pom.xml?rev=1306772&r1=1306771&r2=1306772&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller/pom.xml (original)
+++ aries/trunk/ejb/ejb-modeller/pom.xml Thu Mar 29 09:56: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>

Modified: aries/trunk/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java?rev=1306772&r1=1306771&r2=1306772&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java (original)
+++ aries/trunk/ejb/ejb-modeller/src/main/java/org/apache/aries/ejb/modelling/impl/EJBModeller.java Thu Mar 29 09:56:42 2012
@@ -45,7 +45,7 @@ public class EJBModeller implements Serv
    */
   public ParsedServiceElements modelServices(BundleManifest manifest, IDirectory bundle) 
     throws ModellerException {
-    logger.debug("modelServices() Entry>> Manifest: " + manifest + " Bundle: " + bundle);
+    logger.debug("modelServices", new Object[] {manifest, bundle});
     ParsedEJBServices ejbServices = new ParsedEJBServices();
     
     String header = manifest.getRawAttributes().getValue("Export-EJB");
@@ -63,7 +63,7 @@ public class EJBModeller implements Serv
     ejbServices.setAllowedNames(allowedNames);
     locator.findEJBs(manifest, bundle, ejbServices);
     
-    logger.debug("modelServices() Exit<< ejbServices: " + ejbServices);
+    logger.debug("ejbServices", ejbServices);
     return ejbServices;
   }
 

Modified: aries/trunk/ejb/openejb-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender/pom.xml?rev=1306772&r1=1306771&r2=1306772&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender/pom.xml Thu Mar 29 09:56: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>