Move engine under the correct tag
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6@1732137 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/engine/pom.xml b/engine/pom.xml
deleted file mode 100644
index c1196e1..0000000
--- a/engine/pom.xml
+++ /dev/null
@@ -1,159 +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>22</version>
- <relativePath />
- </parent>
-
- <artifactId>org.apache.sling.bgservlets</artifactId>
- <version>1.0.6</version>
- <packaging>bundle</packaging>
-
- <name>Apache Sling Background Servlets Engine</name>
- <description>
- Allows scripts and servlets to run as background tasks
- which can be suspended, resumed, stopped and restarted.
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.sling.bgservlets</Export-Package>
- <Private-Package>org.apache.sling.bgservlets.impl.*</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/jobdata.cnd</Sling-Nodetypes>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.8.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.engine</artifactId>
- <version>2.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.6</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.4-incubator</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index d7b35f9..c1196e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,25 +14,146 @@
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">
+<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>16</version>
- <relativePath/>
+ <version>22</version>
+ <relativePath />
</parent>
- <artifactId>org.apache.sling.bgservlets.reactor</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <artifactId>org.apache.sling.bgservlets</artifactId>
+ <version>1.0.6</version>
+ <packaging>bundle</packaging>
- <name>Apache Sling Background Servlets Reactor</name>
+ <name>Apache Sling Background Servlets Engine</name>
+ <description>
+ Allows scripts and servlets to run as background tasks
+ which can be suspended, resumed, stopped and restarted.
+ </description>
- <modules>
- <module>engine</module>
- <module>testing</module>
- </modules>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bgservlets-1.0.6</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.sling.bgservlets</Export-Package>
+ <Private-Package>org.apache.sling.bgservlets.impl.*</Private-Package>
+ <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
+ <Sling-Nodetypes>SLING-INF/nodetypes/jobdata.cnd</Sling-Nodetypes>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.engine</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.0.6</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.json</artifactId>
+ <version>2.0.4-incubator</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletRequest.java b/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletRequest.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletRequest.java
rename to src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletRequest.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletResponse.java b/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletResponse.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletResponse.java
rename to src/main/java/org/apache/sling/bgservlets/BackgroundHttpServletResponse.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/BackgroundServletConstants.java b/src/main/java/org/apache/sling/bgservlets/BackgroundServletConstants.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/BackgroundServletConstants.java
rename to src/main/java/org/apache/sling/bgservlets/BackgroundServletConstants.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/ExecutionEngine.java b/src/main/java/org/apache/sling/bgservlets/ExecutionEngine.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/ExecutionEngine.java
rename to src/main/java/org/apache/sling/bgservlets/ExecutionEngine.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/JobConsole.java b/src/main/java/org/apache/sling/bgservlets/JobConsole.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/JobConsole.java
rename to src/main/java/org/apache/sling/bgservlets/JobConsole.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/JobData.java b/src/main/java/org/apache/sling/bgservlets/JobData.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/JobData.java
rename to src/main/java/org/apache/sling/bgservlets/JobData.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/JobProgressInfo.java b/src/main/java/org/apache/sling/bgservlets/JobProgressInfo.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/JobProgressInfo.java
rename to src/main/java/org/apache/sling/bgservlets/JobProgressInfo.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/JobStatus.java b/src/main/java/org/apache/sling/bgservlets/JobStatus.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/JobStatus.java
rename to src/main/java/org/apache/sling/bgservlets/JobStatus.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/JobStorage.java b/src/main/java/org/apache/sling/bgservlets/JobStorage.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/JobStorage.java
rename to src/main/java/org/apache/sling/bgservlets/JobStorage.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/Predicate.java b/src/main/java/org/apache/sling/bgservlets/Predicate.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/Predicate.java
rename to src/main/java/org/apache/sling/bgservlets/Predicate.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/RuntimeState.java b/src/main/java/org/apache/sling/bgservlets/RuntimeState.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/RuntimeState.java
rename to src/main/java/org/apache/sling/bgservlets/RuntimeState.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/BackgroundRequestExecutionJob.java b/src/main/java/org/apache/sling/bgservlets/impl/BackgroundRequestExecutionJob.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/BackgroundRequestExecutionJob.java
rename to src/main/java/org/apache/sling/bgservlets/impl/BackgroundRequestExecutionJob.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilter.java b/src/main/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilter.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilter.java
rename to src/main/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilter.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/DeepNodeCreator.java b/src/main/java/org/apache/sling/bgservlets/impl/DeepNodeCreator.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/DeepNodeCreator.java
rename to src/main/java/org/apache/sling/bgservlets/impl/DeepNodeCreator.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/ExecutionEngineImpl.java b/src/main/java/org/apache/sling/bgservlets/impl/ExecutionEngineImpl.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/ExecutionEngineImpl.java
rename to src/main/java/org/apache/sling/bgservlets/impl/ExecutionEngineImpl.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/JobConsoleImpl.java b/src/main/java/org/apache/sling/bgservlets/impl/JobConsoleImpl.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/JobConsoleImpl.java
rename to src/main/java/org/apache/sling/bgservlets/impl/JobConsoleImpl.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/SuspendableOutputStream.java b/src/main/java/org/apache/sling/bgservlets/impl/SuspendableOutputStream.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/SuspendableOutputStream.java
rename to src/main/java/org/apache/sling/bgservlets/impl/SuspendableOutputStream.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeInputStream.java b/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeInputStream.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeInputStream.java
rename to src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeInputStream.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeOutputStream.java b/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeOutputStream.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeOutputStream.java
rename to src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeOutputStream.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPath.java b/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPath.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPath.java
rename to src/main/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPath.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/BackgroundTestServlet.java b/src/main/java/org/apache/sling/bgservlets/impl/servlets/BackgroundTestServlet.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/BackgroundTestServlet.java
rename to src/main/java/org/apache/sling/bgservlets/impl/servlets/BackgroundTestServlet.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java b/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
rename to src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java b/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
rename to src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStreamServlet.java b/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStreamServlet.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStreamServlet.java
rename to src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStreamServlet.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobDataImpl.java b/src/main/java/org/apache/sling/bgservlets/impl/storage/JobDataImpl.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobDataImpl.java
rename to src/main/java/org/apache/sling/bgservlets/impl/storage/JobDataImpl.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageException.java b/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageException.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageException.java
rename to src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageException.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java b/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java
rename to src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactory.java b/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactory.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactory.java
rename to src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactory.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactoryImpl.java b/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactoryImpl.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactoryImpl.java
rename to src/main/java/org/apache/sling/bgservlets/impl/storage/NodeJobStatusFactoryImpl.java
diff --git a/engine/src/main/java/org/apache/sling/bgservlets/impl/webconsole/JobConsolePlugin.java b/src/main/java/org/apache/sling/bgservlets/impl/webconsole/JobConsolePlugin.java
similarity index 100%
rename from engine/src/main/java/org/apache/sling/bgservlets/impl/webconsole/JobConsolePlugin.java
rename to src/main/java/org/apache/sling/bgservlets/impl/webconsole/JobConsolePlugin.java
diff --git a/engine/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
similarity index 100%
rename from engine/src/main/resources/OSGI-INF/metatype/metatype.properties
rename to src/main/resources/OSGI-INF/metatype/metatype.properties
diff --git a/engine/src/main/resources/SLING-INF/nodetypes/jobdata.cnd b/src/main/resources/SLING-INF/nodetypes/jobdata.cnd
similarity index 100%
rename from engine/src/main/resources/SLING-INF/nodetypes/jobdata.cnd
rename to src/main/resources/SLING-INF/nodetypes/jobdata.cnd
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/QueryStringFilterTest.java b/src/test/java/org/apache/sling/bgservlets/QueryStringFilterTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/QueryStringFilterTest.java
rename to src/test/java/org/apache/sling/bgservlets/QueryStringFilterTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilterTest.java b/src/test/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilterTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilterTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/BackgroundServletStarterFilterTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/DeepNodeCreatorTest.java b/src/test/java/org/apache/sling/bgservlets/impl/DeepNodeCreatorTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/DeepNodeCreatorTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/DeepNodeCreatorTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/SuspendableOutputStreamTest.java b/src/test/java/org/apache/sling/bgservlets/impl/SuspendableOutputStreamTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/SuspendableOutputStreamTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/SuspendableOutputStreamTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPathTest.java b/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPathTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPathTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamPathTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamTest.java b/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/nodestream/NodeStreamTest.java
diff --git a/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java b/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java
similarity index 100%
rename from engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java
rename to src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java
diff --git a/testing/pom.xml b/testing/pom.xml
deleted file mode 100644
index 75366c9..0000000
--- a/testing/pom.xml
+++ /dev/null
@@ -1,178 +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>16</version>
- <relativePath/>
- </parent>
-
- <artifactId>org.apache.sling.bgservlets.testing</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>slingstart</packaging>
-
- <name>Apache Sling Background Servlets Integration Tests</name>
-
- <properties>
- <!-- Timeout when checking for Sling readyness before starting tests -->
- <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
-
- <!-- path suffix for HTTP access to Sling -->
- <http.base.path/>
-
- <!-- path suffix for WebDAV access to the repository -->
- <webdav.workspace.path/>
-
- <!-- hostname for integration tests -->
- <test.host>localhost</test.host>
-
- <!--
- Set this to true to stop mvn once the integration test Jetty instance is
- started. Useful to manually test the integration testing webapp.
- -->
- <integration.test.wait>false</integration.test.wait>
-
- <!--
- if set to "true" this will start the launchpad with the following debug options:
- -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-
- otherwise you can provide your own debug settings
- -->
- <debug.options/>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- <portName>sling.control.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <systemPropertyVariables>
- <launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
- <launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
- <HttpTestBase.readyTimeoutSeconds>${HttpTestBase.readyTimeoutSeconds}</HttpTestBase.readyTimeoutSeconds>
- <launchpad.ready.1>GET:/index.html:200:.*Welcome to the Sling Launchpad.*</launchpad.ready.1>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>slingstart-maven-plugin</artifactId>
- <version>1.2.0</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>start-container</id>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <servers>
- <server>
- <port>${http.port}</port>
- <controlPort>${sling.control.port}</controlPort>
- <runmode>jackrabbit</runmode>
- <contextPath>${http.base.path}</contextPath>
-<!-- TODO activate when never slingstart plugin is available
- <debug>${debug.options}</debug>
--->
- </server>
- </servers>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.18</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/testing/src/main/provisioning/test-model.txt b/testing/src/main/provisioning/test-model.txt
deleted file mode 100644
index b628077..0000000
--- a/testing/src/main/provisioning/test-model.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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.
-#
-[feature name=launchpad-testing]
-# Dependencies
-[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8/slingstart
- org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.1.6
- org.apache.sling/org.apache.sling.bgservlets/1.0.5-SNAPSHOT
-
-# additional configuration for testing
-[configurations]
-
- org.apache.sling.servlets.resolver.SlingServletResolver
- # Set the servlet resolver's cache size to zero for testing
- servletresolver.cacheSize=I"0"
-
-[settings]
- sling.system.packages.class.com.vladium.emma.rt.RT=com.vladium.emma.rt
- org.apache.sling.commons.log.julenabled=true
diff --git a/testing/src/test/java/org/apache/sling/bgservlets/it/BackgroundRequestIT.java b/testing/src/test/java/org/apache/sling/bgservlets/it/BackgroundRequestIT.java
deleted file mode 100644
index 1669b18..0000000
--- a/testing/src/test/java/org/apache/sling/bgservlets/it/BackgroundRequestIT.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.
- */
-package org.apache.sling.bgservlets.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.regex.Pattern;
-
-import junit.framework.AssertionFailedError;
-
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.commons.testing.integration.HttpTest;
-import org.junit.Before;
-import org.junit.Test;
-
-public class BackgroundRequestIT {
- private final HttpTest T = new HttpTest();
-
- @Before
- public void setup() throws Exception {
- T.setUp();
- }
-
- /** Find out how many job state nodes are present */
- private int countStoredJobs() throws IOException {
- int jobs = 0;
- String content = "";
- try {
- content = T.getContent(HttpTest.HTTP_BASE_URL + "/var/bg.tidy.20.json", "application/json");
- } catch(AssertionFailedError ignore) {
- // Expected if no jobs have ever been created
- }
- final BufferedReader r = new BufferedReader(new StringReader(content));
- String line = null;
- while((line = r.readLine()) != null) {
- if(line.contains("sling:resourceType") && line.contains("sling/bg/job")) {
- jobs++;
- }
- }
- return jobs;
- }
-
- @Test
- public void testGetRequestFails() throws IOException,InterruptedException, JSONException {
- T.assertHttpStatus(HttpTest.HTTP_BASE_URL + "/tmp.json?sling:bg=true", 500);
- }
-
- @Test
- public void testTmpRequestCreatesJob() throws IOException,InterruptedException, JSONException {
- final int initialJobs = countStoredJobs();
- T.assertPostStatus(HttpTest.HTTP_BASE_URL + "/tmp.json?sling:bg=true", 302, null, null);
-
- // Request must have created a job
- final long timeout = System.currentTimeMillis() + 10000L;
- while(true) {
- if(countStoredJobs() >= initialJobs + 1) {
- break;
- }
- if(System.currentTimeMillis() > timeout) {
- fail("Timeout waiting for background job creation");
- }
- Thread.sleep(50L);
- }
-
- // Verify that jobs are stored under a path that includes the Sling instance ID
- final String path = "/var/bg/jobs.tidy.1.json";
- final JSONObject json = new JSONObject(T.getContent(HttpTest.HTTP_BASE_URL + path, "application/json"));
- int matches = 0;
- final Pattern instanceIdPattern = Pattern.compile("([0-9a-fA-F\\\\-]){20,}");
- final Iterator<String> it = json.keys();
- while(it.hasNext()) {
- final String key = it.next();
- if(instanceIdPattern.matcher(key).matches()) {
- matches++;
- }
- }
- if(matches == 0) {
- fail("No instance ID node found under " + path);
- }
-
- // Wait a bit - no more jobs should be created
- Thread.sleep(2000L);
- assertEquals("Expecting no extra jobs", initialJobs + 1, countStoredJobs());
- }
-}
diff --git a/testing/src/test/java/org/apache/sling/bgservlets/it/JobConsoleIT.java b/testing/src/test/java/org/apache/sling/bgservlets/it/JobConsoleIT.java
deleted file mode 100644
index f23e9f4..0000000
--- a/testing/src/test/java/org/apache/sling/bgservlets/it/JobConsoleIT.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.sling.bgservlets.it;
-
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
-import org.apache.sling.commons.testing.integration.HttpTest;
-import org.junit.Before;
-import org.junit.Test;
-
-/** Verify that our job console plugin is active and can read jobs */
-public class JobConsoleIT {
- private final HttpTest T = new HttpTest();
-
- @Before
- public void setup() throws Exception {
- T.setUp();
- }
-
- @Test
- public void testJobConsoleOutput() throws IOException,InterruptedException {
- // Create a job
- T.assertPostStatus(HttpTest.HTTP_BASE_URL + "/tmp.json?sling:bg=true", 302, null, null);
-
- // Request must have created a job
- final long timeout = System.currentTimeMillis() + 10000L;
- final String path = "/system/console/bgservlets";
- final Pattern instanceIdPattern = Pattern.compile("(?s).+([0-9a-fA-F\\\\-]){20,}.+");
- while(true) {
- final String jobConsoleContent = T.getContent(HttpTest.HTTP_BASE_URL + path, HttpTest.CONTENT_TYPE_HTML);
- if(instanceIdPattern.matcher(jobConsoleContent).matches()) {
- break;
- }
- if(System.currentTimeMillis() > timeout) {
- fail("Timeout waiting for instance ID at " + path);
- }
- Thread.sleep(50L);
- }
- }
-}
