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:24:50 UTC
[sling-org-apache-sling-testing-sling-mock] annotated tag
org.apache.sling.testing.sling-mock-1.9.2 created (now a46b3be)
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.
at a46b3be (tag)
tagging 03eaf879b4bb1d1ac17abc5efec9bc92441c7837 (commit)
by Stefan Seifert
on Tue Dec 13 12:23:05 2016 +0000
- Log -----------------------------------------------------------------
org.apache.sling.testing.sling-mock-1.9.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 2aa4712 SLING-4042 Donate sling-mock, jcr-mock, osgi-mock implementation
new d63d89c svn:ignore
new a6e7c1a SLING-4042 move all mock projects to mocks/ subdirectory
new d1f839a SLING-4042 add missing package-info files
new e9e968a SLING-4042 per default no charencoding should be set in mock response
new 43eb350 SLING-4042 do not forget to register ResourceResolverFactory in OSGi context as well
new 3d36daf SLING-4042 make sure JCR mock supports accessing data using multiple sessions
new 4fc4baf SLING-4042 add README files
new 4aa90b9 add/update SCM urls
new 22c8024 update to released versions
new 1ba5459 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.0.0
new 5dcb3d7 [maven-release-plugin] prepare for next development iteration
new 5b0b3fe update dependencies in release process to next snapshot version
new 1f52235 SLING-4085 NPE when using SlingContext rule without constructor argument
new 9442dd8 SLING-4086 SlingHttpServlerRequest should support getResourceBundle() methods
new 2f5faf4 set to released version now available on maven central
new 6964d49 SLING-4090 Define package versions for Sling Mock, JCR Mock, OSGi Mock
new 448fe45 SLING-4108 JCR/Sling/ResourceResolver Mock: Support providing authentication info
new 5b4c01c fix some javadoc errors and warnings
new cb5f237 SLING-4162 Introduce "OsgiContext" junit rule for OSGi and OsgiContextImpl
new e72ad4b SLING-4229 add test cases for deep path access support in sling-mock as well
new a07abf8 SLING-4108 default to getAdministrativeResourceResolver in sling-mock to support jackrabbit resource resolver adapter as well
new 3cbedc6 fix some javadoc errors/warnings
new 47cc45e update to released versions
new fccd947 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.1.0
new 4b72ed2 [maven-release-plugin] prepare for next development iteration
new 85cdaa4 update to next snapshot version until releases available in maven central
new 2de8a96 SLING-4266 - SlingContext always uses the default resourceResolverType
new 0a167f6 SLING-4268 - ContentLoader should not try to import ACLs
new 9ee66c6 SLING-4269 - SlingContextImpl's resource resolver should be an administrative one
new 6f6321b switch back to released versions for dependencies
new a969262 SLING-4267 add some more property names to be ignored on import because they are managed by JCR internally
new 62e7e2a SLING-4267 support importing nt:resource noded in jackrabbit with empty binary data enable content loader unit tests in sling-mock-jackrabbit
new 6569ce2 assertions can be activated now after updating to latest mock dependencies
new b816e47 SLING-4267 support importing nt:resource nodes in jackrabbit with empty binary data
new 32c3978 update dependencies to released versions
new c05aeae [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.1.2
new e57b7e1 [maven-release-plugin] prepare for next development iteration
new d9fcb59 update to next development snapshot unit released artifacts are in maven central
new c0e8f71 switch back to released versions now available in maven central
new e8d2807 SLING-4362 make sure JCR namespaces are correctly registered in JCR mock on initialization through sling mock
new 90ddb94 SLING-4376 ResourceResolver.resolve(null) should resolve to root resource
new c49b0e1 SLING-4394 Sling Mock with JCR-based Resource Resolver: Support default search paths
new 5e1c2d6 SLING-848 Support getting versioned resources by using uri path parameters
new 4e72c06 Use the recent resourceresolver SNAPSHOT in sling-mock
new eb9da99 SLING-848 revert updating sling api/resource resolver/jcr resource dependenciens - using sling mock in a project should not enforce using the latest version of those keep adding of getThreadResourceResolver() method, but throw UnsupportedOperationException
new 2259bfe SLING-4431 Sling Mocks: Remove Dependency on ResourceResolverInjector
new 74de88f cosmetic code formatting changes
new 9e35c02 SLING-4434 refactor integration with sling models: remove MockModelAdapterFactory and directly integrate the original ModelAdapterFactory using the new osgi mock dynamic service reference feature
new 71bbb5c SLING-4437 MockJcrResourceResolverFactory should allow to register services dynamically
new fc5346f SLING-4433 use real AdapterManagerImpl implementation with support for ADAPTER_CLASSES/ADAPTABLE_CLASSES
new a4d3ac9 SLING-4433 remove dependency to org.apache.sling.adapter and inline helper classes instead
new 58f81ee update to release versions
new ac35a62 update package version
new 29e7fda [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.2.0
new f96f34a [maven-release-plugin] prepare for next development iteration
new 93110e5 remove service description and vendor for this mock service - makes problems with baseline check
new f187b33 remove service description and vendor for this mock service - makes problems with baseline check
new 1b68139 update to next development snapshot unit released artifacts are in maven central
new 53be964 switch to released versions
new 34954fa SLING-4522 Sling Mocks: ContentLoader fails for UTF8 encoded json files on Windows Systems
new 75d379a Fix scr xml parsing when updating to new scr plugin by using fix for SLING-4670
new b0f4a0a SLING-4698 - Set parent.relativePath to empty for all modules
new 28f1b00 SLING-4654 Support ResourceResolver.findResources with JCR_MOCK
new 6728203 SLING-4721 sling-mock: Fully support ResourceResolverFactoryActivator for jcr-mock
new 8a9b3c4 SLING-4729 Sling Mock: Add "NONE" resource resolver type
new 5d2ffa2 SLING-4470 introduce separate "logging-mock" project for default log configuration in mock tests, remove compile-dependency on slf4j-simple
new 192936d update dependencies for release
new ab204bb update dependencies for release
new 5482f51 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.3.0
new 7baf341 [maven-release-plugin] prepare for next development iteration
new 9a0fa2b update to next development snapshot unit released artifacts are in maven central
new bb58061 SLING-4605 - Add support for an Oak resource resolver type mock
new 3601bfd Mocks: use latest snapshots
new b6207fb SLING-4605 - Add support for an Oak resource resolver type mock
new bac4c7f update to released mock versions
new 37c868a SLING-4756 add support for filtering via felix.framework FilterImpl implementation
new 546986a SLING-4605 javadoc updates and add initializing for ContextResourceResolverFactory
new 6e3e339 Minor wording fixes when the ResourceResolverTypeAdapter can't be found.
new f4c6d5d SLING-4775 - MockSlingSettingService shoud support getSlingId()
new 7a57b01 SLING-4775 move the now supported method out of the "unsupported operations" block
new e0cc675 SLING-4773 ensure sling namespace is always registered when using JCR_MOCK resource resolver adapter
new d39a8a6 update to released versions
new 54d3fe0 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.4.0
new 8913f6c [maven-release-plugin] prepare for next development iteration
new 37fa126 update to latest development snapshots
new df31839 Update to Sling Parent 23
new e497760 Testing: remove superflous sling.java.version=6 as it's the default now
new d8691fa switch to released versions
new a3f2ae9 set parent version to 24 and add empty relativePath where missing
new 05758ef SLING-4932, make compatible with o.a.s.jcr.resource 2.5 (requires also an upgrade to Sling API 2.9)
new 169f6e0 SLING-4932 switch back to old api/jcr.resource versions and ensure compatibility by initiating PathMapper service by reflection if it exists
new 9ab5f09 SLING-4938 exclude optional transitive dependencies of reflections
new 347ce2a SLING-4990 Support HttpSession invalidate, new, lastAccessedTime, maxInteractiveInterval
new 602f4a9 SLING-4993 Support RequestParameter in MockSlingHttpServlerRequest
new ec0efee SLING-4994 Support InputStream, ContentLenght, ContentType and CharacterEncoding in Request
new 489ae34 SLING-4998 ResponseBodySupport - use default charset if no response charset is set
new 9832809 cosmetic: beautify error messages when setup/teardown fails
new da53509 SLING-5002 - [sling-mock] Update dependency version of org.reflections
new 3fafd8e SLING-5003 Support request dispatcher in MockSlingHttpServletRequest
new b4037bf SLING-5002 switch back to 0.9.9 due to threading issues in 0.9.10 when running junit tests in parallel
new e52575e update other mocks to latest releases
new 2a934a4 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.5.0
new 8f19c45 [maven-release-plugin] prepare for next development iteration
new d58abbe switch to latest snapshot version until release is available in maven central
new 07c6650 SLING-5007 add unit test to explicitly test root path child listing in sling-mock as well
new d5ebb42 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 8580a55 update release versions
new 5846795 update to next snapshot version until releases are available in maven central
new f960880 SLING-5007 use same unit tests for root node tests for all resource resolver types without counting the number of children.
new 0ac864b switch back to released version
new add520f SLING-5042 ResourceResolver.commit() does not call session.save() on the backing JCR Session
new 8123868 SLING-5043 sling-mocks: Execute commit() after ContentLoader operations
new c1ce2e6 SLING-5057 - Support HttpServletRequest#getRemoteUser
new b10d3bb SLING-5057 - Support HttpServletRequest#getRemoteUser
new 53bfbe5 SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
new 853e02b SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
new c7551b3 cosmetic: fix log message
new 317bf58 SLING-5066 sling-mock: Close ResourceResolver on JUnit test tearDown
new f008644 SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
new 8c79b81 SLING-5067 sling-mock: "uniqueRoot()" to simplify creation and cleanup of unique root paths in repository
new b24a116 SLING-5067 rewrite unit tests to use new "uniqueRoot" feature
new 3c296a7 SLING-5064 manual registration of node types no longer required; register namespaces and node types centrally depending on NodeTypeMode
new d795bcc SLING-5067 fix cleanup issue with "uniqueRoot" feature
new d74181d SLING-5086 sling-mock: Add SlingContext.registerAdapter convenience method
new fd0b260 SLING-5086 sling-mock: Add SlingContext.registerAdapter convenience method
new cf03565 cosmetic: eliminate some javadoc warnings
new 5c7c77d SLING-5088 update to latest osgi-mock to make sure all services are deactivated properly
new 856784c SLING-5088 refactor unit test to make sure resource resolver and bundle contexts are properly shutdown
new b90bd44 SLING-5088 refactor resource resolver initialization
new 81f87d0 SLING-5088 rewrite setup code for resource resolver factory
new 1b9e8db SLING-5088 deprecate all methods that may lead to thread leaks
new 8801d99 SLING-5088 control SlingRepository resources via activate/deactivate methods; make sure all oak ExecutorServices are shutdown properly
new c1525db cosmetic: fix javadoc errors
new 47f0035 SLING-5088 avoid registering ResourceResolverFactory twice
new 21a5c64 SLING-5088 register default service user mapping for mock bundle
new 2b7ac22 Update the main reactor to parent 25
new 1089980 update dependency
new 8949c00 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.6.0
new 90239a1 [maven-release-plugin] prepare for next development iteration
new 9f9253b set dependencies to next snapshot version until released versions are available in maven central
new 7ac242f switch back to released versions of dependency
new 1f318cf SLING-5197 sling-mock: Do not override ResourceResolverFactoryActivator's default values
new f7609c8 SLING-5197 sling-mock: Do not override ResourceResolverFactoryActivator's default values
new d444456 update to latest osgi-mock version
new dd7948a SLING-5339 sling-mock: Support remote add, remote host and remote port in MockSlingHttpSevletRequest
new a52790b SLING-5392 sling-mock: Use javax.servlet-api dependency instead of mortbay version
new 3234a24 Switch to parent pom 26
new dfd873c SLING-5428 Move MockSlingHttpServletRequest+Response to org.apache.sling.servlet-helpers
new e7cd297 update mock dependencies to latest versions
new 0186990 fix javadoc errors
new 64a8b38 [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.6.2
new a56450f [maven-release-plugin] prepare for next development iteration
new 37d2b26 update to next snapshot dependency until released artifacts are available in maven central
new e39da4c update to released versions
new 7335608 1.x maintenance branch
new 0ac29f6 update branch url
new 780dae1 SLING-5551 MockSlingHttpServletRequest: make sure given bundleContext is used
new 1d3a77f SLING-5552 ModelAdapterFactoryUtil: Suppress info log messages from Reflections library
new 16788a7 SLING-5770 add support for custom resource resolver factory activator configuration via SlingContextBuilder add support for additional callbacks before setup and after teardown
new 9c111ba SLING-5770 update javadoc
new 117debd update dependencies to released versions
new 124d98e [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.7.0
new a58defe [maven-release-plugin] prepare for next development iteration
new 0aaa86f SLING-5968 sling-mock: Update to latest servlet-helpers
new 10aa538 SLING-6040 add ResourceBuilder support to SlingContext This closes #167
new ceb4f5e SLING-6049 sling-mock ContentBuilder: Support creating resources with object vararg parameter
new 387c8ad SLING-6049 use MapUtil from osgi-mock
new 1f8f4b4 update dependencies
new dfc0de6 revert: SLING-5968 sling-mock: Update to latest servlet-helpers update creates problesm with javadoc generated - and is not really required, users can choose dependency themselves
new f4f63ae [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.8.0
new fea50a3 [maven-release-plugin] prepare for next development iteration
new a59a81f update to latest jcr-mock
new 641e366 update dependencies to latest snapshots until released versions are available in maven central
new a22c110 switch back to released versions
new fc94229 SLING-6077 enhance unit test to ensure the problem from this bug ticket does not exist in sling-mock 1.x
new 7ed1e91 update to latest resourcebuilder snapshot
new 502088e SLING-6358 osgi-mock: OsgiContext.getServices should return correctly typed array when empty
new 9125ce1 SLING-6359 osgi-mock, sling-mock: Make ContextCallback and ContextBuilder more flexible
new 6e46477 SLING-6359 context plugin support
new 3423b62 SLING-6359 context plugin support
new 0efe53a SLING-6363 Automatically register Sling Models from Classpath also: - add SlingContext.addModelsForClasses method - fix bug in addModelsForPackages that registered "sibling" packages with same prefix as well - make sure classpath scanning takes place only once for alle unit tests, not for each unit test which requests the same package - witch NodeTypeDefinitionScanner to osgi-mock ManifestScanner as well
new 37ef0fe SLING-6363 add methods for OSGi R5/R6 support
new 984c0de update to release version
new db06b23 update osgi-mock dependency
new 328bd46 fix javadoc errors
new 6781b1e [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.9.0
new beaf105 [maven-release-plugin] prepare for next development iteration
new cf16a1c update to next snapshot version until releases are available on maven central
new b04e7ff cosmetic: fix javadoc typos
new 06a073b update to osgi-mock,sling-mock release versions
new bb0aa98 update to latest jcr-mock snapshot
new 86dbe21 SLING-6387 Allow to control autocommit mode for ContentLoader (patch provided by Dirk Rudolph, with modifications)
new 5281ef4 update to release version
new 972e86a [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.9.2
new 03eaf87 [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-1.9.2
The 196 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] 04/09: update to
osgi-mock, sling-mock release 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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 06a073bbb378d55b30ec163975ed739257bbb839
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Dec 8 21:29:19 2016 +0000
update to osgi-mock,sling-mock release versions
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1773299 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c1f487..8be9e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.0</version>
<scope>compile</scope>
</dependency>
<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] 01/09:
[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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit beaf105ed4cbab2767671435dd41f4db4ee04ba0
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Dec 5 17:41:56 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1772727 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e94df3a..8be9e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.9.0</version>
+ <version>1.9.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing Sling Mock</name>
<description>Mock implementation of selected Sling APIs.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.9.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x</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] 07/09: update to
release version
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 5281ef441e44bea7d64feb4f781338ba258bcc9c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 13 12:22:25 2016 +0000
update to release version
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1773987 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2972652..0c7800f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.9.0</version>
+ <version>1.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>compile</scope>
</dependency>
<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] 09/09:
[maven-release-plugin] copy for tag
org.apache.sling.testing.sling-mock-1.9.2
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 03eaf879b4bb1d1ac17abc5efec9bc92441c7837
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 13 12:23:05 2016 +0000
[maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-1.9.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.2@1773989 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] 02/09: update to next
snapshot version until releases are available on 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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit cf16a1c5dfe0502458f8535611b10b8916e432a0
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Dec 5 17:44:06 2016 +0000
update to next snapshot version until releases are available on maven central
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1772728 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8be9e71..6c1f487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.9.0</version>
+ <version>1.9.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<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] 08/09:
[maven-release-plugin] prepare release
org.apache.sling.testing.sling-mock-1.9.2
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 972e86a2ab8360be5e7ae76e5e867eefc499babb
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 13 12:22:53 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.9.2
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1773988 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c7800f..768ea82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing Sling Mock</name>
<description>Mock implementation of selected Sling APIs.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.9.2</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] 06/09: SLING-6387 Allow
to control autocommit mode for ContentLoader (patch provided by Dirk
Rudolph, with modifications)
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 86dbe2173cc5f5030d6f482b77b78ce1f6ea089c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Dec 11 13:12:06 2016 +0000
SLING-6387 Allow to control autocommit mode for ContentLoader (patch provided by Dirk Rudolph, with modifications)
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1773570 13f79535-47bb-0310-9956-ffa450edef68
---
.../mock/sling/context/SlingContextImpl.java | 24 +-
.../testing/mock/sling/context/package-info.java | 2 +-
.../testing/mock/sling/junit/package-info.java | 2 +-
.../testing/mock/sling/loader/ContentLoader.java | 25 ++-
.../testing/mock/sling/loader/package-info.java | 2 +-
.../loader/ContentLoaderAutoCommitTest.java} | 16 +-
.../AbstractContentLoaderAutoCommitTest.java | 242 +++++++++++++++++++++
.../loader/ContentLoaderAutoCommitTest.java} | 17 +-
8 files changed, 310 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
index 361e3e4..00a0e1b 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
@@ -94,6 +94,7 @@ public class SlingContextImpl extends OsgiContextImpl {
protected MockSlingHttpServletResponse response;
protected SlingScriptHelper slingScriptHelper;
protected ContentLoader contentLoader;
+ protected ContentLoader contentLoaderAutoCommit;
protected ContentBuilder contentBuilder;
protected ResourceBuilder resourceBuilder;
protected UniqueRoot uniqueRoot;
@@ -215,6 +216,7 @@ public class SlingContextImpl extends OsgiContextImpl {
this.response = null;
this.slingScriptHelper = null;
this.contentLoader = null;
+ this.contentLoaderAutoCommit = null;
this.contentBuilder = null;
this.resourceBuilder = null;
this.uniqueRoot = null;
@@ -292,10 +294,26 @@ public class SlingContextImpl extends OsgiContextImpl {
* @return Content loader
*/
public ContentLoader load() {
- if (this.contentLoader == null) {
- this.contentLoader = new ContentLoader(resourceResolver(), bundleContext());
+ return load(true);
+ }
+
+ /**
+ * @param autoCommit Automatically commit changes after loading content (default: true)
+ * @return Content loader
+ */
+ public ContentLoader load(boolean autoCommit) {
+ if (autoCommit) {
+ if (this.contentLoaderAutoCommit == null) {
+ this.contentLoaderAutoCommit = new ContentLoader(resourceResolver(), bundleContext(), true);
+ }
+ return this.contentLoaderAutoCommit;
+ }
+ else {
+ if (this.contentLoader == null) {
+ this.contentLoader = new ContentLoader(resourceResolver(), bundleContext(), false);
+ }
+ return this.contentLoader;
}
- return this.contentLoader;
}
/**
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
index e7f08ad..cf0963d 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
@@ -19,5 +19,5 @@
/**
* Sling context implementation for unit tests.
*/
-@aQute.bnd.annotation.Version("3.4")
+@aQute.bnd.annotation.Version("3.5")
package org.apache.sling.testing.mock.sling.context;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java
index f8109b3..dd040c1 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java
@@ -19,5 +19,5 @@
/**
* Rule for providing easy access to Sling context in JUnit tests.
*/
-@aQute.bnd.annotation.Version("4.0")
+@aQute.bnd.annotation.Version("4.1")
package org.apache.sling.testing.mock.sling.junit;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
index 7729618..63fbadb 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
@@ -52,7 +52,7 @@ import com.google.common.collect.ImmutableSet;
/**
* Imports JSON data and binary data into Sling resource hierarchy.
- * After all import operations from json or binaries {@link ResourceResolver#commit()} is called.
+ * After all import operations from json or binaries {@link ResourceResolver#commit()} is called (when autocommit mode is active).
*/
public final class ContentLoader {
@@ -77,6 +77,7 @@ public final class ContentLoader {
private final ResourceResolver resourceResolver;
private final BundleContext bundleContext;
private final DateFormat calendarFormat;
+ private final boolean autoCommit;
/**
* @param resourceResolver Resource resolver
@@ -90,9 +91,19 @@ public final class ContentLoader {
* @param bundleContext Bundle context
*/
public ContentLoader(ResourceResolver resourceResolver, BundleContext bundleContext) {
+ this (resourceResolver, bundleContext, true);
+ }
+
+ /**
+ * @param resourceResolver Resource resolver
+ * @param bundleContext Bundle context
+ * @param autoCommit Automatically commit changes after loading content (default: true)
+ */
+ public ContentLoader(ResourceResolver resourceResolver, BundleContext bundleContext, boolean autoCommit) {
this.resourceResolver = resourceResolver;
this.bundleContext = bundleContext;
this.calendarFormat = new SimpleDateFormat(JsonItemWriter.ECMA_DATE_FORMAT, JsonItemWriter.DATE_FORMAT_LOCALE);
+ this.autoCommit = autoCommit;
}
/**
@@ -175,7 +186,9 @@ public final class ContentLoader {
String jsonString = convertToJsonString(inputStream).trim();
JSONObject json = new JSONObject(jsonString);
Resource resource = this.createResource(parentResource, childName, json);
- resourceResolver.commit();
+ if (autoCommit) {
+ resourceResolver.commit();
+ }
return resource;
} catch (JSONException ex) {
throw new RuntimeException(ex);
@@ -470,7 +483,9 @@ public final class ContentLoader {
resourceResolver.create(file, JcrConstants.JCR_CONTENT,
ImmutableMap.<String, Object> builder().put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_RESOURCE)
.put(JcrConstants.JCR_DATA, inputStream).put(JcrConstants.JCR_MIMETYPE, mimeType).build());
- resourceResolver.commit();
+ if (autoCommit) {
+ resourceResolver.commit();
+ }
return file;
} catch (PersistenceException ex) {
throw new RuntimeException("Unable to create resource at " + parentResource.getPath() + "/" + name, ex);
@@ -586,7 +601,9 @@ public final class ContentLoader {
Resource resource = resourceResolver.create(parentResource, name,
ImmutableMap.<String, Object> builder().put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_RESOURCE)
.put(JcrConstants.JCR_DATA, inputStream).put(JcrConstants.JCR_MIMETYPE, mimeType).build());
- resourceResolver.commit();
+ if (autoCommit) {
+ resourceResolver.commit();
+ }
return resource;
} catch (PersistenceException ex) {
throw new RuntimeException("Unable to create resource at " + parentResource.getPath() + "/" + name, ex);
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
index 464320c..0851487 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
@@ -19,5 +19,5 @@
/**
* Helpers for importing test content into the mocked repositories / resource hierarchies.
*/
-@aQute.bnd.annotation.Version("1.0")
+@aQute.bnd.annotation.Version("1.1")
package org.apache.sling.testing.mock.sling.loader;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java b/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java
similarity index 65%
copy from src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
copy to src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java
index 464320c..bd76ee5 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java
@@ -16,8 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Helpers for importing test content into the mocked repositories / resource hierarchies.
- */
-@aQute.bnd.annotation.Version("1.0")
-package org.apache.sling.testing.mock.sling.loader;
+package org.apache.sling.testing.mock.sling.jcrmock.loader;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderAutoCommitTest;
+
+public class ContentLoaderAutoCommitTest extends AbstractContentLoaderAutoCommitTest {
+
+ @Override protected ResourceResolverType getResourceResolverType() {
+ return ResourceResolverType.JCR_MOCK;
+ }
+}
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
new file mode 100644
index 0000000..b0df5fd
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
@@ -0,0 +1,242 @@
+/*
+ * 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.loader;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+public abstract class AbstractContentLoaderAutoCommitTest {
+
+ private static String DEST_RES_NAME = "dest";
+ private static String MIME_TYPE_JSON = "application/json";
+ private static String CLP_CONTENT = "/json-import-samples/content.json";
+ private static byte[] MEM_CONTENT = ("{"
+ + "\"jcr:primaryType\":\"sling:Folder\""
+ + "}").getBytes();
+
+ private int destResCount = 1;
+
+ @Rule
+ public SlingContext context = new SlingContext(getResourceResolverType());
+
+ protected abstract ResourceResolverType getResourceResolverType();
+
+ @Test
+ public void testJsonAutocommitExplicitly() {
+ doTestJsonAutocommitExplicitly(false, new HasChangesAssertion());
+ doTestJsonAutocommitExplicitly(true, new NoChangesAssertion());
+ }
+
+ private void doTestJsonAutocommitExplicitly(final boolean commit, final Runnable assertion) {
+ final ContentLoader loader = context.load(commit);
+
+ final Resource a1 = context.create().resource(nextDestResource());
+ loader.json(CLP_CONTENT, a1, "child");
+ assertion.run();
+
+ loader.json(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource a3 = context.create().resource(nextDestResource());
+ loader.json(data, a3, "child");
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.json(data2, nextDestResource());
+ assertion.run();
+ }
+
+ @Test
+ public void testJsonAutocommitImplicitly() {
+ final ContentLoader loader = context.load();
+ final Runnable assertion = new NoChangesAssertion();
+
+ final Resource r = context.create().resource(nextDestResource());
+ loader.json(CLP_CONTENT, r, "child");
+ assertion.run();
+
+ loader.json(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r2 = context.create().resource(nextDestResource());
+ loader.json(data, r2, "child");
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.json(data2, nextDestResource());
+ assertion.run();
+ }
+
+ @Test
+ public void testBinaryFileAutocommitExplicitly() {
+ doTestBinaryFileAutocommitExplicitly(false, new HasChangesAssertion());
+ doTestBinaryFileAutocommitExplicitly(true, new NoChangesAssertion());
+ }
+
+ private void doTestBinaryFileAutocommitExplicitly(final boolean commit, final Runnable assertion) {
+ final ContentLoader loader = context.load(commit);
+
+ loader.binaryFile(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ loader.binaryFile(CLP_CONTENT, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryFile(data, nextDestResource());
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryFile(data2, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data3 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r = context.create().resource(nextDestResource());
+ loader.binaryFile(data3, r, "child");
+ assertion.run();
+
+ final InputStream data4 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r2 = context.create().resource(nextDestResource());
+ loader.binaryFile(data4, r2, "child", MIME_TYPE_JSON);
+ assertion.run();
+ }
+
+ @Test
+ public void testBinaryFileAutocommitImplicitly() {
+ final ContentLoader loader = context.load();
+ final Runnable assertion = new NoChangesAssertion();
+
+ loader.binaryFile(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ loader.binaryFile(CLP_CONTENT, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryFile(data, nextDestResource());
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryFile(data2, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data3 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r = context.create().resource(nextDestResource());
+ loader.binaryFile(data3, r, "child");
+ assertion.run();
+
+ final InputStream data4 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r2 = context.create().resource(nextDestResource());
+ loader.binaryFile(data4, r2, "child", MIME_TYPE_JSON);
+ assertion.run();
+ }
+
+ @Test
+ public void testBinaryResourceAutocommitExplicitly() {
+ doTestBinaryResourceAutocommitExplicitly(false, new HasChangesAssertion());
+ doTestBinaryResourceAutocommitExplicitly(true, new NoChangesAssertion());
+ }
+
+ private void doTestBinaryResourceAutocommitExplicitly(final boolean commit, final Runnable assertion) {
+ final ContentLoader loader = context.load(commit);
+
+ loader.binaryResource(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ loader.binaryResource(CLP_CONTENT, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryResource(data, nextDestResource());
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryResource(data2, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data3 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r = context.create().resource(nextDestResource());
+ loader.binaryResource(data3, r, "child");
+ assertion.run();
+
+ final InputStream data4 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r2 = context.create().resource(nextDestResource());
+ loader.binaryResource(data4, r2, "child", MIME_TYPE_JSON);
+ assertion.run();
+ }
+
+ @Test
+ public void testBinaryResourceAutocommitImplicitly() {
+ final ContentLoader loader = context.load();
+ final Runnable assertion = new NoChangesAssertion();
+
+ loader.binaryResource(CLP_CONTENT, nextDestResource());
+ assertion.run();
+
+ loader.binaryResource(CLP_CONTENT, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryResource(data, nextDestResource());
+ assertion.run();
+
+ final InputStream data2 = new ByteArrayInputStream(MEM_CONTENT);
+ loader.binaryResource(data2, nextDestResource(), MIME_TYPE_JSON);
+ assertion.run();
+
+ final InputStream data3 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r = context.create().resource(nextDestResource());
+ loader.binaryResource(data3, r, "child");
+ assertion.run();
+
+ final InputStream data4 = new ByteArrayInputStream(MEM_CONTENT);
+ final Resource r2 = context.create().resource(nextDestResource());
+ loader.binaryResource(data4, r2, "child", MIME_TYPE_JSON);
+ assertion.run();
+ }
+
+ private synchronized String nextDestResource() {
+ return '/' + DEST_RES_NAME + destResCount++;
+ }
+
+ private class HasChangesAssertion implements Runnable {
+ @Override
+ public void run() {
+ assertTrue(context.resourceResolver().hasChanges());
+ }
+ }
+
+ private class NoChangesAssertion implements Runnable {
+ @Override
+ public void run() {
+ assertFalse(context.resourceResolver().hasChanges());
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java b/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java
similarity index 64%
copy from src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
copy to src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java
index 464320c..21a48d6 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java
@@ -16,8 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Helpers for importing test content into the mocked repositories / resource hierarchies.
- */
-@aQute.bnd.annotation.Version("1.0")
-package org.apache.sling.testing.mock.sling.loader;
+package org.apache.sling.testing.mock.sling.rrmock.loader;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderAutoCommitTest;
+
+public class ContentLoaderAutoCommitTest extends AbstractContentLoaderAutoCommitTest {
+
+ @Override
+ protected ResourceResolverType getResourceResolverType() {
+ return ResourceResolverType.RESOURCERESOLVER_MOCK;
+ }
+}
--
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/09: update to latest
jcr-mock snapshot
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit bb0aa98e2f942ffaedfc639e4b10414f43409932
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Dec 11 12:34:20 2016 +0000
update to latest jcr-mock snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1773568 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8be9e71..2972652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
- <version>1.1.16</version>
+ <version>1.1.17-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<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] 03/09: cosmetic: fix
javadoc typos
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-1.9.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit b04e7ff09f667f9eaf5633ed0016319fdb9e5c18
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 6 08:38:14 2016 +0000
cosmetic: fix javadoc typos
git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1772841 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java b/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
index 5bfcaa8..b47399c 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
@@ -48,7 +48,7 @@ import org.osgi.framework.Version;
import org.reflections.Reflections;
/**
- * Helper methos for simulating sling models bundle events.
+ * Helper methods for registering Sling Models from the classpath.
*/
final class ModelAdapterFactoryUtil {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.