SLING-2593 - Improvement for the Sling performance tools. Adding first part of the patch provided from Christian Vazzolla: Created a new maven project that contains only the sling performance tests and left the framework(tool) related part in the base project as we would like to use the framework for performance testing in other projects also. Thanks Christian!
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1388992 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jcr-resource-2.0.10/pom.xml b/jcr-resource-2.0.10/pom.xml
index 4a80601..c2e58ce 100644
--- a/jcr-resource-2.0.10/pom.xml
+++ b/jcr-resource-2.0.10/pom.xml
@@ -48,5 +48,10 @@
<version>2.0</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.performance.tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
index 975c191..27ce2cf 100644
--- a/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -35,8 +35,6 @@
import org.apache.sling.performance.tests.ResolveNonExistingWith10000VanityPathTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith1000AliasTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith1000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveNonExistingWith30000AliasTest;
-import org.apache.sling.performance.tests.ResolveNonExistingWith30000VanityPathTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith5000AliasTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith5000VanityPathTest;
diff --git a/jcr-resource-2.1.0/pom.xml b/jcr-resource-2.1.0/pom.xml
index c18e56e..b4ed8a5 100644
--- a/jcr-resource-2.1.0/pom.xml
+++ b/jcr-resource-2.1.0/pom.xml
@@ -50,5 +50,10 @@
<version>2.0</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.performance.tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
index d9cd613..8c753a7 100644
--- a/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -33,7 +33,12 @@
import org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl;
import org.apache.sling.jcr.resource.internal.helper.MapEntries;
import org.apache.sling.jcr.resource.internal.helper.Mapping;
-import org.apache.sling.performance.tests.*;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000VanityPathTest;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
diff --git a/jcr-resource-2.2.0/pom.xml b/jcr-resource-2.2.0/pom.xml
index 0d0a24f..f5c9142 100644
--- a/jcr-resource-2.2.0/pom.xml
+++ b/jcr-resource-2.2.0/pom.xml
@@ -67,5 +67,10 @@
<version>2.1.0</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.performance.tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
index d67b90f..83ac847 100644
--- a/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -41,8 +41,6 @@
import org.apache.sling.performance.tests.ResolveNonExistingWith10000VanityPathTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith1000AliasTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith1000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveNonExistingWith30000AliasTest;
-import org.apache.sling.performance.tests.ResolveNonExistingWith30000VanityPathTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith5000AliasTest;
import org.apache.sling.performance.tests.ResolveNonExistingWith5000VanityPathTest;
import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryActivator;
@@ -51,7 +49,6 @@
import org.apache.sling.resourceresolver.impl.mapping.Mapping;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
public class PerformanceTest extends AbstractPerformanceTest {
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 0000000..9d03354
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,49 @@
+<!-- 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling-performance-tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.sling.performance.tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Apache Sling Performance Tests</name>
+
+ <properties>
+ <junit.version>4.8.2</junit.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/performance/tests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/performance/tests</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/performance/tests</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.performance.base</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java b/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
similarity index 100%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
rename to tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
