Author: radu
Date: Mon Mar 14 15:10:47 2016
New Revision: 1734945
URL: http://svn.apache.org/viewvc?rev=1734945&view=rev
Log:
releng: updated to latest released dependencies
org.apache.sling/org.apache.sling.discovery.commons/1.0.10
org.apache.sling/org.apache.sling.discovery.base/1.1.2
org.apache.sling/org.apache.sling.discovery.oak/1.2.6
org.apache.sling/org.apache.sling.hc.core/1.2.2
org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
org.apache.sling/org.apache.sling.i18n/2.4.6
org.apache.sling/org.apache.sling.models.impl/1.2.6
org.apache.sling/org.apache.sling.xss/1.0.8
* added teleported test to check the presence of the
org.apache.sling.hc.api.execution.HealthCheckExecutor
service - the HealthCheck bundles are new in the launchpad
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1734945&r1=1734944&r2=1734945&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Mar 14
15:10:47 2016
@@ -45,21 +45,23 @@
org.apache.sling/org.apache.sling.commons.threads/3.2.5-SNAPSHOT
org.apache.sling/org.apache.sling.discovery.api/1.0.2
org.apache.sling/org.apache.sling.discovery.support/1.0.0
- org.apache.sling/org.apache.sling.discovery.commons/1.0.4
- org.apache.sling/org.apache.sling.discovery.base/1.1.0
- org.apache.sling/org.apache.sling.discovery.oak/1.1.0
+ org.apache.sling/org.apache.sling.discovery.commons/1.0.10
+ org.apache.sling/org.apache.sling.discovery.base/1.1.2
+ org.apache.sling/org.apache.sling.discovery.oak/1.2.6
org.apache.sling/org.apache.sling.engine/2.4.7-SNAPSHOT
org.apache.sling/org.apache.sling.event/4.0.0
org.apache.sling/org.apache.sling.event.dea/1.0.4
org.apache.sling/org.apache.sling.fsresource/1.1.5-SNAPSHOT
- org.apache.sling/org.apache.sling.i18n/2.4.4
+ org.apache.sling/org.apache.sling.hc.core/1.2.2
+ org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
+ org.apache.sling/org.apache.sling.i18n/2.4.6
org.apache.sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT
org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.17-SNAPSHOT
org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
org.apache.sling/org.apache.sling.launchpad.content/2.0.8
org.apache.sling/org.apache.sling.models.api/1.2.2
- org.apache.sling/org.apache.sling.models.impl/1.2.4
+ org.apache.sling/org.apache.sling.models.impl/1.2.6
org.apache.sling/org.apache.sling.resourceresolver/1.4.8
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.36
@@ -74,7 +76,7 @@
org.apache.sling/org.apache.sling.servlets.get/2.1.14
org.apache.sling/org.apache.sling.servlets.post/2.3.8
org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
- org.apache.sling/org.apache.sling.xss/1.0.6
+ org.apache.sling/org.apache.sling.xss/1.0.8
javax.mail/mail/1.4.7
org.apache.geronimo.bundles/jstl/1.2_1
org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java?rev=1734945&view=auto
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
(added)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
Mon Mar 14 15:10:47 2016
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * 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.launchpad.webapp.integrationtest.teleporter;
+
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import static org.junit.Assert.fail;
+
+/**
+ * This teleported test checks the presence of multiple services in the Sling
launchpad.
+ */
+public class ServicesPresentTest {
+
+ public static final String[] services = new String[] {
+ "org.apache.sling.hc.api.execution.HealthCheckExecutor"
+ };
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "Launchpad");
+
+ @Test
+ public void testServices() {
+ BundleContext bundleContext =
teleporter.getService(BundleContext.class);
+ StringBuilder stringBuilder = new StringBuilder();
+ for (String service : services) {
+ ServiceReference sr = bundleContext.getServiceReference(service);
+ if (sr == null) {
+ stringBuilder.append(" ").append(service).append("\n");
+ }
+ }
+ if (stringBuilder.length() > 0) {
+ stringBuilder.insert(0, "Could not obtain a ServiceReference for
the following services:\n");
+ fail(stringBuilder.toString());
+ }
+ }
+
+}
