Make annotations and JNDI wortk with OSGi

5 files changed, 169 insertions, 102 deletions

diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java
index 89621a2284..726aa694d9 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java
@@ -143,63 +143,12 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen
             {   
                 //apply the contextFile, creating the ContextHandler, the DeploymentManager will register it in the ContextHandlerCollection
                 Resource res = null;
-
-                //try to find the context file in the filesystem
-                if (_contextFile.startsWith("/"))
-                    res = getFileAsResource(_contextFile);
-
-                //try to find it relative to jetty home
-                if (res == null)
-                {
-                    //See if the specific server we are related to has jetty.home set
-                    String jettyHome = (String)getServerInstanceWrapper().getServer().getAttribute(OSGiServerConstants.JETTY_HOME);
-                    if (jettyHome != null)
-                        res = getFileAsResource(jettyHome, _contextFile);
-
-                    //try to see if a SystemProperty for jetty.home is set
-                    if (res == null)
-                    {
-                        jettyHome =  System.getProperty(OSGiServerConstants.JETTY_HOME);
-
-                        if (jettyHome != null)
-                        {
-                            if (jettyHome.startsWith("\"") || jettyHome.startsWith("'"))
-                                jettyHome = jettyHome.substring(1);
-                            if (jettyHome.endsWith("\"") || (jettyHome.endsWith("'")))
-                                jettyHome = jettyHome.substring(0,jettyHome.length()-1);
-
-                            res = getFileAsResource(jettyHome, _contextFile); 
-                            LOG.debug("jetty home context file: {}",res);
-                        }
-                    }
-                }
-
-                //try to find it relative to an override location that has been specified
-                if (res == null)
-                {                 
-                    if (bundleOverrideLocation != null)
-                    { 
-                        try(Resource location=Resource.newResource(bundleOverrideLocation))
-                        {
-                            res=location.addPath(_contextFile);
-                        }
-                        LOG.debug("Bundle override location context file: {}",res);
-                    }
-                }         
-
-                //try to find it relative to the bundle in which it is being deployed
-                if (res == null)
-                {
-                    if (_contextFile.startsWith("./"))
-                        _contextFile = _contextFile.substring(1);
-
-                    if (!_contextFile.startsWith("/"))
-                        _contextFile = "/" + _contextFile;
-
-                    URL contextURL = _bundle.getEntry(_contextFile);
-                    if (contextURL != null)
-                        res = Resource.newResource(contextURL);
-                }
+                
+                String jettyHome = (String)getServerInstanceWrapper().getServer().getAttribute(OSGiServerConstants.JETTY_HOME);
+                if (jettyHome == null)
+                    jettyHome =  System.getProperty(OSGiServerConstants.JETTY_HOME);
+                
+                res = findFile(_contextFile, jettyHome, bundleOverrideLocation, _bundle);
 
                 //apply the context xml file, either to an existing ContextHandler, or letting the
                 //it create the ContextHandler as necessary
@@ -266,38 +215,6 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen
            
         }
 
-
-        private Resource getFileAsResource (String dir, String file)
-        {
-            Resource r = null;
-            try
-            {
-                File asFile = new File (dir, file);
-                if (asFile.exists())
-                    r = Resource.newResource(asFile);
-            }
-            catch (Exception e)
-            {
-                r = null;
-            } 
-            return r;
-        }
-        
-        private Resource getFileAsResource (String file)
-        {
-            Resource r = null;
-            try
-            {
-                File asFile = new File (file);
-                if (asFile.exists())
-                    r = Resource.newResource(asFile);
-            }
-            catch (Exception e)
-            {
-                r = null;
-            } 
-            return r;
-        }
     }
     
     /* ------------------------------------------------------------ */
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java
index 185d0f1ae6..7ffc9b4c66 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java
@@ -18,6 +18,8 @@
 
 package org.eclipse.jetty.osgi.boot;
 
+import java.io.File;
+import java.net.URL;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -25,6 +27,9 @@ import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.AppProvider;
 import org.eclipse.jetty.deploy.DeploymentManager;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.util.resource.Resource;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
@@ -39,6 +44,8 @@ import org.osgi.framework.ServiceRegistration;
  */
 public abstract class AbstractOSGiApp extends App
 {      
+    private static final Logger LOG = Log.getLogger(AbstractOSGiApp.class);
+    
     protected Bundle _bundle;
     protected Dictionary _properties;
     protected ServiceRegistration _registration;
@@ -118,4 +125,91 @@ public abstract class AbstractOSGiApp extends App
         _registration = null;
     }
 
