You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/12/04 19:27:04 UTC
svn commit: r1718005 - in
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution:
./ src/ src/main/ src/main/resources/ src/main/resources/etc/
Author: olli
Date: Fri Dec 4 18:27:04 2015
New Revision: 1718005
URL: http://svn.apache.org/viewvc?rev=1718005&view=rev
Log:
SLING-4869 Provide a Karaf-based distribution
modifications and additions to be more like Karaf standard distribution
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties (with props)
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.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=1718005&r1=1718004&r2=1718005&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 Fri Dec 4 18:27:04 2015
@@ -102,6 +102,10 @@
<installedFeatures>
<!-- Apache Karaf -->
<feature>wrapper</feature>
+ <feature>wrap</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell-compat</feature>
+ <feature>kar</feature>
<!-- Apache Sling -->
<feature>sling</feature>
<!-- Apache Sling Auth -->
@@ -170,10 +174,14 @@
<!-- Composum -->
<feature>composum-sling</feature>
</installedFeatures>
+ <startupFeatures>
+ <!-- <feature>eventadmin</feature> -->
+ </startupFeatures>
<bootFeatures>
- <feature>jaas</feature>
+ <feature>eventadmin</feature>
<feature>shell</feature>
<feature>feature</feature>
+ <feature>jaas</feature>
<feature>ssh</feature>
<feature>management</feature>
<feature>bundle</feature>
@@ -181,7 +189,6 @@
<feature>deployer</feature>
<feature>diagnostic</feature>
<feature>instance</feature>
- <feature>kar</feature>
<feature>log</feature>
<feature>package</feature>
<feature>service</feature>
@@ -191,7 +198,6 @@
<feature>http</feature>
<feature>http-whiteboard</feature>
<feature>webconsole</feature>
- <feature>eventadmin</feature>
</bootFeatures>
<libraries>
<library>xerces-${xerces.version}.jar;url:="wrap:mvn:xerces/xercesImpl/${xerces.version}$Export-Package=org.apache.*;version=${xerces.version}";type:=endorsed;export:=true;delegate:=true</library>
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin?rev=1718005&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin Fri Dec 4 18:27:04 2015
@@ -0,0 +1,21 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+org.apache.felix.eventadmin.AddTimestamp=true
+org.apache.felix.eventadmin.AddSubject=true
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin
------------------------------------------------------------------------------
svn:executable = *
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties?rev=1718005&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties Fri Dec 4 18:27:04 2015
@@ -0,0 +1,29 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# Bundles to be started on startup, with startlevel
+mvn\:org.apache.sshd/sshd-core/0.14.0 = 20
+mvn\:org.apache.felix/org.apache.felix.metatype/1.1.2 = 5
+mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.3 = 5
+mvn\:org.ops4j.pax.url/pax-url-aether/2.4.3 = 5
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.4 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.4 = 8
+mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.8 = 10
+mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.0 = 11
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.3 = 15
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
------------------------------------------------------------------------------
svn:executable = *