This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/commons-xml.git
commit edcc84a88c4527bb265454f6d9db1ac3e91d4956 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Apr 27 12:47:26 2026 +0200 Move all classes to single package * Move all the classes to a single package By moving all the classes to a single package, the library becomes easier to handle. * Remove Moditect configuration Since all the packages are exported, the additional Moditect configuration is not needed any more. --- pom.xml | 20 -------------------- .../factory/{internal => }/AbstractXmlProvider.java | 3 +-- .../factory/{internal => }/CompositeProvider.java | 6 ++---- .../DelegatingDocumentBuilderFactory.java | 2 +- .../{internal => }/DelegatingSAXParserFactory.java | 2 +- .../{internal => }/DelegatingSchemaFactory.java | 2 +- .../xml/factory/{internal => }/DenyAllResolver.java | 2 +- .../factory/{internal => }/HardeningException.java | 4 ++-- .../{internal => }/HardeningSAXParserFactory.java | 3 +-- .../commons/xml/factory/{internal => }/Limits.java | 6 +++--- .../xml/factory/{internal => }/SaxonProvider.java | 5 ++--- .../xml/factory/{internal => }/StockJdkProvider.java | 5 ++--- .../xml/factory/{internal => }/WoodstoxProvider.java | 6 ++---- .../xml/factory/{internal => }/XercesProvider.java | 3 +-- .../org/apache/commons/xml/factory/XmlFactories.java | 2 -- .../commons/xml/factory/{spi => }/XmlProvider.java | 4 ++-- .../xml/factory/{attacks => }/AttackTestSupport.java | 3 +-- .../xml/factory/{attacks => }/BillionLaughsTest.java | 2 +- .../{internal => }/CompositeProviderTest.java | 3 +-- .../xml/factory/{attacks => }/DoctypeOnlyTest.java | 2 +- .../xml/factory/{attacks => }/ExternalDtdTest.java | 2 +- .../{attacks => }/ExternalGeneralEntityTest.java | 2 +- .../{attacks => }/ExternalParameterEntityTest.java | 2 +- .../{attacks => }/SaxonXPathExternalCallsTest.java | 3 +-- .../xml/factory/{attacks => }/SchemaImportTest.java | 2 +- .../xml/factory/{attacks => }/SchemaIncludeTest.java | 2 +- .../factory/{attacks => }/SchemaRedefineTest.java | 2 +- .../factory/{attacks => }/TemplatesImportTest.java | 2 +- .../factory/{attacks => }/TemplatesIncludeTest.java | 2 +- .../{attacks => }/TransformerDocumentTest.java | 2 +- .../factory/UnsupportedXmlImplementationTest.java | 1 - 31 files changed, 36 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 8fef604..aa43ef6 100644 --- a/pom.xml +++ b/pom.xml @@ -170,26 +170,6 @@ </executions> </plugin> - <plugin> - <groupId>org.moditect</groupId> - <artifactId>moditect-maven-plugin</artifactId> - <version>${commons.moditect-maven-plugin.version}</version> - <executions> - <execution> - <id>add-module-infos</id> - <configuration> - <module> - <moduleInfo> - <exports> - !*.internal; - *; - </exports> - </moduleInfo> - </module> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/src/main/java/org/apache/commons/xml/factory/internal/AbstractXmlProvider.java b/src/main/java/org/apache/commons/xml/factory/AbstractXmlProvider.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/AbstractXmlProvider.java rename to src/main/java/org/apache/commons/xml/factory/AbstractXmlProvider.java index c635209..47e564a 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/AbstractXmlProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/AbstractXmlProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import java.util.Arrays; import java.util.Collections; @@ -31,7 +31,6 @@ import javax.xml.validation.ValidatorHandler; import javax.xml.xpath.XPathFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.XMLReader; /** diff --git a/src/main/java/org/apache/commons/xml/factory/internal/CompositeProvider.java b/src/main/java/org/apache/commons/xml/factory/CompositeProvider.java similarity index 95% rename from src/main/java/org/apache/commons/xml/factory/internal/CompositeProvider.java rename to src/main/java/org/apache/commons/xml/factory/CompositeProvider.java index 90194e4..8eeef6f 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/CompositeProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/CompositeProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +28,6 @@ import javax.xml.validation.SchemaFactory; import javax.xml.xpath.XPathFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.XMLReader; /** @@ -53,7 +52,7 @@ * {@code configure}, never to advertise support. The interface implementation lets {@link org.apache.commons.xml.factory.XmlFactories} treat hardening * uniformly without an extra abstraction.</p> */ -public final class CompositeProvider implements XmlProvider { +final class CompositeProvider implements XmlProvider { private static final CompositeProvider INSTANCE = new CompositeProvider(defaultProviders()); @@ -143,7 +142,6 @@ private static List<XmlProvider> defaultProviders() { all.add(new XercesProvider()); all.add(new WoodstoxProvider()); all.add(new SaxonProvider()); - ServiceLoader.load(XmlProvider.class, CompositeProvider.class.getClassLoader()).forEach(all::add); return all; } } diff --git a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingDocumentBuilderFactory.java b/src/main/java/org/apache/commons/xml/factory/DelegatingDocumentBuilderFactory.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/DelegatingDocumentBuilderFactory.java rename to src/main/java/org/apache/commons/xml/factory/DelegatingDocumentBuilderFactory.java index 3a7e5bd..66bf446 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingDocumentBuilderFactory.java +++ b/src/main/java/org/apache/commons/xml/factory/DelegatingDocumentBuilderFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingSAXParserFactory.java b/src/main/java/org/apache/commons/xml/factory/DelegatingSAXParserFactory.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/DelegatingSAXParserFactory.java rename to src/main/java/org/apache/commons/xml/factory/DelegatingSAXParserFactory.java index 3813b16..b460f37 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingSAXParserFactory.java +++ b/src/main/java/org/apache/commons/xml/factory/DelegatingSAXParserFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; diff --git a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingSchemaFactory.java b/src/main/java/org/apache/commons/xml/factory/DelegatingSchemaFactory.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/DelegatingSchemaFactory.java rename to src/main/java/org/apache/commons/xml/factory/DelegatingSchemaFactory.java index 67f2c1e..a68c81a 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/DelegatingSchemaFactory.java +++ b/src/main/java/org/apache/commons/xml/factory/DelegatingSchemaFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.transform.Source; import javax.xml.validation.Schema; diff --git a/src/main/java/org/apache/commons/xml/factory/internal/DenyAllResolver.java b/src/main/java/org/apache/commons/xml/factory/DenyAllResolver.java similarity index 99% rename from src/main/java/org/apache/commons/xml/factory/internal/DenyAllResolver.java rename to src/main/java/org/apache/commons/xml/factory/DenyAllResolver.java index cb1498b..46c0cf1 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/DenyAllResolver.java +++ b/src/main/java/org/apache/commons/xml/factory/DenyAllResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.stream.XMLResolver; import javax.xml.stream.XMLStreamException; diff --git a/src/main/java/org/apache/commons/xml/factory/internal/HardeningException.java b/src/main/java/org/apache/commons/xml/factory/HardeningException.java similarity index 90% rename from src/main/java/org/apache/commons/xml/factory/internal/HardeningException.java rename to src/main/java/org/apache/commons/xml/factory/HardeningException.java index 804dcd1..30aa9f9 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/HardeningException.java +++ b/src/main/java/org/apache/commons/xml/factory/HardeningException.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; /** * Thrown when a factory cannot be hardened. * * <p>Two failure modes share this type:</p> * <ul> - * <li>No registered {@link org.apache.commons.xml.factory.spi.XmlProvider XmlProvider} recognises the concrete factory class.</li> + * <li>No registered {@link XmlProvider XmlProvider} recognises the concrete factory class.</li> * <li>A recognised provider tried to apply a hardening setting and the implementation rejected it.</li> * </ul> * diff --git a/src/main/java/org/apache/commons/xml/factory/internal/HardeningSAXParserFactory.java b/src/main/java/org/apache/commons/xml/factory/HardeningSAXParserFactory.java similarity index 94% rename from src/main/java/org/apache/commons/xml/factory/internal/HardeningSAXParserFactory.java rename to src/main/java/org/apache/commons/xml/factory/HardeningSAXParserFactory.java index aa8d7fa..58779ab 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/HardeningSAXParserFactory.java +++ b/src/main/java/org/apache/commons/xml/factory/HardeningSAXParserFactory.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.SAXException; /** diff --git a/src/main/java/org/apache/commons/xml/factory/internal/Limits.java b/src/main/java/org/apache/commons/xml/factory/Limits.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/Limits.java rename to src/main/java/org/apache/commons/xml/factory/Limits.java index 7ebe38b..e059b71 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/Limits.java +++ b/src/main/java/org/apache/commons/xml/factory/Limits.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; -import static org.apache.commons.xml.factory.internal.AbstractXmlProvider.setAttribute; -import static org.apache.commons.xml.factory.internal.AbstractXmlProvider.setProperty; +import static org.apache.commons.xml.factory.AbstractXmlProvider.setAttribute; +import static org.apache.commons.xml.factory.AbstractXmlProvider.setProperty; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/src/main/java/org/apache/commons/xml/factory/internal/SaxonProvider.java b/src/main/java/org/apache/commons/xml/factory/SaxonProvider.java similarity index 97% rename from src/main/java/org/apache/commons/xml/factory/internal/SaxonProvider.java rename to src/main/java/org/apache/commons/xml/factory/SaxonProvider.java index 7b8be1a..ec10bef 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/SaxonProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/SaxonProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; @@ -24,7 +24,6 @@ import net.sf.saxon.jaxp.SaxonTransformerFactory; import net.sf.saxon.lib.Feature; import net.sf.saxon.xpath.XPathFactoryImpl; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.XMLReader; /** @@ -34,7 +33,7 @@ * * <p>Must be declared {@code public} so {@link java.util.ServiceLoader} can load it from {@code META-INF/services/}.</p> */ -public final class SaxonProvider extends AbstractXmlProvider { +final class SaxonProvider extends AbstractXmlProvider { /** * A Saxon {@link Configuration} that locks down every channel through which Saxon would otherwise reach external resources. diff --git a/src/main/java/org/apache/commons/xml/factory/internal/StockJdkProvider.java b/src/main/java/org/apache/commons/xml/factory/StockJdkProvider.java similarity index 98% rename from src/main/java/org/apache/commons/xml/factory/internal/StockJdkProvider.java rename to src/main/java/org/apache/commons/xml/factory/StockJdkProvider.java index 5e23746..d5c129a 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/StockJdkProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/StockJdkProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; @@ -24,7 +24,6 @@ import javax.xml.validation.SchemaFactory; import javax.xml.xpath.XPathFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.XMLReader; /** @@ -50,7 +49,7 @@ * * <p>Must be declared {@code public} so {@link java.util.ServiceLoader} can load it from {@code META-INF/services/}.</p> */ -public final class StockJdkProvider extends AbstractXmlProvider { +final class StockJdkProvider extends AbstractXmlProvider { /** * {@code jdk.xml.overrideDefaultParser}: pin to the JDK's bundled SAX parser; defense-in-depth against a sysprop swap to a third-party parser. diff --git a/src/main/java/org/apache/commons/xml/factory/internal/WoodstoxProvider.java b/src/main/java/org/apache/commons/xml/factory/WoodstoxProvider.java similarity index 93% rename from src/main/java/org/apache/commons/xml/factory/internal/WoodstoxProvider.java rename to src/main/java/org/apache/commons/xml/factory/WoodstoxProvider.java index f563ac5..4b45128 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/WoodstoxProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/WoodstoxProvider.java @@ -14,12 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.stream.XMLInputFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; - /** * {@link XmlProvider} for the FasterXML Woodstox StAX implementation ({@code com.ctc.wstx:woodstox-core}). * @@ -37,7 +35,7 @@ * * <p>Must be declared {@code public} so {@link java.util.ServiceLoader} can load it from {@code META-INF/services/}.</p> */ -public final class WoodstoxProvider extends AbstractXmlProvider { +final class WoodstoxProvider extends AbstractXmlProvider { /** * Default constructor; invoked by {@link java.util.ServiceLoader} and the registry. diff --git a/src/main/java/org/apache/commons/xml/factory/internal/XercesProvider.java b/src/main/java/org/apache/commons/xml/factory/XercesProvider.java similarity index 99% rename from src/main/java/org/apache/commons/xml/factory/internal/XercesProvider.java rename to src/main/java/org/apache/commons/xml/factory/XercesProvider.java index 1bb7b31..0df23ff 100644 --- a/src/main/java/org/apache/commons/xml/factory/internal/XercesProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/XercesProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; @@ -28,7 +28,6 @@ import javax.xml.validation.Validator; import javax.xml.validation.ValidatorHandler; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.EntityResolver; import org.xml.sax.SAXException; diff --git a/src/main/java/org/apache/commons/xml/factory/XmlFactories.java b/src/main/java/org/apache/commons/xml/factory/XmlFactories.java index d9a7330..911b1d8 100644 --- a/src/main/java/org/apache/commons/xml/factory/XmlFactories.java +++ b/src/main/java/org/apache/commons/xml/factory/XmlFactories.java @@ -24,8 +24,6 @@ import javax.xml.validation.SchemaFactory; import javax.xml.xpath.XPathFactory; -import org.apache.commons.xml.factory.internal.CompositeProvider; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.xml.sax.XMLReader; /** diff --git a/src/main/java/org/apache/commons/xml/factory/spi/XmlProvider.java b/src/main/java/org/apache/commons/xml/factory/XmlProvider.java similarity index 99% rename from src/main/java/org/apache/commons/xml/factory/spi/XmlProvider.java rename to src/main/java/org/apache/commons/xml/factory/XmlProvider.java index 6b4ccbb..d49d30d 100644 --- a/src/main/java/org/apache/commons/xml/factory/spi/XmlProvider.java +++ b/src/main/java/org/apache/commons/xml/factory/XmlProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.spi; +package org.apache.commons.xml.factory; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; @@ -55,7 +55,7 @@ * <p>The default {@code configure} implementations throw {@link UnsupportedOperationException}. A provider should override only the methods corresponding to * factory types it actually supports.</p> */ -public interface XmlProvider { +interface XmlProvider { /** * Indicates whether this provider can harden a factory of the given concrete class. diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/AttackTestSupport.java b/src/test/java/org/apache/commons/xml/factory/AttackTestSupport.java similarity index 99% rename from src/test/java/org/apache/commons/xml/factory/attacks/AttackTestSupport.java rename to src/test/java/org/apache/commons/xml/factory/AttackTestSupport.java index a36cdfc..dc7c914 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/AttackTestSupport.java +++ b/src/test/java/org/apache/commons/xml/factory/AttackTestSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,7 +44,6 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import org.apache.commons.xml.factory.XmlFactories; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/BillionLaughsTest.java b/src/test/java/org/apache/commons/xml/factory/BillionLaughsTest.java similarity index 99% rename from src/test/java/org/apache/commons/xml/factory/attacks/BillionLaughsTest.java rename to src/test/java/org/apache/commons/xml/factory/BillionLaughsTest.java index e8121ca..4e74cb4 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/BillionLaughsTest.java +++ b/src/test/java/org/apache/commons/xml/factory/BillionLaughsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/internal/CompositeProviderTest.java b/src/test/java/org/apache/commons/xml/factory/CompositeProviderTest.java similarity index 98% rename from src/test/java/org/apache/commons/xml/factory/internal/CompositeProviderTest.java rename to src/test/java/org/apache/commons/xml/factory/CompositeProviderTest.java index 0fe3138..62dd43e 100644 --- a/src/test/java/org/apache/commons/xml/factory/internal/CompositeProviderTest.java +++ b/src/test/java/org/apache/commons/xml/factory/CompositeProviderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.internal; +package org.apache.commons.xml.factory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,7 +28,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.commons.xml.factory.spi.XmlProvider; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/DoctypeOnlyTest.java b/src/test/java/org/apache/commons/xml/factory/DoctypeOnlyTest.java similarity index 98% rename from src/test/java/org/apache/commons/xml/factory/attacks/DoctypeOnlyTest.java rename to src/test/java/org/apache/commons/xml/factory/DoctypeOnlyTest.java index f88ff44..451a2c8 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/DoctypeOnlyTest.java +++ b/src/test/java/org/apache/commons/xml/factory/DoctypeOnlyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalDtdTest.java b/src/test/java/org/apache/commons/xml/factory/ExternalDtdTest.java similarity index 99% rename from src/test/java/org/apache/commons/xml/factory/attacks/ExternalDtdTest.java rename to src/test/java/org/apache/commons/xml/factory/ExternalDtdTest.java index 73d227e..bce4f30 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalDtdTest.java +++ b/src/test/java/org/apache/commons/xml/factory/ExternalDtdTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalGeneralEntityTest.java b/src/test/java/org/apache/commons/xml/factory/ExternalGeneralEntityTest.java similarity index 99% rename from src/test/java/org/apache/commons/xml/factory/attacks/ExternalGeneralEntityTest.java rename to src/test/java/org/apache/commons/xml/factory/ExternalGeneralEntityTest.java index b2de943..b0dc708 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalGeneralEntityTest.java +++ b/src/test/java/org/apache/commons/xml/factory/ExternalGeneralEntityTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalParameterEntityTest.java b/src/test/java/org/apache/commons/xml/factory/ExternalParameterEntityTest.java similarity index 99% rename from src/test/java/org/apache/commons/xml/factory/attacks/ExternalParameterEntityTest.java rename to src/test/java/org/apache/commons/xml/factory/ExternalParameterEntityTest.java index 7b9ac18..0d4e6cc 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/ExternalParameterEntityTest.java +++ b/src/test/java/org/apache/commons/xml/factory/ExternalParameterEntityTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/SaxonXPathExternalCallsTest.java b/src/test/java/org/apache/commons/xml/factory/SaxonXPathExternalCallsTest.java similarity index 98% rename from src/test/java/org/apache/commons/xml/factory/attacks/SaxonXPathExternalCallsTest.java rename to src/test/java/org/apache/commons/xml/factory/SaxonXPathExternalCallsTest.java index 254fe63..ed46c33 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/SaxonXPathExternalCallsTest.java +++ b/src/test/java/org/apache/commons/xml/factory/SaxonXPathExternalCallsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,7 +25,6 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.commons.xml.factory.internal.CompositeProvider; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaImportTest.java b/src/test/java/org/apache/commons/xml/factory/SchemaImportTest.java similarity index 97% rename from src/test/java/org/apache/commons/xml/factory/attacks/SchemaImportTest.java rename to src/test/java/org/apache/commons/xml/factory/SchemaImportTest.java index f8f056e..aec609a 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaImportTest.java +++ b/src/test/java/org/apache/commons/xml/factory/SchemaImportTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaIncludeTest.java b/src/test/java/org/apache/commons/xml/factory/SchemaIncludeTest.java similarity index 97% rename from src/test/java/org/apache/commons/xml/factory/attacks/SchemaIncludeTest.java rename to src/test/java/org/apache/commons/xml/factory/SchemaIncludeTest.java index b91f8df..f02dbf1 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaIncludeTest.java +++ b/src/test/java/org/apache/commons/xml/factory/SchemaIncludeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaRedefineTest.java b/src/test/java/org/apache/commons/xml/factory/SchemaRedefineTest.java similarity index 96% rename from src/test/java/org/apache/commons/xml/factory/attacks/SchemaRedefineTest.java rename to src/test/java/org/apache/commons/xml/factory/SchemaRedefineTest.java index 7845d3d..734775a 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/SchemaRedefineTest.java +++ b/src/test/java/org/apache/commons/xml/factory/SchemaRedefineTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/TemplatesImportTest.java b/src/test/java/org/apache/commons/xml/factory/TemplatesImportTest.java similarity index 96% rename from src/test/java/org/apache/commons/xml/factory/attacks/TemplatesImportTest.java rename to src/test/java/org/apache/commons/xml/factory/TemplatesImportTest.java index afe8392..f2dc1f0 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/TemplatesImportTest.java +++ b/src/test/java/org/apache/commons/xml/factory/TemplatesImportTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/TemplatesIncludeTest.java b/src/test/java/org/apache/commons/xml/factory/TemplatesIncludeTest.java similarity index 96% rename from src/test/java/org/apache/commons/xml/factory/attacks/TemplatesIncludeTest.java rename to src/test/java/org/apache/commons/xml/factory/TemplatesIncludeTest.java index 345c766..7919153 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/TemplatesIncludeTest.java +++ b/src/test/java/org/apache/commons/xml/factory/TemplatesIncludeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/attacks/TransformerDocumentTest.java b/src/test/java/org/apache/commons/xml/factory/TransformerDocumentTest.java similarity index 96% rename from src/test/java/org/apache/commons/xml/factory/attacks/TransformerDocumentTest.java rename to src/test/java/org/apache/commons/xml/factory/TransformerDocumentTest.java index 90cbb43..03eb413 100644 --- a/src/test/java/org/apache/commons/xml/factory/attacks/TransformerDocumentTest.java +++ b/src/test/java/org/apache/commons/xml/factory/TransformerDocumentTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.xml.factory.attacks; +package org.apache.commons.xml.factory; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/xml/factory/UnsupportedXmlImplementationTest.java b/src/test/java/org/apache/commons/xml/factory/UnsupportedXmlImplementationTest.java index 2eba600..7b28903 100644 --- a/src/test/java/org/apache/commons/xml/factory/UnsupportedXmlImplementationTest.java +++ b/src/test/java/org/apache/commons/xml/factory/UnsupportedXmlImplementationTest.java @@ -23,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.commons.xml.factory.internal.CompositeProvider; import org.junit.jupiter.api.Test; /**
