svn commit: r1086334 - in /openejb/trunk/openejb3: assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/ container/openejb-core/src/main/java/org/apache/openejb/config/

[dblevins]

Author: dblevins
Date: Mon Mar 28 18:41:33 2011
New Revision: 1086334

URL: http://svn.apache.org/viewvc?rev=1086334&view=rev
Log:
Jetty tests are failing.  This doesn't fix them but it seems to get them closer.

Modified:
    
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java

Modified: 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java?rev=1086334&r1=1086333&r2=1086334&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
 Mon Mar 28 18:41:33 2011
@@ -41,6 +41,7 @@ import javax.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.lang.reflect.Field;
@@ -235,11 +236,14 @@ public class OpenEJBConfiguration implem
         }
 
         // create the web module
-        String basePath = new 
File(servletContext.getRealPath(".")).getParentFile().getAbsolutePath();
+        File context = new File(servletContext.getRealPath("."));
+        String basePath = context.getParentFile().getAbsolutePath();
         ClassLoader classLoader = 
application.getClassLoader();//ClassLoaderUtil.createTempClassLoader(application.getClassLoader());
         System.out.println("context path = " + application);
 
         WebModule webModule = new WebModule(webApp, application.getWar(), 
classLoader, basePath, getId(application));
+        URL[] webappUrls = DeploymentLoader.getWebappUrls(context);
+        webModule.setUrls(Arrays.asList(webappUrls));
 
         // process the annotations
         try {

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1086334&r1=1086333&r2=1086334&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
 Mon Mar 28 18:41:33 2011
@@ -47,7 +47,7 @@ public class FinderFactory {
         if (module instanceof WebModule) {
             WebModule webModule = (WebModule) module;
             final ClassLoader webClassLoader = webModule.getClassLoader();
-            return new ClassFinder(webClassLoader, webModule.getUrls());
+            return new AnnotationFinder(new ClasspathArchive(webClassLoader, 
webModule.getUrls()));
         }
 
         if (module.getJarLocation() != null) {

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=1086334&r1=1086333&r2=1086334&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
 Mon Mar 28 18:41:33 2011
@@ -58,7 +58,6 @@ public class WebModule implements WsModu
     public WebModule(WebApp webApp, String contextRoot, ClassLoader 
classLoader, String jarLocation, String moduleId) {
         this.webApp = webApp;
 
-
         File file = (jarLocation == null) ? null : new File(jarLocation);
         this.id = new ID(null, webApp, moduleId, file, null, this);
         this.validation = new ValidationContext(this);