+    protected Resource getFileAsResource (String dir, String file)
+    {
+        Resource r = null;
+        try
+        {
+            File asFile = new File (dir, file);
+            if (asFile.exists())
+                r = Resource.newResource(asFile);
+        }
+        catch (Exception e)
+        {
+            r = null;
+        } 
+        return r;
+    }
+    
+    protected Resource getFileAsResource (String file)
+    {
+        Resource r = null;
+        try
+        {
+            File asFile = new File (file);
+            if (asFile.exists())
+                r = Resource.newResource(asFile);
+        }
+        catch (Exception e)
+        {
+            r = null;
+        } 
+        return r;
+    }
+    
+    protected Resource findFile (String fileName, String jettyHome, String bundleOverrideLocation, Bundle containingBundle)
+    {
+        Resource res = null;
+
+        //try to find the context file in the filesystem
+        if (fileName.startsWith("/"))
+            res = getFileAsResource(fileName);
+        if (res != null)
+            return res;
+
+        //try to find it relative to jetty home
+        if (jettyHome != null)
+        {
+            if (jettyHome.startsWith("\"") || jettyHome.startsWith("'"))
+                jettyHome = jettyHome.substring(1);
+            if (jettyHome.endsWith("\"") || (jettyHome.endsWith("'")))
+                jettyHome = jettyHome.substring(0,jettyHome.length()-1);
+
+            res = getFileAsResource(jettyHome, fileName); 
+        }
+        if (res != null)
+            return res;
+       
+
+        //try to find it relative to an override location that has been specified               
+        if (bundleOverrideLocation != null)
+        { 
+            try(Resource location=Resource.newResource(bundleOverrideLocation))
+            {
+                res=location.addPath(fileName);
+            }
+            catch (Exception e)
+            {
+                LOG.warn(e);
+            }
+        }        
+        if (res != null)
+            return res;
+        
+        //try to find it relative to the bundle in which it is being deployed
+        if (containingBundle != null)
+        {
+            if (fileName.startsWith("./"))
+                fileName = fileName.substring(1);
+
+            if (!fileName.startsWith("/"))
+                fileName = "/" + fileName;
+
+            URL entry = _bundle.getEntry(fileName);
+            if (entry != null)
+                res = Resource.newResource(entry);
+        }
+        
+        return res;
+    }
 }
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
index 97f9296114..849a00c55c 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
@@ -20,10 +20,12 @@ package org.eclipse.jetty.osgi.boot;
 
 import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 
 import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.AppProvider;
@@ -32,7 +34,9 @@ import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper;
 import org.eclipse.jetty.osgi.boot.internal.webapp.OSGiWebappClassLoader;
 import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelperFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.util.ArrayUtil;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
+import org.eclipse.jetty.util.Loader;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.resource.JarResource;
@@ -73,17 +77,23 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
     
     public static String[] getDefaultConfigurations ()
     {
+        List<String> configs = ArrayUtil.asMutableList(__defaultConfigurations);
         if (annotationsAvailable())
         {
-            String[] configs = new String[__defaultConfigurations.length+1];
-            System.arraycopy(__defaultConfigurations, 0, configs, 0, 4);
-            configs[4] = "org.eclipse.jetty.osgi.annotations.AnnotationConfiguration";
-            configs[5] = __defaultConfigurations[__defaultConfigurations.length-1];
-            return configs;
+            //add before JettyWebXmlConfiguration
+            int i = configs.indexOf("org.eclipse.jetty.webapp.JettyWebXmlConfiguration");
+            configs.add(i, "org.eclipse.jetty.osgi.annotations.AnnotationConfiguration");
+        }
+        
+        if (jndiAvailable())
+        {
+            //add in EnvConfiguration and PlusConfiguration just after FragmentConfiguration
+            int i = configs.indexOf("org.eclipse.jetty.webapp.FragmentConfiguration");
+            configs.add(++i, "org.eclipse.jetty.plus.webapp.EnvConfiguration");
+            configs.add(++i, "org.eclipse.jetty.plus.webapp.PlusConfiguration");
         }
 
-
-        return Arrays.copyOf(__defaultConfigurations, __defaultConfigurations.length);
+        return configs.toArray(new String[configs.size()]);
     }
 
     private static boolean annotationsAvailable()
@@ -91,7 +101,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
         boolean result = false;
         try
         {
-            Thread.currentThread().getContextClassLoader().loadClass("org.eclipse.jetty.annotations.AnnotationConfiguration");
+            Loader.loadClass(AbstractWebAppProvider.class,"org.eclipse.jetty.annotations.AnnotationConfiguration");
             result = true;
             LOG.debug("Annotation support detected");
         }
