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/11/07 10:28:03 UTC
[sling-org-apache-sling-testing-sling-mock] annotated tag
org.apache.sling.testing.sling-mock-jackrabbit-1.0.0 created (now 581adad)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.
at 581adad (tag)
tagging 444c27dc88db0826702295418fed55d05efcd804 (commit)
by Stefan Seifert
on Mon Oct 5 17:34:07 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 8230617 SLING-4042 Donate sling-mock, jcr-mock, osgi-mock implementation
new a192d31 remove exclusion no longer required
new b88c759 svn:ignore
new b556108 SLING-4042 move all mock projects to mocks/ subdirectory
new 3e38f03 SLING-4042 make sure JCR mock supports accessing data using multiple sessions
new 1574600 SLING-4042 add README files
new 29ec239 add/update SCM urls
new cfa692f update to released versions
new d8c6833 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-jackrabbit-0.1.0
new f7e1c17 [maven-release-plugin] prepare for next development iteration
new 1abfb42 update dependencies in release process to next snapshot version
new 62c020e update README
new bbfca8c set to released version now available on maven central
new 77e2322 SLING-4090 Define package versions for Sling Mock, JCR Mock, OSGi Mock
new 626a8a9 SLING-4108 default to getAdministrativeResourceResolver in sling-mock to support jackrabbit resource resolver adapter as well
new 2424eb2 SLING-4267 update to latest sling-mock snapshot
new c6c5f9e SLING-4267 support importing nt:resource noded in jackrabbit with empty binary data enable content loader unit tests in sling-mock-jackrabbit
new 8564260 update dependencies to released versions
new 3a4968e [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-jackrabbit-0.1.2
new ddef482 [maven-release-plugin] prepare for next development iteration
new 6173040 update to next development snapshot unit released artifacts are in maven central
new 030a7fd switch back to released versions now available in maven central
new b32978d SLING-4362 make sure JCR namespaces are correctly registered in JCR mock on initialization through sling mock
new d583d24 switch to released versions
new 38c84b4 Add missing licence header
new 3d21fd3 SLING-4698 - Set parent.relativePath to empty for all modules
new 23c1fe9 SLING-4470 introduce separate "logging-mock" project for default log configuration in mock tests, remove compile-dependency on slf4j-simple
new 18e4e49 Mocks: use latest snapshots
new feb138e update to released mock versions
new 9b8967d SLING-4827 - Embed all needed classes in the sling-mock-jackrabbit jar
new 5fed2c5 Update to Sling Parent 23
new a5a756e Testing: remove superflous sling.java.version=6 as it's the default now
new 5021a96 switch to released versions
new d416eac set parent version to 24 and add empty relativePath where missing
new 46e2c42 SLING-5007 realx unit test to test root path child listing in sling-mock-jackrabbit and sling-mock-jackrabbit and sling-mock-oak because in real repositories multiple root test nodes may be created in parallel, or nodes already exist
new 5c9866c SLING-5007 use same unit tests for root node tests for all resource resolver types without counting the number of children.
new e5e5ef2 SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
new 51ab4cf SLING-5067 sling-mock: "uniqueRoot()" to simplify creation and cleanup of unique root paths in repository
new dd35625 SLING-5064 manual registration of node types no longer required
new 7cafb10 SLING-5064 manual registration of node types no longer required; register namespaces and node types centrally depending on NodeTypeMode
new f00b663 SLING-4824/SLING-4827 do not embed org.apache.sling.jcr.resource dependency; it's a dependency of sling mock and not sling-mock-jackrabbit/oak and version used should be controlled by sling-mock
new 3c2c033 SLING-5088 control SlingRepository resources via activate/deactivate methods; make sure all oak ExecutorServices are shutdown properly
new 42e3cba SLING-5088 fallback to loginAdministrative for service user login with jackrabbit
new 9924858 Update the main reactor to parent 25
new f45271d update dependencies
new 2267467 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
new 444c27d [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
The 47 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-testing-sling-mock] 24/28: SLING-5088
fallback to loginAdministrative for service user login with jackrabbit
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 42e3cbafd0dc23d8a4dce144dd4edb9ad08a9f2a
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sat Oct 3 01:10:33 2015 +0000
SLING-5088 fallback to loginAdministrative for service user login with jackrabbit
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1706517 13f79535-47bb-0310-9956-ffa450edef68
---
.../testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java
index 90ab384..3475439 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java
@@ -58,7 +58,8 @@ public final class JackrabbitMockSlingRepository implements SlingRepository {
}
public Session loginService(String subServiceName, String workspace) throws LoginException, RepositoryException {
- return delegate.loginService(subServiceName, workspace);
+ // fallback to loginAdministrative
+ return loginAdministrative(workspace);
}
public String[] getDescriptorKeys() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 05/28: switch to
released versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit d583d24151c02568fc0d0a8b85a539c896afcf82
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Feb 26 15:22:50 2015 +0000
switch to released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1662481 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a7f776..81e58f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.2.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 22/28:
SLING-4824/SLING-4827 do not embed org.apache.sling.jcr.resource dependency;
it's a dependency of sling mock and not sling-mock-jackrabbit/oak and
version used should be controlled by sling-mock
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit f00b663e12ffe785740db349d1ba218adc19709e
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Oct 1 20:33:56 2015 +0000
SLING-4824/SLING-4827 do not embed org.apache.sling.jcr.resource dependency; it's a dependency of sling mock and not sling-mock-jackrabbit/oak and version used should be controlled by sling-mock
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1706320 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index edec1fc..39b44e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
<configuration>
<!--
embed all jackrabbit artifacts to prevent classpath clashes
@@ -146,7 +146,6 @@
<artifactSet>
<includes>
<include>org.apache.jackrabbit:*</include>
- <include>org.apache.sling:org.apache.sling.jcr.resource</include>
</includes>
</artifactSet>
</configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 02/28: update to next
development snapshot unit released artifacts are in maven central
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 6173040c30a3e9cfc0f5536e0cee61a13e91cdc3
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Jan 22 20:58:54 2015 +0000
update to next development snapshot unit released artifacts are in maven central
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1654069 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc21019..4a7f776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 26/28: update
dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit f45271d29ea86e9ceaabe2055a615eebb54af226
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 5 17:31:35 2015 +0000
update dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1706883 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5bb3687..b686450 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,14 +45,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 13/28: Testing: remove
superflous sling.java.version=6 as it's the default now
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit a5a756ea9060edfaa5c7f71b35b3de8e94f48ed2
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:17:42 2015 +0000
Testing: remove superflous sling.java.version=6 as it's the default now
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1687511 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e45251a..f1c98cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,6 @@
<name>Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver</name>
<description>Implements a resource resolver type for Jackrabbit that can be used in unit tests based on Sling Mocks.</description>
-
- <properties>
- <sling.java.version>6</sling.java.version>
- </properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit</connection>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 10/28: update to
released mock versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit feb138e02b8dd61d29bd042bba7d08b0c2d874e9
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sat May 30 10:03:55 2015 +0000
update to released mock versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1682594 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a03ccb2..f9f9335 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.logging-mock</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 15/28: 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 annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit d416eaced089c24def7cc5432e28d5282be4dd2e
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/testing/mocks/sling-mock-jackrabbit@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 89c1c33..d140943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,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-testing-sling-mock] 09/28: Mocks: use
latest snapshots
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 18e4e49892d1cdbcf2a1d8660ec33981149a14fa
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed May 27 13:26:03 2015 +0000
Mocks: use latest snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1682015 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 009461b..a03ccb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.2.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.2.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 27/28:
[maven-release-plugin] prepare release
org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 2267467dd6c6ef5730b70728c01bcae830e2429f
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 5 17:33:54 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1706884 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index b686450..d4f5d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,20 +24,20 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>25</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.testing.sling-mock-jackrabbit</artifactId>
- <version>0.1.3-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver</name>
<description>Implements a resource resolver type for Jackrabbit that can be used in unit tests based on Sling Mocks.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 28/28:
[maven-release-plugin] copy for tag
org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 444c27dc88db0826702295418fed55d05efcd804
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 5 17:34:07 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-1.0.0@1706885 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 01/28:
[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 annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit ddef482fb49fe2c1e0e612caa771acef95b56494
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Jan 22 20:53:47 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1654062 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index df1e0fd..bc21019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock-jackrabbit</artifactId>
- <version>0.1.2</version>
+ <version>0.1.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver</name>
@@ -39,9 +39,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-jackrabbit-0.1.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 08/28: SLING-4470
introduce separate "logging-mock" project for default log configuration in
mock tests, remove compile-dependency on slf4j-simple
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 23c1fe936486d60ceb0b8a31581dab292ab35ed2
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 21 07:47:03 2015 +0000
SLING-4470 introduce separate "logging-mock" project for default log configuration in mock tests, remove compile-dependency on slf4j-simple
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1680753 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index b398de3..009461b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <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-testing-sling-mock] 23/28: SLING-5088
control SlingRepository resources via activate/deactivate methods;
make sure all oak ExecutorServices are shutdown properly
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 3c2c0330331926d2d25db0ca781509e409bf9f7a
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Oct 2 23:31:40 2015 +0000
SLING-5088 control SlingRepository resources via activate/deactivate methods; make sure all oak ExecutorServices are shutdown properly
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1706505 13f79535-47bb-0310-9956-ffa450edef68
---
.../JackrabbitMockResourceResolverAdapter.java | 10 +-
.../jackrabbit/JackrabbitMockSlingRepository.java | 105 +++++++++++++++++++++
.../mock/sling/jackrabbit/package-info.java | 2 +-
3 files changed, 107 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
index a484774..9256c01 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
@@ -18,10 +18,7 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit;
-import javax.jcr.RepositoryException;
-
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.testing.jcr.RepositoryProvider;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
@@ -37,12 +34,7 @@ public class JackrabbitMockResourceResolverAdapter implements ResourceResolverTy
@Override
public SlingRepository newSlingRepository() {
- try {
- return RepositoryProvider.instance().getRepository();
- }
- catch (RepositoryException ex) {
- throw new RuntimeException("Unable to get jackrabbit SlingRepository instance.", ex);
- }
+ return new JackrabbitMockSlingRepository();
}
}
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java
new file mode 100644
index 0000000..90ab384
--- /dev/null
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockSlingRepository.java
@@ -0,0 +1,105 @@
+/*
+ * 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.testing.mock.sling.jackrabbit;
+
+import javax.jcr.Credentials;
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Value;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.commons.testing.jcr.RepositoryProvider;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.osgi.service.component.ComponentContext;
+
+@Component
+@Service(SlingRepository.class)
+public final class JackrabbitMockSlingRepository implements SlingRepository {
+
+ private SlingRepository delegate;
+
+ @Activate
+ protected void activate(ComponentContext componentContext) {
+ try {
+ this.delegate = RepositoryProvider.instance().getRepository();
+ }
+ catch (RepositoryException ex) {
+ throw new RuntimeException("Unable to get jackrabbit SlingRepository instance.", ex);
+ }
+ }
+
+ public String getDefaultWorkspace() {
+ return delegate.getDefaultWorkspace();
+ }
+
+ @SuppressWarnings("deprecation")
+ public Session loginAdministrative(String workspace) throws LoginException, RepositoryException {
+ return delegate.loginAdministrative(workspace);
+ }
+
+ public Session loginService(String subServiceName, String workspace) throws LoginException, RepositoryException {
+ return delegate.loginService(subServiceName, workspace);
+ }
+
+ public String[] getDescriptorKeys() {
+ return delegate.getDescriptorKeys();
+ }
+
+ public boolean isStandardDescriptor(String key) {
+ return delegate.isStandardDescriptor(key);
+ }
+
+ public boolean isSingleValueDescriptor(String key) {
+ return delegate.isSingleValueDescriptor(key);
+ }
+
+ public Value getDescriptorValue(String key) {
+ return delegate.getDescriptorValue(key);
+ }
+
+ public Value[] getDescriptorValues(String key) {
+ return delegate.getDescriptorValues(key);
+ }
+
+ public String getDescriptor(String key) {
+ return delegate.getDescriptor(key);
+ }
+
+ public Session login(Credentials credentials, String workspaceName) throws LoginException,
+ NoSuchWorkspaceException, RepositoryException {
+ return delegate.login(credentials, workspaceName);
+ }
+
+ public Session login(Credentials credentials) throws LoginException, RepositoryException {
+ return delegate.login(credentials);
+ }
+
+ public Session login(String workspaceName) throws LoginException, NoSuchWorkspaceException, RepositoryException {
+ return delegate.login(workspaceName);
+ }
+
+ public Session login() throws LoginException, RepositoryException {
+ return delegate.login();
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/package-info.java
index e22b13e..88f7843 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/package-info.java
@@ -19,5 +19,5 @@
/**
* Sling Mock Jackrabbit-based Resource Resolver
*/
-@aQute.bnd.annotation.Version("0.1")
+@aQute.bnd.annotation.Version("1.0")
package org.apache.sling.testing.mock.sling.jackrabbit;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 20/28: SLING-5064
manual registration of node types no longer required
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit dd35625ebfe4300bb312ad32193fb08f6929ec87
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Sep 28 20:37:05 2015 +0000
SLING-5064 manual registration of node types no longer required
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1705764 13f79535-47bb-0310-9956-ffa450edef68
---
.../resource/JcrResourceResolverTest.java | 24 ----------------------
.../resource/SlingCrudResourceResolverTest.java | 24 ----------------------
2 files changed, 48 deletions(-)
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrResourceResolverTest.java
index eaf27cb..e6fbddc 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrResourceResolverTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractJcrResourceResolverTest;
@@ -36,20 +28,4 @@ public class JcrResourceResolverTest extends AbstractJcrResourceResolverTest {
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
-
- // register sling node types
- try {
- RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class));
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return resolver;
- }
-
}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
index ae9ae29..612a2c4 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractSlingCrudResourceResolverTest;
@@ -36,20 +28,4 @@ public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceReso
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
-
- // register sling node types
- try {
- RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class));
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return resolver;
- }
-
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 12/28: 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 annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 5fed2c566d03d172123bad94ce81257cb4ad50fd
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/testing/mocks/sling-mock-jackrabbit@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 1efd0ff..e45251a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,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-testing-sling-mock] 11/28: SLING-4827 -
Embed all needed classes in the sling-mock-jackrabbit jar
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 9b8967d933599ef07f82ff9ed48f698a0b520e29
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Jun 22 09:42:33 2015 +0000
SLING-4827 - Embed all needed classes in the sling-mock-jackrabbit jar
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1686820 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/pom.xml b/pom.xml
index f9f9335..1efd0ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,34 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <!--
+ embed all jackrabbit artifacts to prevent classpath clashes
+ also include selected Sling bundles which are required
+ at runtime. Note that we don't relocate the packages
+ since org.apache.sling.jcr.resource already embeds some
+ jackrabbit classes which lead to a non-working jar
+ -->
+ <artifactSet>
+ <includes>
+ <include>org.apache.jackrabbit:*</include>
+ <include>org.apache.sling:org.apache.sling.jcr.resource</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 19/28: SLING-5067
sling-mock: "uniqueRoot()" to simplify creation and cleanup of unique root
paths in repository
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 51ab4cff3a1423e7908fbb1bba624e23153d67a3
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Sep 27 09:46:11 2015 +0000
SLING-5067 sling-mock: "uniqueRoot()" to simplify creation and cleanup of unique root paths in repository
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1705520 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jackrabbit/resource/UniqueRootTest.java | 31 ++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/UniqueRootTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/UniqueRootTest.java
new file mode 100644
index 0000000..6517293
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/UniqueRootTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.testing.mock.sling.jackrabbit.resource;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.resource.AbstractUniqueRootTest;
+
+public class UniqueRootTest extends AbstractUniqueRootTest {
+
+ @Override
+ protected ResourceResolverType getResourceResolverType() {
+ return ResourceResolverType.JCR_JACKRABBIT;
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 16/28: SLING-5007 realx
unit test to test root path child listing in sling-mock-jackrabbit and
sling-mock-jackrabbit and sling-mock-oak because in real repositories
multiple root test nodes may be created in parallel, or nodes already exist
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 46e2c4291cb77be1b8da497c413f275d6014ae21
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Wed Sep 9 10:22:46 2015 +0000
SLING-5007 realx unit test to test root path child listing in sling-mock-jackrabbit and sling-mock-jackrabbit and sling-mock-oak because in real repositories multiple root test nodes may be created in parallel, or nodes already exist
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1701971 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
.../resource/SlingCrudResourceResolverTest.java | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d140943..edec1fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,14 +45,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
index 6a27396..400e2ec 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
@@ -18,17 +18,23 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
+import static org.junit.Assert.assertFalse;
+
import java.io.IOException;
+import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractSlingCrudResourceResolverTest;
+import com.google.common.collect.Lists;
+
public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceResolverTest {
@Override
@@ -52,4 +58,16 @@ public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceReso
return resolver;
}
+ @Override
+ public void testListChildren_RootNode() throws IOException {
+ Resource resource1 = resourceResolver.getResource("/");
+
+ // relax test conditions to check only for none-empty because in real repository multiple test notes may be created in parallel
+ List<Resource> children = Lists.newArrayList(resource1.listChildren());
+ assertFalse(children.isEmpty());
+
+ children = Lists.newArrayList(resource1.getChildren());
+ assertFalse(children.isEmpty());
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 25/28: 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 annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 99248581261c7448f070a64b3f068afed7336a41
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/testing/mocks/sling-mock-jackrabbit@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 39b44e3..5bb3687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,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-testing-sling-mock] 07/28: 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 annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 3d21fd3be6036004e1f54c4031fb2da020373d6f
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/testing/mocks/sling-mock-jackrabbit@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 81e58f8..b398de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.testing.sling-mock-jackrabbit</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 03/28: switch back to
released versions now available in maven central
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 030a7fd876f2507bc94ef1b67c75839e4d5c81dc
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Wed Jan 28 10:22:41 2015 +0000
switch back to released versions now available in maven central
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1655257 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a7f776..bc21019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 04/28: SLING-4362 make
sure JCR namespaces are correctly registered in JCR mock on initialization
through sling mock
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit b32978df826dcdf2054cdadf6028709776811134
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Feb 2 11:25:43 2015 +0000
SLING-4362 make sure JCR namespaces are correctly registered in JCR mock on initialization through sling mock
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1656442 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 +--
.../jackrabbit/resource/JcrNamespaceTest.java | 34 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc21019..4a7f776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
new file mode 100644
index 0000000..6cb8d22
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
@@ -0,0 +1,34 @@
+/*
+ * 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.testing.mock.sling.jackrabbit.resource;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.resource.AbstractJcrNamespaceTest;
+import org.junit.Ignore;
+
+//TEST IS DISABLED currently, it does not work with jackrabbit repository yet
+@Ignore
+public class JcrNamespaceTest extends AbstractJcrNamespaceTest {
+
+ @Override
+ protected ResourceResolverType getResourceResolverType() {
+ return ResourceResolverType.JCR_JACKRABBIT;
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 06/28: Add missing
licence header
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 38c84b4c66463e9020b413f08c985735bd9001c2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 27 13:44:07 2015 +0000
Add missing licence header
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1676263 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/resources/SLING-INF/nodetypes/app.cnd | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/test/resources/SLING-INF/nodetypes/app.cnd b/src/test/resources/SLING-INF/nodetypes/app.cnd
index e09d831..105d39f 100644
--- a/src/test/resources/SLING-INF/nodetypes/app.cnd
+++ b/src/test/resources/SLING-INF/nodetypes/app.cnd
@@ -1,3 +1,21 @@
+//
+// 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.
+//
<app='http://example.com/jcr/app/1.0'>
<dam='http://example.com/jcr/dam/1.0'>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 18/28: SLING-5064
sling-mock: Register JCR node types for OSGi bundles in class path
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit e5e5ef2db24e77a14e333159dee2f3d20143b0dc
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sat Sep 26 15:30:02 2015 +0000
SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1705475 13f79535-47bb-0310-9956-ffa450edef68
---
.../JackrabbitMockResourceResolverAdapter.java | 27 +++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
index 601a36c..90fa6ef 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
@@ -19,10 +19,12 @@
package org.apache.sling.testing.mock.sling.jackrabbit;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.testing.jcr.RepositoryProvider;
import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.testing.mock.sling.context.NodeTypeDefinitionScanner;
import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
/**
@@ -38,10 +40,33 @@ public class JackrabbitMockResourceResolverAdapter implements ResourceResolverTy
@Override
public SlingRepository newSlingRepository() {
try {
- return RepositoryProvider.instance().getRepository();
+ SlingRepository slingRepository = RepositoryProvider.instance().getRepository();
+ registerJcrNodeTypes(slingRepository);
+ return slingRepository;
} catch (RepositoryException ex) {
throw new RuntimeException("Unable to get jackrabbit SlingRepository instance.", ex);
}
}
+ /**
+ * Registers all JCR node types found in classpath.
+ * @param slingRepository Sling repository
+ */
+ @SuppressWarnings("deprecation")
+ private static void registerJcrNodeTypes(SlingRepository slingRepository) {
+ Session session = null;
+ try {
+ session = slingRepository.loginAdministrative(null);
+ NodeTypeDefinitionScanner.get().register(session);
+ }
+ catch (RepositoryException ex) {
+ throw new RuntimeException("Error registering JCR nodetypes: " + ex.getMessage(), ex);
+ }
+ finally {
+ if (session != null) {
+ session.logout();
+ }
+ }
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 17/28: SLING-5007 use
same unit tests for root node tests for all resource resolver types without
counting the number of children.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 5c9866ce10e20ed7f383da82a97e8e1509a562f7
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Wed Sep 16 09:35:50 2015 +0000
SLING-5007 use same unit tests for root node tests for all resource resolver types without counting the number of children.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1703373 13f79535-47bb-0310-9956-ffa450edef68
---
.../resource/SlingCrudResourceResolverTest.java | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
index 400e2ec..ae9ae29 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
@@ -18,23 +18,17 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
-import static org.junit.Assert.assertFalse;
-
import java.io.IOException;
-import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractSlingCrudResourceResolverTest;
-import com.google.common.collect.Lists;
-
public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceResolverTest {
@Override
@@ -57,17 +51,5 @@ public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceReso
return resolver;
}
-
- @Override
- public void testListChildren_RootNode() throws IOException {
- Resource resource1 = resourceResolver.getResource("/");
-
- // relax test conditions to check only for none-empty because in real repository multiple test notes may be created in parallel
- List<Resource> children = Lists.newArrayList(resource1.listChildren());
- assertFalse(children.isEmpty());
-
- children = Lists.newArrayList(resource1.getChildren());
- assertFalse(children.isEmpty());
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 14/28: switch to
released versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 5021a9693ae59eef1f5c61701b2508137d4c94d2
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Jun 29 08:08:35 2015 +0000
switch to released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1688101 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index f1c98cc..89c1c33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,14 +45,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-sling-mock] 21/28: SLING-5064
manual registration of node types no longer required;
register namespaces and node types centrally depending on NodeTypeMode
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-jackrabbit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 7cafb109c455c84983eec5ee3fed5690d193467b
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Sep 28 22:16:38 2015 +0000
SLING-5064 manual registration of node types no longer required; register namespaces and node types centrally depending on NodeTypeMode
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1705787 13f79535-47bb-0310-9956-ffa450edef68
---
.../JackrabbitMockResourceResolverAdapter.java | 30 ++------------------
.../contentimport/ContentLoaderBinaryTest.java | 24 ----------------
.../contentimport/ContentLoaderJsonDamTest.java | 27 ------------------
.../contentimport/ContentLoaderJsonTest.java | 27 ------------------
.../jackrabbit/resource/JcrNamespaceTest.java | 3 --
.../resource/MultipleResourceResolverTest.java | 32 ----------------------
src/test/resources/SLING-INF/nodetypes/app.cnd | 26 ------------------
7 files changed, 3 insertions(+), 166 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
index 90fa6ef..a484774 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java
@@ -19,12 +19,10 @@
package org.apache.sling.testing.mock.sling.jackrabbit;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.testing.jcr.RepositoryProvider;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.testing.mock.sling.context.NodeTypeDefinitionScanner;
import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
/**
@@ -40,33 +38,11 @@ public class JackrabbitMockResourceResolverAdapter implements ResourceResolverTy
@Override
public SlingRepository newSlingRepository() {
try {
- SlingRepository slingRepository = RepositoryProvider.instance().getRepository();
- registerJcrNodeTypes(slingRepository);
- return slingRepository;
- } catch (RepositoryException ex) {
+ return RepositoryProvider.instance().getRepository();
+ }
+ catch (RepositoryException ex) {
throw new RuntimeException("Unable to get jackrabbit SlingRepository instance.", ex);
}
}
- /**
- * Registers all JCR node types found in classpath.
- * @param slingRepository Sling repository
- */
- @SuppressWarnings("deprecation")
- private static void registerJcrNodeTypes(SlingRepository slingRepository) {
- Session session = null;
- try {
- session = slingRepository.loginAdministrative(null);
- NodeTypeDefinitionScanner.get().register(session);
- }
- catch (RepositoryException ex) {
- throw new RuntimeException("Error registering JCR nodetypes: " + ex.getMessage(), ex);
- }
- finally {
- if (session != null) {
- session.logout();
- }
- }
- }
-
}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java
index 854209d..8ab9cfc 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.contentimport;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderBinaryTest;
@@ -36,20 +28,4 @@ public class ContentLoaderBinaryTest extends AbstractContentLoaderBinaryTest {
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
-
- // register sling node types
- try {
- RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class));
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return resolver;
- }
-
}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java
index 25053c6..41fb418 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.contentimport;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonDamTest;
@@ -36,23 +28,4 @@ public class ContentLoaderJsonDamTest extends AbstractContentLoaderJsonDamTest {
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
-
- // register sling and app node types
- try {
- Session session = resolver.adaptTo(Session.class);
- RepositoryUtil.registerSlingNodeTypes(session);
- RepositoryUtil.registerNodeType(session,
- ContentLoaderJsonTest.class.getResourceAsStream("/SLING-INF/nodetypes/app.cnd"));
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return resolver;
- }
-
}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java
index cb89afb..5a19702 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.contentimport;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonTest;
@@ -36,23 +28,4 @@ public class ContentLoaderJsonTest extends AbstractContentLoaderJsonTest {
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
-
- // register sling and app node types
- try {
- Session session = resolver.adaptTo(Session.class);
- RepositoryUtil.registerSlingNodeTypes(session);
- RepositoryUtil.registerNodeType(session,
- ContentLoaderJsonTest.class.getResourceAsStream("/SLING-INF/nodetypes/app.cnd"));
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return resolver;
- }
-
}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
index 6cb8d22..84922ae 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
@@ -20,10 +20,7 @@ package org.apache.sling.testing.mock.sling.jackrabbit.resource;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractJcrNamespaceTest;
-import org.junit.Ignore;
-//TEST IS DISABLED currently, it does not work with jackrabbit repository yet
-@Ignore
public class JcrNamespaceTest extends AbstractJcrNamespaceTest {
@Override
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java
index 82eeaae..3709039 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java
@@ -18,22 +18,9 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
-import java.io.IOException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.api.resource.LoginException;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractMultipleResourceResolverTest;
-import org.junit.Ignore;
-//TEST IS DISABLED currently, it does not work with jackrabbit repository yet
-@Ignore
public class MultipleResourceResolverTest extends AbstractMultipleResourceResolverTest {
@Override
@@ -41,23 +28,4 @@ public class MultipleResourceResolverTest extends AbstractMultipleResourceResolv
return ResourceResolverType.JCR_JACKRABBIT;
}
- @Override
- protected ResourceResolverFactory newResourceResolerFactory() {
- ResourceResolverFactory factory = MockSling.newResourceResolverFactory(getResourceResolverType());
-
- // register sling node types
- try {
- ResourceResolver resolver = factory.getResourceResolver(null);
- RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class));
- } catch (LoginException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (IOException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- } catch (RepositoryException ex) {
- throw new RuntimeException("Unable to register sling node types.", ex);
- }
-
- return factory;
- }
-
}
diff --git a/src/test/resources/SLING-INF/nodetypes/app.cnd b/src/test/resources/SLING-INF/nodetypes/app.cnd
deleted file mode 100644
index 105d39f..0000000
--- a/src/test/resources/SLING-INF/nodetypes/app.cnd
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-<app='http://example.com/jcr/app/1.0'>
-<dam='http://example.com/jcr/dam/1.0'>
-
-[app:Page] > nt:unstructured
-[app:PageContent] > nt:unstructured
-
-[dam:Asset] > nt:unstructured
-[dam:AssetContent] > nt:unstructured
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.