Fix errors from small osgi refactor; comment out some test code

jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/TagLibOSGiConfiguration.java

@@ -115,24 +115,24 @@ public class TagLibOSGiConfiguration extends TagLibConfiguration
             {
                 atLeastOneTldFound = true;
                 URL oriUrl = en.nextElement();
-                URL url = BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(oriUrl);
-                Resource tldResource;
                 try
                 {
+                    URL url = BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(oriUrl);
+                    Resource tldResource;
                     tldResource = Resource.newResource(url);
+                    tlds.add(tldResource);
                 }
-                catch (IOException e)
+                catch (Exception e)
                 {
                     throw new IllegalArgumentException("Unable to locate the " + "tld resource in '"
-                                                       + url.toString()
+                            + oriUrl.toString()
-                                                       + "' in the bundle '"
+                            + "' in the bundle '"
-                                                       + bs[0].getSymbolicName()
+                            + bs[0].getSymbolicName()
-                                                       + "' while registering the "
+                            + "' while registering the "
-                                                       + OSGiWebappConstants.REQUIRE_TLD_BUNDLE
+                            + OSGiWebappConstants.REQUIRE_TLD_BUNDLE
-                                                       + " of the manifest of "
+                            + " of the manifest of "
-                                                       + bundle.getSymbolicName(), e);
+                            + bundle.getSymbolicName(), e);
                 }
-                tlds.add(tldResource);
             }
             if (!atLeastOneTldFound)
             {

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/Util.java

@@ -46,7 +46,7 @@ public class Util
      * @throws MalformedURLException 
      */
     public static List<URL> fileNamesAsURLs(String val, String delims) 
-    throws MalformedURLException
+    throws Exception
     {
         String separators = DEFAULT_DELIMS;
         if (delims == null)

jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java

@@ -46,11 +46,30 @@ public class Activator implements BundleActivator
      */
     public void start(BundleContext context) throws Exception
     {
+        String serverName = "defaultJettyServer";
+        
+        /* Uncomment to create a different server instance to deploy to. Also change
+         * TestJettyOSGiBootWebAppAsService to use the port 9999
+         
+        Server server = new Server();
+        //do any setup on Server in here
+        serverName = "fooServer";
+        Dictionary serverProps = new Hashtable();
+        //define the unique name of the server instance
+        serverProps.put("managedServerName", serverName);
+        serverProps.put("jetty.port", "9999");
+        //let Jetty apply some configuration files to the Server instance
+        serverProps.put("jetty.etc.config.urls", "file:/opt/jetty/etc/jetty.xml,file:/opt/jetty/etc/jetty-selector.xml,file:/opt/jetty/etc/jetty-deployer.xml");
+        //register as an OSGi Service for Jetty to find 
+        context.registerService(Server.class.getName(), server, serverProps);
+        */
+        
+        //Create a webapp context as a Service and target it at the Server created above
         WebAppContext webapp = new WebAppContext();
         Dictionary props = new Hashtable();
         props.put("war",".");
         props.put("contextPath","/acme");
-        //uiProps.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, serverName);
+        props.put("managedServerName", serverName);
         context.registerService(ContextHandler.class.getName(),webapp,props);
     }