Author: olli
Date: Tue May 3 12:52:31 2016
New Revision: 1742110
URL: http://svn.apache.org/viewvc?rev=1742110&view=rev
Log:
SLING-4648 Provide Sling Commons features
add sling-commons-classloader and sling-commons-fsclassloader
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsClassloaderIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
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-distribution/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml?rev=1742110&r1=1742109&r2=1742110&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
Tue May 3 12:52:31 2016
@@ -112,6 +112,8 @@
<!-- Apache Sling Auth -->
<feature>sling-auth-form</feature>
<!-- Apache Sling Commons -->
+ <feature>sling-commons-classloader</feature>
+ <feature>sling-commons-fsclassloader</feature>
<feature>sling-commons-messaging</feature>
<feature>sling-commons-messaging-mail</feature>
<feature>sling-commons-metrics</feature>
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=1742110&r1=1742109&r2=1742110&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
Tue May 3 12:52:31 2016
@@ -28,7 +28,6 @@
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.2.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.8</bundle>
<!-- Apache Sling Commons -->
-
<bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.compiler/2.3.0</bundle>
<!-- org.apache.sling.commons.json requires jcr -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.json/2.0.16</bundle>
@@ -43,6 +42,7 @@
<feature>management</feature>
<feature>http</feature>
<feature>http-whiteboard</feature>
+ <feature version="${feature.version}">sling-commons-classloader</feature>
<feature version="${feature.version}">sling-commons-scheduler</feature>
<feature version="${feature.version}">sling-commons-threads</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
@@ -63,6 +63,19 @@
<feature version="${feature.version}">sling</feature>
</feature>
<!-- Apache Sling Commons -->
+ <feature name="sling-commons-classloader" version="${feature.version}">
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2</bundle>
+ </feature>
+ <feature name="sling-commons-fsclassloader" version="${feature.version}">
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.2</bundle>
+ <!-- dependencies -->
+ <feature>scr</feature>
+ <feature>webconsole</feature>
+ <feature version="${feature.version}">sling-commons-classloader</feature>
+ <bundle dependency="true">mvn:commons-io/commons-io/2.5</bundle>
+ <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+ </feature>
<feature name="sling-commons-messaging" version="${feature.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.messaging/0.0.1-SNAPSHOT</bundle>
</feature>
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsClassloaderIT.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/SlingCommonsClassloaderIT.java?rev=1742110&view=auto
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsClassloaderIT.java
(added)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsClassloaderIT.java
Tue May 3 12:52:31 2016
@@ -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 SlingCommonsClassloaderIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addSlingFeatures("sling-commons-classloader")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingCommonsClassloader() {
+ final Bundle bundle =
findBundle("org.apache.sling.commons.classloader");
+ 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/SlingCommonsFsclassloaderIT.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/SlingCommonsFsclassloaderIT.java?rev=1742110&view=auto
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
(added)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
Tue May 3 12:52:31 2016
@@ -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 SlingCommonsFsclassloaderIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addSlingFeatures("sling-commons-fsclassloader")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingCommonsFsclassloader() {
+ final Bundle bundle =
findBundle("org.apache.sling.commons.fsclassloader");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}
