You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:29:20 UTC
[sling-org-apache-sling-paxexam-util] branch master created (now
2e6b4c0)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git.
at 2e6b4c0 SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 392f3d2 SLING-2788 - move sling-pax-util under testing
new 294c53b SLING-2788 - move sling-pax-util under testing
new fd5377c SLING-2788 - prepare for release
new 6b32203 SLING-2788 - explain this better
new d617da6 [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
new cbcc546 SLING-2788 - add missing <scm> section
new 8a575ad [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
new d4cf86c [maven-release-plugin] prepare for next development iteration
new 7c13729 Update to parent pom v19
new 662453d Update .gitignore files
new f09b514 Updated to parent version 20
new fefbc52 Update to Sling Parent POM 22 with baselining enabled
new dcbd5da Use released Sling Launchpad 7 and adapt bundle lists
new 0a4f4a4 Add local StartupHandler so that SlingSettingsService starts
new 59fedd7 Add missing excludes for rat
new 5ee2010 SLING-4698 - Set parent.relativePath to empty for all modules
new 8f58cb3 SLING-4832 - SlingPaxOptions.setIgnoredBundles added, with tests
new 431016c Update to Sling Parent 23
new 953700a set parent version to 24 and add empty relativePath where missing
new 0b1e791 Update the main reactor to parent 25
new 12a2bf8 Switch to parent pom 26
new b8009fa Move to parent pom 30
new a33754f fix javadoc errors
new 6724eb7 [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.4
new 93074b2 [maven-release-plugin] prepare for next development iteration
new 2e6b4c0 SLING-7167 Adjust READMEs
The 26 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-paxexam-util] 12/26: Update to Sling Parent
POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit fefbc5274b2e83d2133df76966ba22013401256e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:36:14 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628610 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9a4bcfd..9a32f1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 07/26: [maven-release-plugin]
prepare release org.apache.sling.paxexam.util-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 8a575ad1bb39f8ddee453f0e9e2393cb88e344b8
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 13:10:03 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560982 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ea8ffe0..ad9784d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 09/26: Update to parent pom
v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 7c1372977ed06dbaa7f76258f295cf397dc6ed6f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 25ee230..8cf7aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>19</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 13/26: Use released Sling
Launchpad 7 and adapt bundle lists
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit dcbd5da4127fd2b77423de74eb1bf50929df7a64
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 3 11:18:09 2014 +0000
Use released Sling Launchpad 7 and adapt bundle lists
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1636322 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/paxexam/util/SlingRepositoryTest.java | 2 +-
.../apache/sling/paxexam/util/SlingSetupTest.java | 75 ++++++++++++++++++++--
2 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
index 18bbd3e..4abc6a9 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -46,7 +46,7 @@ public class SlingRepositoryTest {
private SlingRepository repository;
/** Use a released launchpad for this example */
- public static final String SLING_LAUNCHPAD_VERSION = "6";
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
@org.ops4j.pax.exam.Configuration
public Option[] config() {
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 0738efd..2d8ad19 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceReference;
public class SlingSetupTest {
/** Use a released launchpad for this example */
- public static final String SLING_LAUNCHPAD_VERSION = "6";
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
@Inject
private BundleContext bundleContext;
@@ -90,56 +90,117 @@ public class SlingSetupTest {
@Test
public void testSlingBundles() {
- final String [] bundles = {
+ final String [] LAUNCHPAD_7_BUNDLES = {
+ "derby",
+ "jcl.over.slf4j",
+ "log4j.over.slf4j",
+ "org.apache.aries.jmx.api",
+ "org.apache.aries.jmx.core",
+ "org.apache.aries.jmx.whiteboard",
+ "org.apache.aries.util",
+ "org.apache.commons.codec",
+ "org.apache.commons.collections",
+ "org.apache.commons.fileupload",
+ "org.apache.commons.io",
+ "org.apache.commons.lang",
+ "org.apache.commons.math",
+ "org.apache.commons.pool",
+ "org.apache.felix.bundlerepository",
+ "org.apache.felix.configadmin",
+ "org.apache.felix.eventadmin",
+ "org.apache.felix.framework",
+ //"org.apache.felix.http.api",
+ "org.apache.felix.http.jetty",
+ //"org.apache.felix.http.servlet-api",
+ "org.apache.felix.http.whiteboard",
+ "org.apache.felix.inventory",
+ "org.apache.felix.metatype",
+ "org.apache.felix.prefs",
+ "org.apache.felix.scr",
+ "org.apache.felix.webconsole",
+ "org.apache.felix.webconsole.plugins.ds",
+ "org.apache.felix.webconsole.plugins.event",
+ "org.apache.felix.webconsole.plugins.memoryusage",
+ "org.apache.felix.webconsole.plugins.obr",
+ "org.apache.felix.webconsole.plugins.packageadmin",
+ "org.apache.geronimo.bundles.commons-httpclient",
+ "org.apache.geronimo.bundles.json",
+ "org.apache.geronimo.bundles.jstl",
+ "org.apache.jackrabbit.jackrabbit-api",
+ "org.apache.jackrabbit.jackrabbit-jcr-commons",
+ "org.apache.jackrabbit.jackrabbit-jcr-rmi",
+ "org.apache.jackrabbit.jackrabbit-spi",
+ "org.apache.jackrabbit.jackrabbit-spi-commons",
+ "org.apache.jackrabbit.jackrabbit-webdav",
+ "org.apache.servicemix.bundles.concurrent",
"org.apache.sling.adapter",
"org.apache.sling.api",
"org.apache.sling.auth.core",
"org.apache.sling.auth.form",
- "org.apache.sling.auth.openid",
- "org.apache.sling.auth.selector",
"org.apache.sling.bundleresource.impl",
"org.apache.sling.commons.classloader",
+ "org.apache.sling.commons.compiler",
"org.apache.sling.commons.json",
"org.apache.sling.commons.log",
+ "org.apache.sling.commons.logservice",
"org.apache.sling.commons.mime",
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
+ "org.apache.sling.discovery.api",
+ "org.apache.sling.discovery.impl",
+ "org.apache.sling.discovery.support",
"org.apache.sling.engine",
"org.apache.sling.event",
"org.apache.sling.extensions.explorer",
"org.apache.sling.extensions.threaddump",
"org.apache.sling.extensions.webconsolebranding",
"org.apache.sling.extensions.webconsolesecurityprovider",
+ "org.apache.sling.fragment.transaction",
+ "org.apache.sling.fragment.ws",
+ "org.apache.sling.fragment.xml",
"org.apache.sling.fsresource",
+ "org.apache.sling.installer.console",
"org.apache.sling.installer.core",
+ "org.apache.sling.installer.factory.configuration",
"org.apache.sling.installer.provider.file",
"org.apache.sling.installer.provider.jcr",
+ "org.apache.sling.javax.activation",
"org.apache.sling.jcr.api",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.classloader",
"org.apache.sling.jcr.contentloader",
+ "org.apache.sling.jcr.davex",
"org.apache.sling.jcr.jackrabbit.accessmanager",
"org.apache.sling.jcr.jackrabbit.server",
"org.apache.sling.jcr.jackrabbit.usermanager",
- "org.apache.sling.jcr.ocm",
+ "org.apache.sling.jcr.jcr-wrapper",
+ "org.apache.sling.jcr.registration",
"org.apache.sling.jcr.resource",
"org.apache.sling.jcr.webconsole",
+ "org.apache.sling.jcr.webdav",
"org.apache.sling.launchpad.content",
"org.apache.sling.launchpad.installer",
+ "org.apache.sling.models.api",
+ "org.apache.sling.models.impl",
+ "org.apache.sling.resourceresolver",
"org.apache.sling.scripting.api",
"org.apache.sling.scripting.core",
"org.apache.sling.scripting.javascript",
"org.apache.sling.scripting.jsp",
"org.apache.sling.scripting.jsp.taglib",
+ "org.apache.sling.serviceusermapper",
"org.apache.sling.servlets.get",
"org.apache.sling.servlets.post",
"org.apache.sling.servlets.resolver",
- "org.apache.sling.settings"
+ "org.apache.sling.settings",
+ "org.apache.tika.bundle",
+ "org.apache.tika.core",
+ "slf4j.api"
};
final List<String> missing = new ArrayList<String>();
- for(String bundleName : bundles) {
+ for(String bundleName : LAUNCHPAD_7_BUNDLES) {
final int state = getBundleState(bundleName);
if(state != Bundle.ACTIVE) {
missing.add(bundleName + " (state=" + state + ")");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 22/26: Move to parent pom 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit b8009fa22488df8d3ad19f7d313ba55bacf96b56
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Mar 29 07:32:59 2017 +0000
Move to parent pom 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1789283 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07d3375..975524a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>30</version>
<relativePath/>
</parent>
@@ -96,9 +96,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -126,7 +124,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.2.1</version>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -162,7 +160,6 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -176,7 +173,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 05/26: [maven-release-plugin]
prepare release org.apache.sling.paxexam.util-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit d617da63986c143112d80d36fe058e3f2c6c64df
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 13:02:48 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560978 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4f694fe..e582acd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,7 @@
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">
+<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>
@@ -23,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -162,4 +161,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2</url>
+ </scm>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 15/26: Add missing excludes
for rat
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 59fedd70a594b13148a70495ace2c71a2283c81e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 27 16:02:12 2015 +0000
Add missing excludes for rat
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676320 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9a32f1a..8ccb357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,16 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ <exclude>jackrabbit/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 23/26: fix javadoc errors
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit a33754f6082c127f338dd37bf857c4a70414f339
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:45:37 2017 +0000
fix javadoc errors
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793861 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/paxexam/util/SlingPaxOptions.java | 34 +++++++++++++++-------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
index 5368d71..56cfdf7 100644
--- a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
+++ b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
@@ -44,11 +44,12 @@ import org.ops4j.pax.exam.options.DefaultCompositeOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** Pax exam options and utilities to test Sling applications
- * The basic idea is to get a vanilla Sling launchpad instance
- * setup with a minimal amount of boilerplate code.
- * See {@link SlingSetupTest} for an example.
- * */
+/**
+ * Pax exam options and utilities to test Sling applications
+ * The basic idea is to get a vanilla Sling launchpad instance
+ * setup with a minimal amount of boilerplate code.
+ * See SlingSetupTest for an example.
+ */
public class SlingPaxOptions {
private static final Logger log = LoggerFactory.getLogger(SlingPaxOptions.class);
public static final int DEFAULT_SLING_START_LEVEL = 30;
@@ -68,8 +69,11 @@ public class SlingPaxOptions {
return result;
}
- /** When reading bundle lists, ignore bundles which have symbolic names
- * starting with one of the supplied prefixes */
+ /**
+ * When reading bundle lists, ignore bundles which have symbolic names
+ * starting with one of the supplied prefixes
+ * @param symbolicNamePrefix Symbolic name prefixes
+ */
public static void setIgnoredBundles(String ... symbolicNamePrefix) {
if(symbolicNamePrefix == null || symbolicNamePrefix.length == 0) {
ignoredBundlePrefixes = new String[] {};
@@ -78,13 +82,20 @@ public class SlingPaxOptions {
}
}
- /** Get run modes to use for our tests, as set by the sling.run.modes property */
+ /**
+ * Get run modes to use for our tests, as set by the sling.run.modes property
+ * @return Run modes
+ */
public static Collection<String> getTestRunModes() {
final String runModes = System.getProperty("sling.run.modes", DEFAULT_RUN_MODES);
return Arrays.asList(runModes.split(","));
}
- /** @param launchpadVersion null means use the latest */
+ /**
+ * Set default launchpad options
+ * @param launchpadVersion null means use the latest
+ * @return Composite option
+ */
public static CompositeOption defaultLaunchpadOptions(String launchpadVersion) {
final String paxLogLevel = System.getProperty("pax.exam.log.level", "INFO");
@@ -219,7 +230,10 @@ public class SlingPaxOptions {
return slingBundleList("org.apache.sling", "org.apache.sling.launchpad", version, "xml", "bundlelist");
}
- /** @param version can be null, to use default */
+ /**
+ * Felix remote shell bundles
+ * @return Composite option
+ */
public static CompositeOption felixRemoteShellBundles() {
final String gogoVersion = "0.10.0";
return new DefaultCompositeOption(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 25/26: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 93074b2c8b9edebcba3b1bc176a0a1b5f791ef38
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:55:30 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793867 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 404721e..84720ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -41,9 +41,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 14/26: Add local
StartupHandler so that SlingSettingsService starts
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 0a4f4a4b4dea250070d3fb425c5faa1403d35e39
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 3 14:13:27 2014 +0000
Add local StartupHandler so that SlingSettingsService starts
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1636357 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/paxexam/util/SlingSetupTest.java | 40 +++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 2d8ad19..13e40c2 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -25,6 +25,10 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupMode;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -34,6 +38,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
/** Verify that we get a working Sling launchpad with what SlingPaxOptions provide */
@RunWith(PaxExam.class)
@@ -46,10 +51,42 @@ public class SlingSetupTest {
@Inject
private BundleContext bundleContext;
+ private ServiceRegistration<?> startupHandlerRegistration;
+
@org.ops4j.pax.exam.Configuration
public Option[] config() {
return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
+
+ @Before
+ public void setup() {
+ // In Sling launchpad 7 the SlingSettings service
+ // requires a StartupHandler, and that's usually provided
+ // by the launchpad bootstrap code. Supply our own so that
+ // everything starts properly.
+ // TODO should be provided by a utility/bootstrap bundle
+ final StartupHandler h = new StartupHandler() {
+ public void waitWithStartup(boolean b) {
+ }
+
+ public boolean isFinished() {
+ return true;
+ }
+
+ public StartupMode getMode() {
+ return StartupMode.INSTALL;
+ }
+ };
+ startupHandlerRegistration = bundleContext.registerService(StartupHandler.class.getName(), h, null);
+ }
+
+ @After
+ public void cleanup() {
+ if(startupHandlerRegistration != null) {
+ startupHandlerRegistration.unregister();
+ startupHandlerRegistration = null;
+ }
+ }
private void assertBundleActive(String symbolicName) {
assertEquals("Expecting bundle to be active:" + symbolicName, Bundle.ACTIVE, getBundleState(symbolicName));
@@ -220,7 +257,8 @@ public class SlingSetupTest {
final String [] services = {
"org.apache.sling.engine.SlingRequestProcessor",
"org.apache.sling.commons.mime.MimeTypeService",
- "org.apache.sling.jcr.api.SlingRepository"
+ "org.apache.sling.jcr.api.SlingRepository",
+ "org.apache.sling.settings.SlingSettingsService"
};
final List<String> missing = new ArrayList<String>();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 11/26: Updated to parent
version 20
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit f09b514e2bc197fa921bd99dff2741e1f786b07d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8cf7aa5..9a4bcfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 21/26: Switch to parent pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 12a2bf82ba0c09696240ab87aff6d7946725940c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b4d20ec..07d3375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 16/26: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 5ee2010cb885c9f4855bdc657d62bcea7c5436ba
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8ccb357..6e9b378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 02/26: SLING-2788 - move
sling-pax-util under testing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 294c53b324db150aa95caf0cb584505185696cdc
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 10:49:12 2014 +0000
SLING-2788 - move sling-pax-util under testing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560940 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 34d3673..b4b08bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Sling Pax Exam Utilities</name>
+ <name>Apache Sling Pax Exam Utilities</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 17/26: SLING-4832 -
SlingPaxOptions.setIgnoredBundles added, with tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 8f58cb3d100be454575c95e625007b912ec9cbe9
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jun 24 20:20:23 2015 +0000
SLING-4832 - SlingPaxOptions.setIgnoredBundles added, with tests
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687359 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +
.../apache/sling/paxexam/util/SlingPaxOptions.java | 33 +++++++++++-
.../sling/paxexam/util/IgnoredBundlesTest.java | 63 ++++++++++++++++++++++
.../apache/sling/paxexam/util/SlingSetupTest.java | 11 ++--
4 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e9b378..af14bac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<exam.version>3.0.3</exam.version>
<url.version>1.5.2</url.version>
<pax.exam.log.level>INFO</pax.exam.log.level>
+ <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
</properties>
<scm>
@@ -76,6 +77,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${pax.vm.options}</argLine>
<systemProperties>
<property>
<name>pax.exam.log.level</name>
diff --git a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
index 9b1dcef..5368d71 100644
--- a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
+++ b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
@@ -55,6 +55,7 @@ public class SlingPaxOptions {
public static final String PROP_TELNET_PORT = "osgi.shell.telnet.port";
public static final String PROP_HTTP_PORT = "org.osgi.service.http.port";
public static final String DEFAULT_RUN_MODES = "jackrabbit";
+ private static String [] ignoredBundlePrefixes;
private static int getAvailablePort() {
int result = Integer.MIN_VALUE;
@@ -67,6 +68,16 @@ public class SlingPaxOptions {
return result;
}
+ /** When reading bundle lists, ignore bundles which have symbolic names
+ * starting with one of the supplied prefixes */
+ public static void setIgnoredBundles(String ... symbolicNamePrefix) {
+ if(symbolicNamePrefix == null || symbolicNamePrefix.length == 0) {
+ ignoredBundlePrefixes = new String[] {};
+ } else {
+ ignoredBundlePrefixes = symbolicNamePrefix;
+ }
+ }
+
/** Get run modes to use for our tests, as set by the sling.run.modes property */
public static Collection<String> getTestRunModes() {
final String runModes = System.getProperty("sling.run.modes", DEFAULT_RUN_MODES);
@@ -96,6 +107,20 @@ public class SlingPaxOptions {
);
}
+ private static boolean ignore(Bundle b) {
+ boolean result = false;
+ if(ignoredBundlePrefixes != null) {
+ final String sn = b.getArtifactId();
+ for(String prefix : ignoredBundlePrefixes) {
+ if(sn.startsWith(prefix)) {
+ result = true;
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
public static CompositeOption slingBundleList(String groupId, String artifactId, String version, String type, String classifier) {
final DefaultCompositeOption result = new DefaultCompositeOption();
@@ -121,12 +146,18 @@ public class SlingPaxOptions {
tmp = dumpMvnUrlToTmpFile(paxUrl);
final BundleList list = BundleListUtils.readBundleList(tmp);
int counter = 0;
+ int ignored = 0;
for(StartLevel s : list.getStartLevels()) {
// Start level < 0 means bootstrap in our bundle lists
final int startLevel = s.getStartLevel() < 0 ? 1 : s.getStartLevel();
for(Bundle b : s.getBundles()) {
+ if(ignore(b)) {
+ log.info("Bundle ignored due to setIgnoredBundles: {}", b);
+ ignored++;
+ continue;
+ }
counter++;
// TODO need better fragment detection
@@ -163,7 +194,7 @@ public class SlingPaxOptions {
log.info("Bundle added: {}/{}/{}", new Object [] { b.getGroupId(), b.getArtifactId(), b.getVersion()});
}
}
- log.info("Got {} bundles from {}", counter, paxUrl);
+ log.info("Got {} bundles ({} ignored) from {}", new Object[] { counter, ignored, paxUrl });
} catch(Exception e) {
throw new RuntimeException("Error getting bundle list " + paxUrl, e);
} finally {
diff --git a/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java b/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java
new file mode 100644
index 0000000..23e8ff1
--- /dev/null
+++ b/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.paxexam.util;
+
+import static org.junit.Assert.assertNull;
+
+import javax.inject.Inject;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.BundleContext;
+
+/** Test the bundles ignoring feature */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class IgnoredBundlesTest {
+ /** Use a released launchpad for this example */
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
+
+ public static final String MIME_BUNDLE_SN = "org.apache.sling.commons.mime";
+ public static final String JSON_BUNDLE_SN = "org.apache.sling.commons.json";
+
+ @Inject
+ private BundleContext bundleContext;
+
+ @org.ops4j.pax.exam.Configuration
+ public Option[] config() {
+ SlingPaxOptions.setIgnoredBundles(MIME_BUNDLE_SN, JSON_BUNDLE_SN);
+ try {
+ return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
+ } finally {
+ SlingPaxOptions.setIgnoredBundles();
+ }
+ }
+
+ @Test
+ public void testMimeBundle() {
+ assertNull(SlingSetupTest.getBundle(bundleContext, MIME_BUNDLE_SN));
+ }
+
+ @Test
+ public void testJsonBundle() {
+ assertNull(SlingSetupTest.getBundle(bundleContext, JSON_BUNDLE_SN));
+ }
+ }
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 13e40c2..d3157e1 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -97,13 +97,18 @@ public class SlingSetupTest {
}
private Bundle getBundle(String symbolicName) {
- for(Bundle b : bundleContext.getBundles()) {
+ return getBundle(bundleContext, symbolicName);
+ }
+
+ static Bundle getBundle(BundleContext bc, String symbolicName) {
+ for(Bundle b : bc.getBundles()) {
if(symbolicName.equals(b.getSymbolicName())) {
return b;
}
}
return null;
}
+
/** @return bundle state, UNINSTALLED if absent */
private int getBundleState(String symbolicName) {
return getBundleState(getBundle(symbolicName));
@@ -177,10 +182,10 @@ public class SlingSetupTest {
"org.apache.sling.bundleresource.impl",
"org.apache.sling.commons.classloader",
"org.apache.sling.commons.compiler",
- "org.apache.sling.commons.json",
+ IgnoredBundlesTest.JSON_BUNDLE_SN,
"org.apache.sling.commons.log",
"org.apache.sling.commons.logservice",
- "org.apache.sling.commons.mime",
+ IgnoredBundlesTest.MIME_BUNDLE_SN,
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 24/26: [maven-release-plugin]
prepare release org.apache.sling.paxexam.util-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 6724eb7de1fb5aeeea384c38cfec84d6ed73aafd
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:55:15 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793865 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 358 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 179 insertions(+), 179 deletions(-)
diff --git a/pom.xml b/pom.xml
index 975524a..404721e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,179 +1,179 @@
-<?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>30</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Apache Sling Pax Exam Utilities</name>
-
- <description>
- Utilities that make it easier to test Sling code with Pax Exam.
- See this module's tests for usage examples.
- </description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <exam.version>3.0.3</exam.version>
- <url.version>1.5.2</url.version>
- <pax.exam.log.level>INFO</pax.exam.log.level>
- <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
- </properties>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>derby.log</exclude>
- <exclude>jackrabbit/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>derby.log</include>
- <include>jackrabbit/**</include>
- <include>coverage.ec</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${pax.vm.options}</argLine>
- <systemProperties>
- <property>
- <name>pax.exam.log.level</name>
- <value>${pax.exam.log.level}</value>
- </property>
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.ops4j.pax.url</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
- <type>maven-plugin</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <scope>test</scope>
- </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>
- </dependency>
- </dependencies>
-
-</project>
+<?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>30</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.paxexam.util</artifactId>
+ <version>1.0.4</version>
+ <packaging>jar</packaging>
+
+ <name>Apache Sling Pax Exam Utilities</name>
+
+ <description>
+ Utilities that make it easier to test Sling code with Pax Exam.
+ See this module's tests for usage examples.
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <exam.version>3.0.3</exam.version>
+ <url.version>1.5.2</url.version>
+ <pax.exam.log.level>INFO</pax.exam.log.level>
+ <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.4</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ <exclude>jackrabbit/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>derby.log</include>
+ <include>jackrabbit/**</include>
+ <include>coverage.ec</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${pax.vm.options}</argLine>
+ <systemProperties>
+ <property>
+ <name>pax.exam.log.level</name>
+ <value>${pax.exam.log.level}</value>
+ </property>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.ops4j.pax.url</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>5.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <version>2.2.0</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>test</scope>
+ </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>
+ </dependency>
+ </dependencies>
+
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 20/26: Update the main
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 0b1e7910dd9f96d3566d489c95f0185c7d5a8a12
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d6a39ea..b4d20ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 06/26: SLING-2788 - add
missing section
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit cbcc546968031d822457f0ada302a95a156fadb3
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 13:08:47 2014 +0000
SLING-2788 - add missing <scm> section
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560981 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index e582acd..ea8ffe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.2</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -39,6 +39,12 @@
<pax.exam.log.level>INFO</pax.exam.log.level>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
+ </scm>
+
<build>
<plugins>
<plugin>
@@ -162,9 +168,4 @@
</dependency>
</dependencies>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2</url>
- </scm>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 19/26: set parent version to
24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 953700a1d90510c3f7793a381cdc9dd249c4e529
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index affdd36..d6a39ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 10/26: Update .gitignore files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 662453df0617315aa937537789789a168e9c801e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 2 09:38:33 2014 +0000
Update .gitignore files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1591844 13f79535-47bb-0310-9956-ffa450edef68
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b302b02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/jackrabbit
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 01/26: SLING-2788 - move
sling-pax-util under testing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 392f3d2fe7c958717531b0c0b2aa199e1025e84d
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 10:46:07 2014 +0000
SLING-2788 - move sling-pax-util under testing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560938 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 145 +++++++++++++
.../apache/sling/paxexam/util/SlingPaxOptions.java | 224 +++++++++++++++++++++
.../sling/paxexam/util/SlingRepositoryTest.java | 72 +++++++
.../apache/sling/paxexam/util/SlingSetupTest.java | 190 +++++++++++++++++
4 files changed, 631 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..34d3673
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,145 @@
+<?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/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.paxexam.util</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Sling Pax Exam Utilities</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <exam.version>3.0.3</exam.version>
+ <url.version>1.5.2</url.version>
+ <pax.exam.log.level>INFO</pax.exam.log.level>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>pax.exam.log.level</name>
+ <value>${pax.exam.log.level}</value>
+ </property>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.ops4j.pax.url</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>4.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </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>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
new file mode 100644
index 0000000..9b1dcef
--- /dev/null
+++ b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
@@ -0,0 +1,224 @@
+/*
+ * 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.paxexam.util;
+
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.sling.maven.projectsupport.BundleListUtils;
+import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.Bundle;
+import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.BundleList;
+import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.StartLevel;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.options.CompositeOption;
+import org.ops4j.pax.exam.options.DefaultCompositeOption;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Pax exam options and utilities to test Sling applications
+ * The basic idea is to get a vanilla Sling launchpad instance
+ * setup with a minimal amount of boilerplate code.
+ * See {@link SlingSetupTest} for an example.
+ * */
+public class SlingPaxOptions {
+ private static final Logger log = LoggerFactory.getLogger(SlingPaxOptions.class);
+ public static final int DEFAULT_SLING_START_LEVEL = 30;
+ public static final String PROP_TELNET_PORT = "osgi.shell.telnet.port";
+ public static final String PROP_HTTP_PORT = "org.osgi.service.http.port";
+ public static final String DEFAULT_RUN_MODES = "jackrabbit";
+
+ private static int getAvailablePort() {
+ int result = Integer.MIN_VALUE;
+ try {
+ final ServerSocket s = new ServerSocket(0);
+ result = s.getLocalPort();
+ s.close();
+ } catch(IOException ignore) {
+ }
+ return result;
+ }
+
+ /** Get run modes to use for our tests, as set by the sling.run.modes property */
+ public static Collection<String> getTestRunModes() {
+ final String runModes = System.getProperty("sling.run.modes", DEFAULT_RUN_MODES);
+ return Arrays.asList(runModes.split(","));
+ }
+
+ /** @param launchpadVersion null means use the latest */
+ public static CompositeOption defaultLaunchpadOptions(String launchpadVersion) {
+ final String paxLogLevel = System.getProperty("pax.exam.log.level", "INFO");
+
+ final int slingStartLevel = DEFAULT_SLING_START_LEVEL;
+ final String telnetPort = System.getProperty(PROP_TELNET_PORT, String.valueOf(getAvailablePort()));
+ final String httpPort = System.getProperty(PROP_HTTP_PORT, String.valueOf(getAvailablePort()));
+
+ log.info("{}={}", PROP_TELNET_PORT, telnetPort);
+ log.info("{}={}", PROP_HTTP_PORT, httpPort);
+
+ return new DefaultCompositeOption(
+ junitBundles(),
+ systemProperty( "org.ops4j.pax.logging.DefaultServiceLog.level" ).value(paxLogLevel),
+ SlingPaxOptions.felixRemoteShellBundles(),
+ SlingPaxOptions.slingBootstrapBundles(),
+ SlingPaxOptions.slingLaunchpadBundles(launchpadVersion),
+ CoreOptions.frameworkStartLevel(slingStartLevel),
+ CoreOptions.frameworkProperty(PROP_TELNET_PORT).value(telnetPort),
+ CoreOptions.frameworkProperty(PROP_HTTP_PORT).value(httpPort)
+ );
+ }
+
+ public static CompositeOption slingBundleList(String groupId, String artifactId, String version, String type, String classifier) {
+
+ final DefaultCompositeOption result = new DefaultCompositeOption();
+
+ final String paxUrl = new StringBuilder()
+ .append("mvn:")
+ .append(groupId)
+ .append("/")
+ .append(artifactId)
+ .append("/")
+ .append(version == null ? "" : version)
+ .append("/")
+ .append(type == null ? "" : type)
+ .append("/")
+ .append(classifier == null ? "" : classifier)
+ .toString();
+
+ // TODO BundleList should take an InputStream - for now copy to a tmp file for parsing
+ log.info("Getting bundle list {}", paxUrl);
+ File tmp = null;
+ final Collection<String> testRunModes = getTestRunModes();
+ try {
+ tmp = dumpMvnUrlToTmpFile(paxUrl);
+ final BundleList list = BundleListUtils.readBundleList(tmp);
+ int counter = 0;
+ for(StartLevel s : list.getStartLevels()) {
+
+ // Start level < 0 means bootstrap in our bundle lists
+ final int startLevel = s.getStartLevel() < 0 ? 1 : s.getStartLevel();
+
+ for(Bundle b : s.getBundles()) {
+ counter++;
+
+ // TODO need better fragment detection
+ // (but pax exam should really detect that by itself?)
+ final List<String> KNOWN_FRAGMENTS = new ArrayList<String>();
+ KNOWN_FRAGMENTS.add("org.apache.sling.extensions.webconsolebranding");
+ final boolean isFragment = b.getArtifactId().contains("fragment") || KNOWN_FRAGMENTS.contains(b.getArtifactId());
+
+ // Ignore bundles with run modes that do not match ours
+ final String bundleRunModes = b.getRunModes();
+ if(bundleRunModes != null && bundleRunModes.length() > 0) {
+ boolean active = false;
+ for(String m : bundleRunModes.split(",")) {
+ if(testRunModes.contains(m)) {
+ active = true;
+ break;
+ }
+ }
+ if(!active) {
+ log.info("Ignoring bundle {} as none of its run modes [{}] are active in this test run {}",
+ new Object[] { b.getArtifactId(), bundleRunModes, testRunModes} );
+ continue;
+ }
+ }
+
+ if(isFragment) {
+ result.add(mavenBundle(b.getGroupId(), b.getArtifactId(), b.getVersion()).noStart());
+ } else if(startLevel == 0){
+ result.add(mavenBundle(b.getGroupId(), b.getArtifactId(), b.getVersion()));
+ } else {
+ result.add(mavenBundle(b.getGroupId(), b.getArtifactId(), b.getVersion()).startLevel(startLevel));
+ }
+
+ log.info("Bundle added: {}/{}/{}", new Object [] { b.getGroupId(), b.getArtifactId(), b.getVersion()});
+ }
+ }
+ log.info("Got {} bundles from {}", counter, paxUrl);
+ } catch(Exception e) {
+ throw new RuntimeException("Error getting bundle list " + paxUrl, e);
+ } finally {
+ if(tmp != null) {
+ tmp.delete();
+ }
+ }
+
+ return result;
+ }
+
+ public static CompositeOption slingBootstrapBundles() {
+ return new DefaultCompositeOption(
+ mavenBundle("org.apache.felix", "org.apache.felix.http.jetty", "2.2.0"),
+
+ // TODO: why is this needed?
+ mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0")
+ );
+ }
+
+ public static CompositeOption slingLaunchpadBundles(String version) {
+ return slingBundleList("org.apache.sling", "org.apache.sling.launchpad", version, "xml", "bundlelist");
+ }
+
+ /** @param version can be null, to use default */
+ public static CompositeOption felixRemoteShellBundles() {
+ final String gogoVersion = "0.10.0";
+ return new DefaultCompositeOption(
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.gogo.runtime").version(gogoVersion),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.gogo.shell").version(gogoVersion),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.gogo.command").version(gogoVersion),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.shell.remote").version("1.1.2")
+ );
+ }
+
+ private static File dumpMvnUrlToTmpFile(String mvnUrl) throws IOException {
+ final URL url = new URL(mvnUrl);
+ final InputStream is = new BufferedInputStream(url.openStream());
+
+ final File tmp = File.createTempFile(SlingPaxOptions.class.getName(), "xml");
+ log.debug("Copying bundle list contents to {}", tmp.getAbsolutePath());
+ tmp.deleteOnExit();
+ final OutputStream os = new BufferedOutputStream(new FileOutputStream(tmp));
+ try {
+ final byte [] buffer = new byte[16384];
+ int len = 0;
+ while( (len = is.read(buffer, 0, buffer.length)) > 0) {
+ os.write(buffer, 0, len);
+ }
+ os.flush();
+ } finally {
+ os.close();
+ is.close();
+ }
+
+ return tmp;
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
new file mode 100644
index 0000000..c1a14c8
--- /dev/null
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.paxexam.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.inject.Inject;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.sling.jcr.api.SlingRepository;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+/** Verify that our tests have access to a functional Sling instance,
+ * and demonstrate how a simple test is setup.
+ *
+ * To create a test like this that runs against a full Sling launchpad
+ * instance, one only needs the pax exam setup in the pom and a test
+ * like this one that runs with @RunWith PaxExam, that provides a
+ * Configuration method and can access services or the BundleContext
+ * using @Inject.
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingRepositoryTest {
+ @Inject
+ private SlingRepository repository;
+
+ @org.ops4j.pax.exam.Configuration
+ public Option[] config() {
+ return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ }
+
+ @Test
+ public void testNameDescriptor() {
+ // We could use JUnit categories to select tests, as we
+ // do in our integration, but let's avoid a dependency on
+ // that in this module
+ if(System.getProperty("sling.run.modes", "").contains("oak")) {
+ assertEquals("Apache Jackrabbit Oak", repository.getDescriptor("jcr.repository.name"));
+ } else {
+ assertEquals("Jackrabbit", repository.getDescriptor("jcr.repository.name"));
+ }
+ }
+
+ @Test
+ public void testLogin() throws RepositoryException {
+ final Session s = repository.loginAdministrative(null);
+ assertNotNull(s);
+ s.logout();
+ }
+ }
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
new file mode 100644
index 0000000..cc7cfe2
--- /dev/null
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -0,0 +1,190 @@
+/*
+ * 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.paxexam.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/** Verify that we get a working Sling launchpad with what SlingPaxOptions provide */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingSetupTest {
+
+ @Inject
+ private BundleContext bundleContext;
+
+ @org.ops4j.pax.exam.Configuration
+ public Option[] config() {
+ return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ }
+
+ private void assertBundleActive(String symbolicName) {
+ assertEquals("Expecting bundle to be active:" + symbolicName, Bundle.ACTIVE, getBundleState(symbolicName));
+ }
+
+ private boolean isFragment(Bundle b) {
+ return b.getHeaders().get("Fragment-Host") != null;
+ }
+
+ private Bundle getBundle(String symbolicName) {
+ for(Bundle b : bundleContext.getBundles()) {
+ if(symbolicName.equals(b.getSymbolicName())) {
+ return b;
+ }
+ }
+ return null;
+ }
+ /** @return bundle state, UNINSTALLED if absent */
+ private int getBundleState(String symbolicName) {
+ return getBundleState(getBundle(symbolicName));
+ }
+
+ /** @return bundle state, UNINSTALLED if absent, ACTIVE */
+ private int getBundleState(Bundle b) {
+ if(b == null) {
+ return Bundle.UNINSTALLED;
+ } else if(isFragment(b)) {
+ return Bundle.ACTIVE;
+ } else {
+ return b.getState();
+ }
+ }
+
+ @Test
+ public void testBundleContext() {
+ assertNotNull("Expecting BundleContext to be set", bundleContext);
+ }
+
+ @Test
+ public void testSlingBundles() {
+ final String [] bundles = {
+ "org.apache.sling.adapter",
+ "org.apache.sling.api",
+ "org.apache.sling.auth.core",
+ "org.apache.sling.auth.form",
+ "org.apache.sling.auth.openid",
+ "org.apache.sling.auth.selector",
+ "org.apache.sling.bundleresource.impl",
+ "org.apache.sling.commons.classloader",
+ "org.apache.sling.commons.json",
+ "org.apache.sling.commons.log",
+ "org.apache.sling.commons.logservice",
+ "org.apache.sling.commons.mime",
+ "org.apache.sling.commons.osgi",
+ "org.apache.sling.commons.scheduler",
+ "org.apache.sling.commons.threads",
+ "org.apache.sling.discovery.api",
+ "org.apache.sling.discovery.impl",
+ "org.apache.sling.discovery.support",
+ "org.apache.sling.engine",
+ "org.apache.sling.event",
+ "org.apache.sling.extensions.explorer",
+ "org.apache.sling.extensions.groovy",
+ "org.apache.sling.extensions.threaddump",
+ "org.apache.sling.extensions.webconsolebranding",
+ "org.apache.sling.extensions.webconsolesecurityprovider",
+ "org.apache.sling.fragment.transaction",
+ "org.apache.sling.fragment.ws",
+ "org.apache.sling.fragment.xml",
+ "org.apache.sling.fsresource",
+ "org.apache.sling.installer.console",
+ "org.apache.sling.installer.core",
+ "org.apache.sling.installer.factory.configuration",
+ "org.apache.sling.installer.provider.file",
+ "org.apache.sling.installer.provider.jcr",
+ "org.apache.sling.jcr.jcr-wrapper",
+ "org.apache.sling.jcr.api",
+ "org.apache.sling.jcr.base",
+ "org.apache.sling.jcr.classloader",
+ "org.apache.sling.jcr.contentloader",
+ "org.apache.sling.jcr.davex",
+ "org.apache.sling.jcr.jackrabbit.accessmanager",
+ "org.apache.sling.jcr.jackrabbit.server",
+ "org.apache.sling.jcr.jackrabbit.usermanager",
+ "org.apache.sling.jcr.ocm",
+ "org.apache.sling.jcr.registration",
+ "org.apache.sling.jcr.resource",
+ "org.apache.sling.jcr.webconsole",
+ "org.apache.sling.jcr.webdav",
+ "org.apache.sling.launchpad.content",
+ "org.apache.sling.launchpad.installer",
+ "org.apache.sling.resourceresolver",
+ "org.apache.sling.scripting.api",
+ "org.apache.sling.scripting.core",
+ "org.apache.sling.scripting.javascript",
+ "org.apache.sling.scripting.jsp",
+ "org.apache.sling.scripting.jsp.taglib",
+ "org.apache.sling.servlets.get",
+ "org.apache.sling.servlets.post",
+ "org.apache.sling.servlets.resolver",
+ "org.apache.sling.settings"
+ };
+
+ final List<String> missing = new ArrayList<String>();
+ for(String bundleName : bundles) {
+ final int state = getBundleState(bundleName);
+ if(state != Bundle.ACTIVE) {
+ missing.add(bundleName + " (state=" + state + ")");
+ }
+ }
+
+ if(!missing.isEmpty()) {
+ fail("Some required bundles are missing or inactive:" + missing);
+ }
+ }
+
+ @Test
+ public void testSlingServices() {
+ assertBundleActive("org.apache.sling.commons.mime");
+ assertBundleActive("org.apache.sling.engine");
+
+ final String [] services = {
+ "org.apache.sling.engine.SlingRequestProcessor",
+ "org.apache.sling.commons.mime.MimeTypeService",
+ "org.apache.sling.jcr.api.SlingRepository"
+ };
+
+ final List<String> missing = new ArrayList<String>();
+ for(String svc : services) {
+ final ServiceReference<?> ref = bundleContext.getServiceReference(svc);
+ if(ref == null) {
+ missing.add(svc);
+ } else {
+ bundleContext.ungetService(ref);
+ }
+ }
+ if(!missing.isEmpty()) {
+ fail("Some required services are missing:" + missing);
+ }
+ }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 18/26: Update to Sling Parent
23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 431016cf35e68d550c57ba7d833ae92fe5b6b8a0
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af14bac..affdd36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 26/26: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 2e6b4c0f36936de840642b1cbf56e2c4ce3a533a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:37:48 2017 +0000
SLING-7167 Adjust READMEs
add missing README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810788 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a877bb8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Pax Exam Utilities
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 08/26: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit d4cf86c75a7b469e7f82c4a7d16f3f2dd564f330
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 13:10:28 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560984 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad9784d..25ee230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 04/26: SLING-2788 - explain
this better
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 6b322032e85e80309b2d7cbea9350dd388bc0862
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 11:10:39 2014 +0000
SLING-2788 - explain this better
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560942 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 5 +++++
.../org/apache/sling/paxexam/util/SlingRepositoryTest.java | 14 ++++++++------
.../java/org/apache/sling/paxexam/util/SlingSetupTest.java | 5 ++++-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a69e323..4f694fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,11 @@
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
+
+ <description>
+ Utilities that make it easier to test Sling code with Pax Exam.
+ See this module's tests for usage examples.
+ </description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
index b436511..18bbd3e 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -34,11 +34,10 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
/** Verify that our tests have access to a functional Sling instance,
* and demonstrate how a simple test is setup.
*
- * To create a test like this that runs against a full Sling launchpad
- * instance, one only needs the pax exam setup in the pom and a test
- * like this one that runs with @RunWith PaxExam, that provides a
- * Configuration method and can access services or the BundleContext
- * using @Inject.
+ * Note how little boilerplate this example test has. You basically just
+ * define which version of the Sling launchpad bundle list you want to use,
+ * and you can then @Inject any OSGi services to be tested, along with the
+ * BundleContext.
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -46,9 +45,12 @@ public class SlingRepositoryTest {
@Inject
private SlingRepository repository;
+ /** Use a released launchpad for this example */
+ public static final String SLING_LAUNCHPAD_VERSION = "6";
+
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
@Test
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index f11cd16..0738efd 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -40,12 +40,15 @@ import org.osgi.framework.ServiceReference;
@ExamReactorStrategy(PerClass.class)
public class SlingSetupTest {
+ /** Use a released launchpad for this example */
+ public static final String SLING_LAUNCHPAD_VERSION = "6";
+
@Inject
private BundleContext bundleContext;
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
private void assertBundleActive(String symbolicName) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 03/26: SLING-2788 - prepare
for release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit fd5377c85ab55cd5f78af6da43dff8ecb449896a
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 11:03:20 2014 +0000
SLING-2788 - prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560941 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 17 ++++++++++++++++-
.../sling/paxexam/util/SlingRepositoryTest.java | 4 ++--
.../org/apache/sling/paxexam/util/SlingSetupTest.java | 19 ++-----------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index b4b08bf..a69e323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>derby.log</include>
+ <include>jackrabbit/**</include>
+ <include>coverage.ec</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -95,7 +110,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<type>maven-plugin</type>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
index c1a14c8..b436511 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -48,7 +48,7 @@ public class SlingRepositoryTest {
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
}
@Test
@@ -69,4 +69,4 @@ public class SlingRepositoryTest {
assertNotNull(s);
s.logout();
}
- }
\ No newline at end of file
+ }
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index cc7cfe2..f11cd16 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -45,7 +45,7 @@ public class SlingSetupTest {
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
}
private void assertBundleActive(String symbolicName) {
@@ -98,47 +98,32 @@ public class SlingSetupTest {
"org.apache.sling.commons.classloader",
"org.apache.sling.commons.json",
"org.apache.sling.commons.log",
- "org.apache.sling.commons.logservice",
"org.apache.sling.commons.mime",
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
- "org.apache.sling.discovery.api",
- "org.apache.sling.discovery.impl",
- "org.apache.sling.discovery.support",
"org.apache.sling.engine",
"org.apache.sling.event",
"org.apache.sling.extensions.explorer",
- "org.apache.sling.extensions.groovy",
"org.apache.sling.extensions.threaddump",
"org.apache.sling.extensions.webconsolebranding",
"org.apache.sling.extensions.webconsolesecurityprovider",
- "org.apache.sling.fragment.transaction",
- "org.apache.sling.fragment.ws",
- "org.apache.sling.fragment.xml",
"org.apache.sling.fsresource",
- "org.apache.sling.installer.console",
"org.apache.sling.installer.core",
- "org.apache.sling.installer.factory.configuration",
"org.apache.sling.installer.provider.file",
"org.apache.sling.installer.provider.jcr",
- "org.apache.sling.jcr.jcr-wrapper",
"org.apache.sling.jcr.api",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.classloader",
"org.apache.sling.jcr.contentloader",
- "org.apache.sling.jcr.davex",
"org.apache.sling.jcr.jackrabbit.accessmanager",
"org.apache.sling.jcr.jackrabbit.server",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.ocm",
- "org.apache.sling.jcr.registration",
"org.apache.sling.jcr.resource",
"org.apache.sling.jcr.webconsole",
- "org.apache.sling.jcr.webdav",
"org.apache.sling.launchpad.content",
"org.apache.sling.launchpad.installer",
- "org.apache.sling.resourceresolver",
"org.apache.sling.scripting.api",
"org.apache.sling.scripting.core",
"org.apache.sling.scripting.javascript",
@@ -187,4 +172,4 @@ public class SlingSetupTest {
fail("Some required services are missing:" + missing);
}
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.