From 9eadc0ccad42b4406bee0e1c3d34cfd8583003b8 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Tue, 1 Mar 2011 22:32:11 +0000
Subject: [PATCH] JETTY-1331 java 1.5

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2842 7e9141cc-0065-0410-87d8-b60c137991c4
---
 .../jetty/xml/ConfigurationProcessor.java     |  1 -
 .../eclipse/jetty/xml/XmlConfiguration.java   | 49 ++++++++++++++++---
 .../jetty/xml/XmlConfigurationTest.java       |  6 +--
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/ConfigurationProcessor.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/ConfigurationProcessor.java
index 9765ed49589..09f6f226149 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/ConfigurationProcessor.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/ConfigurationProcessor.java
@@ -15,7 +15,6 @@ package org.eclipse.jetty.xml;
 
 import java.net.URL;
 import java.util.Map;
-import java.util.ServiceLoader;
 
 /**
  * A ConfigurationProcessor for non XmlConfiguration format files.
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index ec89efef4e3..bbd8ee3691e 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -36,7 +36,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
-import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -61,14 +60,35 @@ import org.xml.sax.SAXException;
  */
 public class XmlConfiguration
 {
-    private static Class<?>[] __primitives =
+    private static final Class<?>[] __primitives =
     { Boolean.TYPE, Character.TYPE, Byte.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE, Void.TYPE };
 
-    private static Class<?>[] __primitiveHolders =
+    private static final Class<?>[] __primitiveHolders =
     { Boolean.class, Character.class, Byte.class, Short.class, Integer.class, Long.class, Float.class, Double.class, Void.class };
     private static final Integer ZERO = new Integer(0);
     
-    private static ServiceLoader<ConfigurationProcessorFactory> __factoryLoader = ServiceLoader.load(ConfigurationProcessorFactory.class);   
+    private static final Iterable<?> __factoryLoader;
+    static
+    {
+        Iterable<?> loader=null;
+        try
+        {
+            // Use reflection to look up 1.6 service loader
+            // loader=ServiceLoader.load(ConfigurationProcessorFactory.class); 
+            Class<?> slc = ClassLoader.getSystemClassLoader().loadClass("java.util.ServiceLoader");
+            Method load = slc.getMethod("load",Class.class);
+            loader=(Iterable<?>)load.invoke(null,ConfigurationProcessorFactory.class);
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+            Log.ignore(e);
+        }
+        finally
+        {
+            __factoryLoader=loader;
+        }
+    }  
 
     /* ------------------------------------------------------------ */
     private static XmlParser __parser;
@@ -177,11 +197,22 @@ public class XmlConfiguration
         {
             _processor=new JettyXmlConfiguration();
         }
-        else
+        else if (__factoryLoader!=null)
         {
-            for ( ConfigurationProcessorFactory factory : __factoryLoader)
+            for ( Object factory : __factoryLoader)
             {
-                _processor = factory.getConfigurationProcessor(_dtd,config.getTag());
+                // use reflection to get 1.6 methods
+                Method gcp;
+                try
+                {
+                    gcp = factory.getClass().getMethod("getConfigurationProcessor",String.class,String.class);
+                    _processor = (ConfigurationProcessor) gcp.invoke(factory,_dtd,config.getTag());
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                    Log.ignore(e);
+                }
                 if (_processor!=null)
                     break;
             }
@@ -189,6 +220,10 @@ public class XmlConfiguration
             if (_processor==null)
                 throw new IllegalStateException("Unknown configuration type: "+config.getTag()+" in "+this);
         }
+        else
+        {
+            throw new IllegalArgumentException("Unknown XML tag:"+config.getTag());
+        }
         _processor.init(_url,_config,_idMap, _propertyMap);
     }
     
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
index f882fa44273..6608b1639c8 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
@@ -13,15 +13,15 @@
 
 package org.eclipse.jetty.xml;
 
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class XmlConfigurationTest
 {
     protected String _configure="org/eclipse/jetty/xml/configure.xml";