You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/17 08:56:42 UTC
svn commit: r1774724 - in /sling: branches/testing/mocks/sling-mock-1.x/
branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/
trunk/testing/mocks/sling-mock/
trunk/testing/mocks/sling-mock/src/main/java/org/a...
Author: sseifert
Date: Sat Dec 17 08:56:42 2016
New Revision: 1774724
URL: http://svn.apache.org/viewvc?rev=1774724&view=rev
Log:
SLING-6410 sling-mock: Add support f�r scripting BindingsValuesProvidersByContext
Modified:
sling/branches/testing/mocks/sling-mock-1.x/pom.xml
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
sling/trunk/testing/mocks/sling-mock/pom.xml
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1774724&r1=1774723&r2=1774724&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Sat Dec 17 08:56:42 2016
@@ -106,6 +106,18 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.core</artifactId>
+ <version>2.0.26</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.mime</artifactId>
<version>2.1.4</version>
<scope>compile</scope>
Modified: sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1774724&r1=1774723&r2=1774724&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Sat Dec 17 08:56:42 2016
@@ -49,6 +49,8 @@ import org.apache.sling.models.spi.Imple
import org.apache.sling.resourcebuilder.api.ResourceBuilder;
import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
import org.apache.sling.resourcebuilder.impl.ResourceBuilderFactoryService;
+import org.apache.sling.scripting.core.impl.BindingsValuesProvidersByContextImpl;
+import org.apache.sling.scripting.core.impl.ScriptEngineManagerFactory;
import org.apache.sling.settings.SlingSettingsService;
import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl;
import org.apache.sling.testing.mock.sling.MockSling;
@@ -157,6 +159,10 @@ public class SlingContextImpl extends Os
*/
protected void registerDefaultServices() {
+ // scripting services (required by sling models impl since 1.3.6)
+ registerInjectActivateService(new ScriptEngineManagerFactory());
+ registerInjectActivateService(new BindingsValuesProvidersByContextImpl());
+
// adapter factories
registerInjectActivateService(new ModelAdapterFactory());
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1774724&r1=1774723&r2=1774724&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Sat Dec 17 08:56:42 2016
@@ -113,6 +113,18 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.1.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.core</artifactId>
+ <version>2.0.36</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.mime</artifactId>
<version>2.1.8</version>
<scope>compile</scope>
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1774724&r1=1774723&r2=1774724&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Sat Dec 17 08:56:42 2016
@@ -49,6 +49,8 @@ import org.apache.sling.models.spi.Imple
import org.apache.sling.resourcebuilder.api.ResourceBuilder;
import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
import org.apache.sling.resourcebuilder.impl.ResourceBuilderFactoryService;
+import org.apache.sling.scripting.core.impl.BindingsValuesProvidersByContextImpl;
+import org.apache.sling.scripting.core.impl.ScriptEngineManagerFactory;
import org.apache.sling.settings.SlingSettingsService;
import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl;
import org.apache.sling.testing.mock.sling.MockSling;
@@ -157,6 +159,10 @@ public class SlingContextImpl extends Os
*/
protected void registerDefaultServices() {
+ // scripting services (required by sling models impl since 1.3.6)
+ registerInjectActivateService(new ScriptEngineManagerFactory());
+ registerInjectActivateService(new BindingsValuesProvidersByContextImpl());
+
// adapter factories
registerInjectActivateService(new ModelAdapterFactory());