[sling-org-apache-sling-karaf-integration-tests] 03/05: SLING-9837 Use OSGi R7 HTTP Service

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git

commit 69d47268c56be23b55212e463a32e2d8e4065820
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Sat Oct 17 08:42:12 2020 +0200

    SLING-9837 Use OSGi R7 HTTP Service
---
 .../org/apache/sling/karaf/testing/KarafTestSupport.java   |  4 ++--
 .../sling/karaf/tests/bootstrap/SlingScriptingJspIT.java   | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java 
b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index 340d769..b522702 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -82,7 +82,7 @@ public abstract class KarafTestSupport {
     // test support
 
     protected int httpPort() throws IOException {
-        final Configuration configuration = 
configurationAdmin.getConfiguration("org.ops4j.pax.web");
+        final Configuration configuration = 
configurationAdmin.getConfiguration("org.apache.felix.http.cfg");
         return 
Integer.parseInt(configuration.getProperties().get("org.osgi.service.http.port").toString());
     }
 
@@ -143,7 +143,7 @@ public abstract class KarafTestSupport {
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", 
"rmiRegistryPort", Integer.toString(rmiRegistryPort)),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", 
"rmiServerPort", Integer.toString(rmiServerPort)),
             editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", 
"sshPort", Integer.toString(sshPort)),
-            editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", 
"org.osgi.service.http.port", Integer.toString(httpPort)),
+            editConfigurationFilePut("etc/org.apache.felix.http.cfg", 
"org.osgi.service.http.port", Integer.toString(httpPort)),
             
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject(),
             
mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").versionAsInProject(),
             karafTestSupportBundle()
diff --git 
a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java 
b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
index fe947c7..8593f88 100644
--- 
a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
+++ 
b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
@@ -60,4 +60,18 @@ public class SlingScriptingJspIT extends KarafTestSupport {
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
+    @Test
+    public void testOrgApacheSlingScriptingJspApi() {
+        final Bundle bundle = findBundle("org.apache.sling.scripting.jsp-api");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
+    @Test
+    public void testOrgApacheSlingScriptingElApi() {
+        final Bundle bundle = findBundle("org.apache.sling.scripting.el-api");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
 }