This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcebuilder-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcebuilder.git
commit 8d8ccb6b7ff123c3c77d8ceb9fd9afba7af8adb9 Author: Stefan Seifert <[email protected]> AuthorDate: Thu Sep 8 12:54:03 2016 +0000 SLING-6040 revert last two commits rev. 1759507, 1759545 - there is a better solution git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder@1759803 13f79535-47bb-0310-9956-ffa450edef68 --- integration-tests/.gitignore => .gitignore | 0 impl/pom.xml | 86 ------- integration-tests/pom.xml | 264 --------------------- pom.xml | 218 ++++++++++++++++- .../sling/resourcebuilder/api/ResourceBuilder.java | 0 .../api/ResourceBuilderFactory.java | 0 .../resourcebuilder/impl/MapArgsConverter.java | 0 .../impl/ResourceBuilderFactoryService.java | 0 .../resourcebuilder/impl/ResourceBuilderImpl.java | 0 .../customizers/RBIT_TeleporterCustomizer.java | 0 .../resourcebuilder/impl/MapArgsConverterTest.java | 0 .../impl/ResourceBuilderImplTest.java | 4 - .../sling/resourcebuilder/it/FileRetrievalIT.java | 0 .../resourcebuilder/it/ResourceBuilderIT.java | 0 .../sling/resourcebuilder/it/TestEnvironment.java | 0 .../resourcebuilder/test/ResourceAssertions.java | 0 .../src => src}/test/resources/files/models.js | 0 .../src => src}/test/resources/files/myapp.json | 0 .../src => src}/test/resources/files/text.html | 0 19 files changed, 206 insertions(+), 366 deletions(-) diff --git a/integration-tests/.gitignore b/.gitignore similarity index 100% rename from integration-tests/.gitignore rename to .gitignore diff --git a/impl/pom.xml b/impl/pom.xml deleted file mode 100644 index f1bc4f5..0000000 --- a/impl/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>26</version> - <relativePath/> - </parent> - - <artifactId>org.apache.sling.resourcebuilder</artifactId> - <version>0.0.1-SNAPSHOT</version> - <packaging>bundle</packaging> - - <name>Apache Sling Resource Builder</name> - <description>Utilities to create Sling content</description> - - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder/impl</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder/impl</developerConnection> - <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder/impl</url> - </scm> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.api</artifactId> - <version>2.3.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.mime</artifactId> - <version>2.1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml deleted file mode 100644 index 8ed0a79..0000000 --- a/integration-tests/pom.xml +++ /dev/null @@ -1,264 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>26</version> - <relativePath/> - </parent> - - <artifactId>org.apache.sling.resourcebuilder.integration-tests</artifactId> - <version>0.0.1-SNAPSHOT</version> - <packaging>bundle</packaging> - - <name>Apache Sling Resource Builder Integration Tests</name> - <description>Utilities to create Sling content</description> - - <properties> - <!-- version of the ResourceBuilder impl --> - <resourcebuilder.version>0.0.1-SNAPSHOT</resourcebuilder.version> - - <!-- Set this to run the server on a specific port - <http.port></http.port> - --> - - <!-- Set this to run tests against an existing server instance --> - <keepJarRunning>false</keepJarRunning> - - <!-- - Options for the VM that executes our runnable jar. - Set debugging options here to debug teleported tests. - --> - <jar.executor.vm.options>-Xmx512m</jar.executor.vm.options> - - <!-- Options for the jar to execute. $JAREXEC_SERVER_PORT$ is replaced by the - selected port number --> - <jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$</jar.executor.jar.options> - </properties> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</developerConnection> - <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</url> - </scm> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/test/resources/**</exclude> - <exclude>sling/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <!-- Find free ports to run our server --> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>reserve-server-port</id> - <goals> - <goal>reserve-network-port</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <portNames> - <portName>http.port</portName> - </portNames> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}</directory> - <includes> - <!-- sling folder is the workdir of the executable jar that we test --> - <include>sling/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - <execution> - <id>verify</id> - <goals> - <goal>verify</goal> - </goals> - </execution> - </executions> - <configuration> - <systemPropertyVariables> - <!-- these are the minimal options required for the jar executor, see bundle-with-it module for more --> - <keepJarRunning>${keepJarRunning}</keepJarRunning> - <jar.executor.jar.options>${jar.executor.jar.options}</jar.executor.jar.options> - <jar.executor.vm.options>${jar.executor.vm.options}</jar.executor.vm.options> - <jar.executor.server.port>${http.port}</jar.executor.server.port> - <additional.bundles.path>${project.build.directory}</additional.bundles.path> - <server.ready.path.1>/:script src="system/sling.js"</server.ready.path.1> - <server.ready.path.2>/.explorer.html:href="/libs/sling/explorer/css/explorer.css"</server.ready.path.2> - <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests</server.ready.path.3> - - <!-- Additional bundles to install for testing --> - <sling.additional.bundle.1>org.apache.sling.junit.core</sling.additional.bundle.1> - <sling.additional.bundle.2>org.apache.sling.resourcebuilder-${resourcebuilder.version}.jar</sling.additional.bundle.2> - <sling.additional.bundle.3>${project.artifactId}-${project.version}.jar</sling.additional.bundle.3> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-runnable-jar</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <includeArtifactIds>org.apache.sling.launchpad</includeArtifactIds> - <excludeTransitive>true</excludeTransitive> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - </configuration> - </execution> - <execution> - <!-- - Consider all dependencies as candidates to be installed - as additional bundles. We use system properties to define - which bundles to install in which order. - --> - <id>copy-additional-bundles</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.resourcebuilder</artifactId> - <version>${resourcebuilder.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.api</artifactId> - <version>2.3.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.mime</artifactId> - <version>2.1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> - <version>1.6.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.junit.core</artifactId> - <version>1.0.14</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.tools</artifactId> - <version>1.0.10</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.junit.teleporter</artifactId> - <!-- SNAPSHOT required due to SLING-5712 --> - <version>1.0.7-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.launchpad</artifactId> - <version>8</version> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> diff --git a/pom.xml b/pom.xml index 5f62447..3b90050 100644 --- a/pom.xml +++ b/pom.xml @@ -27,35 +27,229 @@ <relativePath/> </parent> - <artifactId>org.apache.sling.resourcebuilder.reactor</artifactId> - <packaging>pom</packaging> + <artifactId>org.apache.sling.resourcebuilder</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>Apache Sling Resource Builder Reactor</name> + <packaging>bundle</packaging> + + <name>Apache Sling Resource Builder</name> <description>Utilities to create Sling content</description> + <properties> + <!-- Set this to run the server on a specific port + <http.port></http.port> + --> + + <!-- Set this to run tests against an existing server instance --> + <keepJarRunning>false</keepJarRunning> + + <!-- + Options for the VM that executes our runnable jar. + Set debugging options here to debug teleported tests. + --> + <jar.executor.vm.options>-Xmx512m</jar.executor.vm.options> + + <!-- Options for the jar to execute. $JAREXEC_SERVER_PORT$ is replaced by the + selected port number --> + <jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$</jar.executor.jar.options> + </properties> <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</developerConnection> - <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</developerConnection> + <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</url> </scm> - + <build> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes> + <exclude>src/test/resources/**</exclude> <exclude>sling/**</exclude> </excludes> </configuration> </plugin> - </plugins> + <plugin> + <!-- Find free ports to run our server --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>reserve-server-port</id> + <goals> + <goal>reserve-network-port</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <portNames> + <portName>http.port</portName> + </portNames> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${basedir}</directory> + <includes> + <!-- sling folder is the workdir of the executable jar that we test --> + <include>sling/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <systemPropertyVariables> + <!-- these are the minimal options required for the jar executor, see bundle-with-it module for more --> + <keepJarRunning>${keepJarRunning}</keepJarRunning> + <jar.executor.jar.options>${jar.executor.jar.options}</jar.executor.jar.options> + <jar.executor.vm.options>${jar.executor.vm.options}</jar.executor.vm.options> + <jar.executor.server.port>${http.port}</jar.executor.server.port> + <additional.bundles.path>${project.build.directory}</additional.bundles.path> + <server.ready.path.1>/:script src="system/sling.js"</server.ready.path.1> + <server.ready.path.2>/.explorer.html:href="/libs/sling/explorer/css/explorer.css"</server.ready.path.2> + <server.ready.path.3>/sling-test/sling/sling-test.html:Sling client library tests</server.ready.path.3> + + <!-- Additional bundles to install for testing --> + <sling.additional.bundle.1>org.apache.sling.junit.core</sling.additional.bundle.1> + <sling.additional.bundle.2>${project.artifactId}-${project.version}.jar</sling.additional.bundle.2> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-runnable-jar</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <includeArtifactIds>org.apache.sling.launchpad</includeArtifactIds> + <excludeTransitive>true</excludeTransitive> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + </configuration> + </execution> + <execution> + <!-- + Consider all dependencies as candidates to be installed + as additional bundles. We use system properties to define + which bundles to install in which order. + --> + <id>copy-additional-bundles</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> - <modules> - <module>impl</module> - <module>integration-tests</module> - </modules> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.api</artifactId> + <version>2.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>2.1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.sling-mock</artifactId> + <version>1.6.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.junit.core</artifactId> + <version>1.0.14</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.tools</artifactId> + <version>1.0.10</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.junit.teleporter</artifactId> + <!-- SNAPSHOT required due to SLING-5712 --> + <version>1.0.7-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.launchpad</artifactId> + <version>8</version> + <scope>provided</scope> + </dependency> + </dependencies> </project> diff --git a/impl/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java b/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java similarity index 100% rename from impl/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java rename to src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java diff --git a/impl/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilderFactory.java b/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilderFactory.java similarity index 100% rename from impl/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilderFactory.java rename to src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilderFactory.java diff --git a/impl/src/main/java/org/apache/sling/resourcebuilder/impl/MapArgsConverter.java b/src/main/java/org/apache/sling/resourcebuilder/impl/MapArgsConverter.java similarity index 100% rename from impl/src/main/java/org/apache/sling/resourcebuilder/impl/MapArgsConverter.java rename to src/main/java/org/apache/sling/resourcebuilder/impl/MapArgsConverter.java diff --git a/impl/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderFactoryService.java b/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderFactoryService.java similarity index 100% rename from impl/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderFactoryService.java rename to src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderFactoryService.java diff --git a/impl/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java b/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java similarity index 100% rename from impl/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java rename to src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java diff --git a/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/RBIT_TeleporterCustomizer.java b/src/test/java/org/apache/sling/junit/teleporter/customizers/RBIT_TeleporterCustomizer.java similarity index 100% rename from integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/RBIT_TeleporterCustomizer.java rename to src/test/java/org/apache/sling/junit/teleporter/customizers/RBIT_TeleporterCustomizer.java diff --git a/impl/src/test/java/org/apache/sling/resourcebuilder/impl/MapArgsConverterTest.java b/src/test/java/org/apache/sling/resourcebuilder/impl/MapArgsConverterTest.java similarity index 100% rename from impl/src/test/java/org/apache/sling/resourcebuilder/impl/MapArgsConverterTest.java rename to src/test/java/org/apache/sling/resourcebuilder/impl/MapArgsConverterTest.java diff --git a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java similarity index 98% rename from integration-tests/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java rename to src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java index 45f4df0..9ab055f 100644 --- a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java +++ b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java @@ -40,10 +40,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -/** - * This unit test is not part of the ResourceBuilder impl project to avoid a dependency - * to the sling-mock project there (because sling-mock itself has a dependency to the ResourceBuilder). - */ public class ResourceBuilderImplTest { private String testRootPath; diff --git a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java b/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java similarity index 100% rename from integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java rename to src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java diff --git a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java b/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java similarity index 100% rename from integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java rename to src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java diff --git a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java b/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java similarity index 100% rename from integration-tests/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java rename to src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java diff --git a/integration-tests/src/test/java/org/apache/sling/resourcebuilder/test/ResourceAssertions.java b/src/test/java/org/apache/sling/resourcebuilder/test/ResourceAssertions.java similarity index 100% rename from integration-tests/src/test/java/org/apache/sling/resourcebuilder/test/ResourceAssertions.java rename to src/test/java/org/apache/sling/resourcebuilder/test/ResourceAssertions.java diff --git a/integration-tests/src/test/resources/files/models.js b/src/test/resources/files/models.js similarity index 100% rename from integration-tests/src/test/resources/files/models.js rename to src/test/resources/files/models.js diff --git a/integration-tests/src/test/resources/files/myapp.json b/src/test/resources/files/myapp.json similarity index 100% rename from integration-tests/src/test/resources/files/myapp.json rename to src/test/resources/files/myapp.json diff --git a/integration-tests/src/test/resources/files/text.html b/src/test/resources/files/text.html similarity index 100% rename from integration-tests/src/test/resources/files/text.html rename to src/test/resources/files/text.html -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
