geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r512007 [2/2] - in /geronimo/server/trunk: ./ modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ modules/geronimo-corba-bu...
Date Mon, 26 Feb 2007 20:52:08 GMT
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?view=diff&rev=512007&r1=512006&r2=512007
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Mon Feb 26 12:52:05 2007
@@ -769,10 +769,11 @@
             // <ejb-local-ref>
             if (EJBAnnotationHelper.annotationsPresent(classFinder)) {
                 try {
-                    webApp = EJBAnnotationHelper.processAnnotations(webApp, classFinder);
+                    ClassFinder ejbFinder = new ClassFinder(classLoader);
+                    webApp = EJBAnnotationHelper.processAnnotations(webApp, classFinder,
ejbFinder);
                 }
                 catch (Exception e) {
-                    throw new DeploymentException("TomcatModuleBuilder: Error processing
@EJB(s) annotations");
+                    throw new DeploymentException("TomcatModuleBuilder: Error processing
@EJB(s) annotations", e);
                 }
             }
 
@@ -787,7 +788,7 @@
                     ResourceAnnotationHelper.processAnnotations(webApp, classFinder);
                 }
                 catch (Exception e) {
-                    throw new DeploymentException("TomcatModuleBuilder: Error processing
@Resource(s) annotations");
+                    throw new DeploymentException("TomcatModuleBuilder: Error processing
@Resource(s) annotations", e);
                 }
             }
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=512007&r1=512006&r2=512007
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Feb 26 12:52:05 2007
@@ -260,14 +260,20 @@
 
             <dependency>
                 <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-finder</artifactId>
+                <version>2.9-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
                 <version>2.8</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-finder</artifactId>
-                <version>2.9-SNAPSHOT</version>
+                <artifactId>xbean-reflect</artifactId>
+                <version>2.8</version>
             </dependency>
 
             <dependency>



Mime
View raw message