summaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/xml
diff options
context:
space:
mode:
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/xml')
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java30
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java25
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java25
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java26
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java25
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java27
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java32
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java28
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java32
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/package-info.java5
11 files changed, 0 insertions, 260 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java b/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java
deleted file mode 100644
index e6850261f2c..00000000000
--- a/container-core/src/main/java/com/yahoo/container/xml/bind/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.bind;
-
-import com.yahoo.osgi.annotation.ExportPackage;
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;