geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1142364 - in /geronimo/tck/branches/3.0/atinject-tck-runner: pom.xml src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java
Date Sun, 03 Jul 2011 02:44:50 GMT
Author: genspring
Date: Sun Jul  3 02:44:50 2011
New Revision: 1142364

URL: http://svn.apache.org/viewvc?rev=1142364&view=rev
Log:
update some dependencies to make geronimo atjnject tck work again

Modified:
    geronimo/tck/branches/3.0/atinject-tck-runner/pom.xml
    geronimo/tck/branches/3.0/atinject-tck-runner/src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java

Modified: geronimo/tck/branches/3.0/atinject-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/atinject-tck-runner/pom.xml?rev=1142364&r1=1142363&r2=1142364&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/atinject-tck-runner/pom.xml (original)
+++ geronimo/tck/branches/3.0/atinject-tck-runner/pom.xml Sun Jul  3 02:44:50 2011
@@ -53,6 +53,11 @@
                 <artifactId>openwebbeans-porting</artifactId>
                 <version>${openwebbeansVersion}</version>
             </dependency>
+			<dependency>
+                <groupId>org.apache.openwebbeans</groupId>
+                <artifactId>openwebbeans-ejb</artifactId>
+                <version>${openwebbeansVersion}</version>
+            </dependency>            
 		</dependencies>
 	</dependencyManagement>
 
@@ -82,6 +87,12 @@
             <artifactId>openwebbeans-porting</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-ejb</artifactId>
+            <scope>provided</scope>
+        </dependency>        
 
         <dependency>
             <groupId>junit</groupId>
@@ -92,6 +103,7 @@
             <artifactId>openejb-core</artifactId>
             <version>3.1.2</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-jee</artifactId>
@@ -110,16 +122,29 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+             </exclusions>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+             </exclusions>            
         </dependency>
         
         <dependency>
@@ -137,13 +162,24 @@
             <artifactId>scannotation</artifactId>
         </dependency>
         
+       <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+            
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.8</version>
         </dependency>
         
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.5.8</version>
+        </dependency>        
+        
+        <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>                
         </dependency>
@@ -154,17 +190,6 @@
         </dependency>
         
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.5</version>
-        </dependency>
-            
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jacc_1.4_spec</artifactId>
         </dependency>        

Modified: geronimo/tck/branches/3.0/atinject-tck-runner/src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/atinject-tck-runner/src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java?rev=1142364&r1=1142363&r2=1142364&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/atinject-tck-runner/src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java
(original)
+++ geronimo/tck/branches/3.0/atinject-tck-runner/src/test/java/org/apache/webbeans/atinject/tck/container/AtInjectContainer.java
Sun Jul  3 02:44:50 2011
@@ -77,9 +77,10 @@ public class AtInjectContainer extends S
             
             return Tck.testsFor(car, false, true);
             
-        }catch(DeploymentException e)
+        } catch(DeploymentException e)
         {
-            e.printStackTrace();
+            logger.error(e);
+            excpetion = e;
         }
         
         return null;



Mime
View raw message