Remove on Vespa 8

11 files changed, 0 insertions, 339 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java
deleted file mode 100644
index 4777d588d48..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class DatatypeFactoryProvider implements Provider<DatatypeFactory> {
-
-    public static final String FACTORY_CLASS = DatatypeFactory.DATATYPEFACTORY_IMPLEMENTATION_CLASS;
-
-    @Override
-    public DatatypeFactory get() {
-        try {
-            return DatatypeFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader());
-        } catch (DatatypeConfigurationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java
deleted file mode 100644
index 769c3d7d7da..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class DocumentBuilderFactoryProvider implements Provider<DocumentBuilderFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
-
-    @Override
-    public DocumentBuilderFactory get() {
-        return DocumentBuilderFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader());
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java
deleted file mode 100644
index 8dafbe3042a..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.parsers.SAXParserFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class SAXParserFactoryProvider implements Provider<SAXParserFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl";
-
-    @Override
-    public SAXParserFactory get() {
-        return SAXParserFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader());
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java
deleted file mode 100644
index 344686a252e..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.XMLConstants;
-import javax.xml.validation.SchemaFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class SchemaFactoryProvider implements Provider<SchemaFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory";
-
-    @Override
-    public SchemaFactory get() {
-        return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI, FACTORY_CLASS, this.getClass().getClassLoader());
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java
deleted file mode 100644
index 851c4c1c51c..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.transform.TransformerFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class TransformerFactoryProvider implements Provider<TransformerFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
-
-    @Override
-    public TransformerFactory get() {
-        return TransformerFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader());
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java
deleted file mode 100644
index 5039d47855d..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.stream.XMLEventFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class XMLEventFactoryProvider implements Provider<XMLEventFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl";
-
-    @Override
-    public XMLEventFactory get() {
-        System.setProperty("javax.xml.stream.XMLEventFactory", FACTORY_CLASS);
-        // NOTE: In case the newFactory(String, ClassLoader) is used, XMLEventFactory treats the string as classname.
-        return XMLEventFactory.newFactory();
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java
deleted file mode 100644
index 07a0f740d55..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.stream.XMLInputFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class XMLInputFactoryProvider implements Provider<XMLInputFactory> {
-
-    private static final String INPUT_FACTORY_INTERFACE = XMLInputFactory.class.getName();
-    public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLInputFactoryImpl";
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public XMLInputFactory get() {
-        //ugly, but must be done
-        System.setProperty(INPUT_FACTORY_INTERFACE, FACTORY_CLASS);
-
-        // NOTE: In case the newFactory(String, ClassLoader) is used,
-        //       the given class loader is ignored if the system property is set!
-        return XMLInputFactory.newFactory();
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java
deleted file mode 100644
index 50d10836938..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.stream.XMLOutputFactory;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class XMLOutputFactoryProvider implements Provider<XMLOutputFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLOutputFactoryImpl";
-    @Override
-    public XMLOutputFactory get() {
-        System.setProperty("javax.xml.stream.XMLOutputFactory", FACTORY_CLASS);
-
-        // NOTE: In case the newFactory(String, ClassLoader) is used, XMLOutputFactory treats the string as system
-        //       property name. Also, the given class loader is ignored if the property is set!
-        return XMLOutputFactory.newFactory();
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java
deleted file mode 100644
index 429cf09b5ab..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPathFactoryConfigurationException;
-
-/**
- * @author Einar M R Rosenvinge
- * @deprecated Do not use!
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class XPathFactoryProvider implements Provider<XPathFactory> {
-
-    public static final String FACTORY_CLASS = "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl";
-
-    @Override
-    public XPathFactory get() {
-        try {
-            return XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI,
-                                            FACTORY_CLASS,
-                                            this.getClass().getClassLoader());
-        } catch (XPathFactoryConfigurationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Override
-    public void deconstruct() { }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/package-info.java b/container-core/src/main/java/com/yahoo/container/xml/providers/package-info.java
deleted file mode 100644
index d29f104910f..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/providers/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.container.xml.providers;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java b/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java
deleted file mode 100644
index e9983341507..00000000000
--- a/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.xml.providers;
-
-import org.junit.Test;
-
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.xpath.XPathFactory;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
- */
-@SuppressWarnings("deprecation")
-public class XMLProviderTest {
-
-    @Test
-    public void testInstantiationAndDestruction() {
-        {
-            DatatypeFactoryProvider provider = new DatatypeFactoryProvider();
-            DatatypeFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(DatatypeFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            DocumentBuilderFactoryProvider provider = new DocumentBuilderFactoryProvider();
-            DocumentBuilderFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(DocumentBuilderFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            SAXParserFactoryProvider provider = new SAXParserFactoryProvider();
-            SAXParserFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(SAXParserFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            SchemaFactoryProvider provider = new SchemaFactoryProvider();
-            SchemaFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(SchemaFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            TransformerFactoryProvider provider = new TransformerFactoryProvider();
-            TransformerFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(TransformerFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            XMLEventFactoryProvider provider = new XMLEventFactoryProvider();
-            XMLEventFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(XMLEventFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            XMLInputFactoryProvider provider = new XMLInputFactoryProvider();
-            XMLInputFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(XMLInputFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            XMLOutputFactoryProvider provider = new XMLOutputFactoryProvider();
-            XMLOutputFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(XMLOutputFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-        {
-            XPathFactoryProvider provider = new XPathFactoryProvider();
-            XPathFactory factory = provider.get();
-            assertThat(factory.getClass().getName(), equalTo(XPathFactoryProvider.FACTORY_CLASS));
-            provider.deconstruct();
-        }
-    }
-
-}