Author: sseifert
Date: Thu Jan 15 20:27:35 2015
New Revision: 1652263
URL: http://svn.apache.org/r1652263
Log:
SLING-4315 fix some typos
Modified:
sling/site/trunk/content/documentation/development/osgi-mock.mdtext
sling/site/trunk/content/documentation/development/resourceresolver-mock.mdtext
sling/site/trunk/content/documentation/development/sling-mock.mdtext
Modified: sling/site/trunk/content/documentation/development/osgi-mock.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/osgi-mock.mdtext?rev=1652263&r1=1652262&r2=1652263&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/osgi-mock.mdtext
(original)
+++ sling/site/trunk/content/documentation/development/osgi-mock.mdtext Thu Jan
15 20:27:35 2015
@@ -25,7 +25,7 @@ The mock implementation supports:
* Supports reading OSGi SCR metadata from `/OSGI-INF/<pid>.xml`
* Apply service properties/component configuration provided in unit test and
from SCR metadata
* Inject SCR dependencies
-* Call lifecyle methods for activating, deactivating or modifying SCR
components
+* Call lifecycle methods for activating, deactivating or modifying SCR
components
* Service and bundle listener implementation
* Mock implementation of `LogService` which logs to SLF4J in JUnit context
Modified:
sling/site/trunk/content/documentation/development/resourceresolver-mock.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/resourceresolver-mock.mdtext?rev=1652263&r1=1652262&r2=1652263&view=diff
==============================================================================
---
sling/site/trunk/content/documentation/development/resourceresolver-mock.mdtext
(original)
+++
sling/site/trunk/content/documentation/development/resourceresolver-mock.mdtext
Thu Jan 15 20:27:35 2015
@@ -21,7 +21,7 @@ See latest version on the [downloads pag
The mock implementation supports:
* All read and write operations of the Sling Resource API
-* Mimicks transactions using via commit()/revert() methods
+* Mimics transactions using via commit()/revert() methods
* OSGi events for adding/changing/removing resources
* The implementation tries to be as close as possible to the behavior of the
JCR resource implementation e.g. concerning date and binary handling
@@ -29,9 +29,9 @@ The mock implementation supports:
The following features are *not supported*:
* Authentication not supported ("login" always possible with null
authentication info)
-* Querying with qeuryResources/findResources not supported (always returns
empty result set)
+* Querying with queryResources/findResources not supported (always returns
empty result set)
* Sling Mapping is not supported
-* Resolving resouce super types
+* Resolving resource super types
Modified: sling/site/trunk/content/documentation/development/sling-mock.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/sling-mock.mdtext?rev=1652263&r1=1652262&r2=1652263&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/sling-mock.mdtext
(original)
+++ sling/site/trunk/content/documentation/development/sling-mock.mdtext Thu
Jan 15 20:27:35 2015
@@ -25,12 +25,12 @@ The mock implementation supports:
* Uses the productive [Sling JCR resource provider
implementation][jcr-resource] internally to do the Resource-JCR mapping
* Alternatively the non-JCR mock implementation provided by the
[Sling resourceresolver-mock implementation][resourceresolver-mock] can be
used
-* `AdpaterManager` implementation for registering adapter factories and
resolving adaptions
+* `AdapterManager` implementation for registering adapter factories and
resolving adaptions
* The implementation is thread-safe so it can be used in parallel running
unit tests
* `SlingScriptHelper` implementation providing access to mocked
request/response objects and supports getting
OSGi services from the [mocked OSGi][osgi-mock] environment.
* Implementations of the servlet-related Sling API classes like
`SlingHttpServletRequest` and `SlingHttpServletRequest`
- * It is possible to set request data to simulate a certian Sling HTTP
request
+ * It is possible to set request data to simulate a certain Sling HTTP
request
* Additional services like `MockModelAdapterFactory` and `MimeTypeService`
The following features are *not supported*:
@@ -43,7 +43,7 @@ The following features are *not supporte
Additional features provided:
-* `SlingContext` JUnit Rule for easily setting up a Sling Mock environment in
your JUnit testcases
+* `SlingContext` JUnit Rule for easily setting up a Sling Mock environment in
your JUnit test cases
* `ContentLoader` supports importing JSON data and binary data into the mock
resource hierarchy to easily
prepare a test fixture consisting of a hierarchy of resources and properties.
* The same JSON format can be used that is provided by the Sling GET
servlet for output
@@ -111,7 +111,7 @@ Different resource resolver mock types a
### Resource Resolver Types
The Sling Mocks resource resolver implementation supports different "types" of
adapters for the mocks.
-Depending on the type an underlying JCR repository is used or not, and the
data ist stored in-memory or in a real
+Depending on the type an underlying JCR repository is used or not, and the
data is stored in-memory or in a real
repository.
Resource resolver types currently supported:
@@ -190,7 +190,7 @@ Example:
MockSling.clearAdapterManagerBundleContext();
Make sure you clean up the adapter manager bundle association after running
the unit test otherwise it can
-interfere with the following tests. If you use the `SlingContext` Junit rule
this is done automatically for you.
+interfere with the following tests. If you use the `SlingContext` JUnit rule
this is done automatically for you.
If you use the `SlingContext` JUnit rule you case just use
`context.registerService()`.
@@ -328,7 +328,7 @@ If you use the `SlingContext` JUnit rule
### Import binary data from file in classpath
With the `ContentLoader` it is possible to import a binary file stored in the
classpath beneath the unit tests.
-The data is stored usig a nt:file/nt:resource or nt:resource node type.
+The data is stored using a nt:file/nt:resource or nt:resource node type.
Example code to import a binary file:
