sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1636322 - in /sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util: SlingRepositoryTest.java SlingSetupTest.java
Date Mon, 03 Nov 2014 11:18:09 GMT
Author: bdelacretaz
Date: Mon Nov  3 11:18:09 2014
New Revision: 1636322

URL: http://svn.apache.org/r1636322
Log:
Use released Sling Launchpad 7 and adapt bundle lists

Modified:
    sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
    sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java

Modified: sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java?rev=1636322&r1=1636321&r2=1636322&view=diff
==============================================================================
--- sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
(original)
+++ sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
Mon Nov  3 11:18:09 2014
@@ -46,7 +46,7 @@ public class SlingRepositoryTest {
     private SlingRepository repository;
     
     /** Use a released launchpad for this example */
-    public static final String SLING_LAUNCHPAD_VERSION = "6";
+    public static final String SLING_LAUNCHPAD_VERSION = "7";
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {

Modified: sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java?rev=1636322&r1=1636321&r2=1636322&view=diff
==============================================================================
--- sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
(original)
+++ sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Mon Nov  3 11:18:09 2014
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceReferen
 public class SlingSetupTest {
     
     /** Use a released launchpad for this example */
-    public static final String SLING_LAUNCHPAD_VERSION = "6";
+    public static final String SLING_LAUNCHPAD_VERSION = "7";
     
     @Inject
     private BundleContext bundleContext;
@@ -90,56 +90,117 @@ public class SlingSetupTest {
     
     @Test
     public void testSlingBundles() {
-        final String [] bundles = {
+        final String [] LAUNCHPAD_7_BUNDLES = {
+                "derby",
+                "jcl.over.slf4j",
+                "log4j.over.slf4j",
+                "org.apache.aries.jmx.api",
+                "org.apache.aries.jmx.core",
+                "org.apache.aries.jmx.whiteboard",
+                "org.apache.aries.util",
+                "org.apache.commons.codec",
+                "org.apache.commons.collections",
+                "org.apache.commons.fileupload",
+                "org.apache.commons.io",
+                "org.apache.commons.lang",
+                "org.apache.commons.math",
+                "org.apache.commons.pool",
+                "org.apache.felix.bundlerepository",
+                "org.apache.felix.configadmin",
+                "org.apache.felix.eventadmin",
+                "org.apache.felix.framework",
+                //"org.apache.felix.http.api",
+                "org.apache.felix.http.jetty",
+                //"org.apache.felix.http.servlet-api",
+                "org.apache.felix.http.whiteboard",
+                "org.apache.felix.inventory",
+                "org.apache.felix.metatype",
+                "org.apache.felix.prefs",
+                "org.apache.felix.scr",
+                "org.apache.felix.webconsole",
+                "org.apache.felix.webconsole.plugins.ds",
+                "org.apache.felix.webconsole.plugins.event",
+                "org.apache.felix.webconsole.plugins.memoryusage",
+                "org.apache.felix.webconsole.plugins.obr",
+                "org.apache.felix.webconsole.plugins.packageadmin",
+                "org.apache.geronimo.bundles.commons-httpclient",
+                "org.apache.geronimo.bundles.json",
+                "org.apache.geronimo.bundles.jstl",
+                "org.apache.jackrabbit.jackrabbit-api",
+                "org.apache.jackrabbit.jackrabbit-jcr-commons",
+                "org.apache.jackrabbit.jackrabbit-jcr-rmi",
+                "org.apache.jackrabbit.jackrabbit-spi",
+                "org.apache.jackrabbit.jackrabbit-spi-commons",
+                "org.apache.jackrabbit.jackrabbit-webdav",
+                "org.apache.servicemix.bundles.concurrent",
                 "org.apache.sling.adapter",
                 "org.apache.sling.api",
                 "org.apache.sling.auth.core",
                 "org.apache.sling.auth.form",
-                "org.apache.sling.auth.openid",
-                "org.apache.sling.auth.selector",
                 "org.apache.sling.bundleresource.impl",
                 "org.apache.sling.commons.classloader",
+                "org.apache.sling.commons.compiler",
                 "org.apache.sling.commons.json",
                 "org.apache.sling.commons.log",
+                "org.apache.sling.commons.logservice",
                 "org.apache.sling.commons.mime",
                 "org.apache.sling.commons.osgi",
                 "org.apache.sling.commons.scheduler",
                 "org.apache.sling.commons.threads",
+                "org.apache.sling.discovery.api",
+                "org.apache.sling.discovery.impl",
+                "org.apache.sling.discovery.support",
                 "org.apache.sling.engine",
                 "org.apache.sling.event",
                 "org.apache.sling.extensions.explorer",
                 "org.apache.sling.extensions.threaddump",
                 "org.apache.sling.extensions.webconsolebranding",
                 "org.apache.sling.extensions.webconsolesecurityprovider",
+                "org.apache.sling.fragment.transaction",
+                "org.apache.sling.fragment.ws",
+                "org.apache.sling.fragment.xml",
                 "org.apache.sling.fsresource",
+                "org.apache.sling.installer.console",
                 "org.apache.sling.installer.core",
+                "org.apache.sling.installer.factory.configuration",
                 "org.apache.sling.installer.provider.file",
                 "org.apache.sling.installer.provider.jcr",
+                "org.apache.sling.javax.activation",
                 "org.apache.sling.jcr.api",
                 "org.apache.sling.jcr.base",
                 "org.apache.sling.jcr.classloader",
                 "org.apache.sling.jcr.contentloader",
+                "org.apache.sling.jcr.davex",
                 "org.apache.sling.jcr.jackrabbit.accessmanager",
                 "org.apache.sling.jcr.jackrabbit.server",
                 "org.apache.sling.jcr.jackrabbit.usermanager",
-                "org.apache.sling.jcr.ocm",
+                "org.apache.sling.jcr.jcr-wrapper",
+                "org.apache.sling.jcr.registration",
                 "org.apache.sling.jcr.resource",
                 "org.apache.sling.jcr.webconsole",
+                "org.apache.sling.jcr.webdav",
                 "org.apache.sling.launchpad.content",
                 "org.apache.sling.launchpad.installer",
+                "org.apache.sling.models.api",
+                "org.apache.sling.models.impl",
+                "org.apache.sling.resourceresolver",
                 "org.apache.sling.scripting.api",
                 "org.apache.sling.scripting.core",
                 "org.apache.sling.scripting.javascript",
                 "org.apache.sling.scripting.jsp",
                 "org.apache.sling.scripting.jsp.taglib",
+                "org.apache.sling.serviceusermapper",
                 "org.apache.sling.servlets.get",
                 "org.apache.sling.servlets.post",
                 "org.apache.sling.servlets.resolver",
-                "org.apache.sling.settings"
+                "org.apache.sling.settings",
+                "org.apache.tika.bundle",
+                "org.apache.tika.core",
+                "slf4j.api"
         };
         
         final List<String> missing = new ArrayList<String>();
-        for(String bundleName : bundles) {
+        for(String bundleName : LAUNCHPAD_7_BUNDLES) {
             final int state = getBundleState(bundleName); 
             if(state != Bundle.ACTIVE) {
                 missing.add(bundleName + " (state=" + state + ")");



Mime
View raw message