@@ -104,6 +114,23 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
         return result;
     }
     
+    
+    private static boolean jndiAvailable()
+    {
+        try
+        {
+            Loader.loadClass(AbstractWebAppProvider.class, "org.eclipse.jetty.plus.jndi.Resource");
+            Loader.loadClass(AbstractWebAppProvider.class, "org.eclipse.jetty.plus.webapp.EnvConfiguration");
+            LOG.debug("JNDI support detected");
+            return true;
+        }
+        catch (ClassNotFoundException e)
+        {
+            LOG.debug("No JNDI support detected");
+            return false;
+        }
+    }
+    
 
     private boolean _parentLoaderPriority;
 
@@ -268,7 +295,6 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
 
             //Sets the location of the war file
             // converts bundleentry: protocol if necessary
-            System.err.println("WAR : "+BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(url).toString());
             _webApp.setWar(BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(url).toString());
 
             // Set up what has been configured on the provider
@@ -329,7 +355,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
 
             // apply any META-INF/context.xml file that is found to configure
             // the webapp first
-            applyMetaInfContextXml(rootResource);
+            applyMetaInfContextXml(rootResource, overrideBundleInstallLocation);
 
             _webApp.setAttribute(OSGiWebappConstants.REQUIRE_TLD_BUNDLE, requireTldBundles);
 
@@ -385,7 +411,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
         }
         
         
-        protected void applyMetaInfContextXml(Resource rootResource)
+        protected void applyMetaInfContextXml(Resource rootResource, String overrideBundleInstallLocation)
         throws Exception
         {
             if (_bundle == null) return;
@@ -399,8 +425,31 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
                 Thread.currentThread().setContextClassLoader(_webApp.getClassLoader());
 
                 //TODO replace this with getting the InputStream so we don't cache in URL
-                // find if there is a META-INF/context.xml file
+                //Try looking for a context xml file in META-INF with a specific name
                 URL contextXmlUrl = _bundle.getEntry("/META-INF/jetty-webapp-context.xml");
+                
+                if (contextXmlUrl == null)
+                {
+                    //Didn't find specially named file, try looking for a property that names a context xml file to use
+                    if (_properties != null)
+                    {
+                        String tmp = (String)_properties.get(OSGiWebappConstants.JETTY_CONTEXT_FILE_PATH);
+                        if (tmp != null)
+                        {
+                            String[] filenames = tmp.split(",;");
+                            if (filenames != null && filenames.length > 0)
+                            {
+                                String filename = filenames[0]; //should only be 1 filename in this usage
+                                String jettyHome = (String)getServerInstanceWrapper().getServer().getAttribute(OSGiServerConstants.JETTY_HOME);
+                                if (jettyHome == null)
+                                    jettyHome =  System.getProperty(OSGiServerConstants.JETTY_HOME);
+                                Resource res = findFile(filename, jettyHome, overrideBundleInstallLocation, _bundle);
+                                if (res != null)
+                                    contextXmlUrl = res.getURL();
+                            }
+                        }
+                    }
+                }
                 if (contextXmlUrl == null) return;
 
                 // Apply it just as the standard jetty ContextProvider would do
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
index 1cd720b601..65466f506a 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
@@ -106,6 +106,13 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu
         if (bundle == null)
             return false;
 
+        //If the bundle defines a Web-ContextPath then its probably a webapp and the BundleWebAppProvider should deploy it
+        if ((String)bundle.getHeaders().get(OSGiWebappConstants.RFC66_WEB_CONTEXTPATH) != null)
+        {
+            if (LOG.isDebugEnabled()) LOG.debug("BundleContextProvider ignoring bundle {} with {} set", bundle.getSymbolicName(), OSGiWebappConstants.RFC66_WEB_CONTEXTPATH);
+            return false;
+        }
+        
         String contextFiles  = (String)bundle.getHeaders().get(OSGiWebappConstants.JETTY_CONTEXT_FILE_PATH);
         if (contextFiles == null)
             contextFiles = (String)bundle.getHeaders().get(OSGiWebappConstants.SERVICE_PROP_CONTEXT_FILE_PATH);
@@ -113,6 +120,7 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu
         if (contextFiles == null)
             return false;
         
+        
         boolean added = false;
         //bundle defines JETTY_CONTEXT_FILE_PATH header,
         //a comma separated list of context xml files that each define a ContextHandler
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
index bdd52ac537..62d9f0b341 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
@@ -100,7 +100,6 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleRe
     @Override
     public Class<?> loadClass(String name) throws ClassNotFoundException
     {
-        System.err.println("LOADING  CLASS: "+name);
         return super.loadClass(name);
     }