Author: olli
Date: Wed Apr 22 12:43:35 2015
New Revision: 1675349
URL: http://svn.apache.org/r1675349
Log:
SLING-4648 provide Sling Commons features
* add sling-commons-scheduler and sling-commons-threads
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1675349&r1=1675348&r2=1675349&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Wed Apr 22 12:43:35 2015
@@ -55,6 +55,8 @@
<feature name="sling" version="${project.version}">
<feature version="${project.version}">infrastructure-sling</feature>
<feature version="${project.version}">commons-sling</feature>
+ <feature version="${project.version}">sling-commons-scheduler</feature>
+ <feature version="${project.version}">sling-commons-threads</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.9.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.4.2</bundle>
@@ -71,9 +73,7 @@
<!-- (not using org.apache.sling.commons.logservice) -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.2</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.6</bundle>
<!-- (not using org.apache.sling.commons.testing) -->
-
<bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.0</bundle>
<!-- Apache Sling Launchpad -->
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle>
@@ -86,6 +86,18 @@
<feature version="${project.version}">sling</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.6</bundle>
</feature>
+ <!-- Apache Sling Commons -->
+ <feature name="sling-commons-scheduler" version="${project.version}">
+ <feature>scr</feature>
+ <feature version="${project.version}">sling-commons-threads</feature>
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.6</bundle>
+ <!-- bundle dependencies -->
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+ </feature>
+ <feature name="sling-commons-threads" version="${project.version}">
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.0</bundle>
+ </feature>
<!-- Apache Sling Extensions -->
<feature name="sling-extension-adapter" version="${project.version}">
<feature version="${project.version}">sling</feature>
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java?rev=1675349&view=auto
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
(added)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
Wed Apr 22 12:43:35 2015
@@ -0,0 +1,67 @@
+/*
+ * 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.karaf.tests.bootstrap;
+
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingCommonsSchedulerIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addBootFeature("sling-commons-scheduler")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingCommonsScheduler() {
+ final Bundle bundle = findBundle("org.apache.sling.commons.scheduler");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheGeronimoSpecsGeronimoJta_1_1_Spec() {
+ final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-jta_1.1_spec");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheGeronimoSpecsGeronimoServlet_3_0_Spec() {
+ final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-servlet_3.0_spec");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java?rev=1675349&view=auto
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java
(added)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java
Wed Apr 22 12:43:35 2015
@@ -0,0 +1,53 @@
+/*
+ * 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.karaf.tests.bootstrap;
+
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingCommonsThreadsIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addBootFeature("sling-commons-threads")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingCommonsScheduler() {
+ final Bundle bundle = findBundle("org.apache.sling.commons.threads");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}
