Author: gnodet
Date: Mon Sep 21 07:13:20 2009
New Revision: 817175
URL: http://svn.apache.org/viewvc?rev=817175&view=rev
Log:
[karaf] Fix notices for web console plugins, change default repository name,
make sure ssh and management features are listed as installed, remove obr url
to smx repo
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
felix/trunk/karaf/webconsole/admin/NOTICE
felix/trunk/karaf/webconsole/features/NOTICE
felix/trunk/karaf/webconsole/gogo/NOTICE
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
---
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
(original)
+++
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
Mon Sep 21 07:13:20 2009
@@ -52,11 +52,6 @@
karaf.startlevel.bundle=60
#
-# Bundle config properties.
-#
-obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
-
-#
# FileMonitor properties
#
felix.fileinstall.dir = ${karaf.base}/etc
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
---
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
(original)
+++
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
Mon Sep 21 07:13:20 2009
@@ -25,4 +25,4 @@
#
# Comma separated list of features to install at startup
#
-featuresBoot=
+featuresBoot=ssh,management
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
(original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml Mon Sep
21 07:13:20 2009
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="default">
+<features name="karaf-${version}">
<feature name="spring" version="${spring.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
Modified: felix/trunk/karaf/webconsole/admin/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/NOTICE?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/NOTICE (original)
+++ felix/trunk/karaf/webconsole/admin/NOTICE Mon Sep 21 07:13:20 2009
@@ -8,6 +8,9 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
II. Used Software
@@ -19,3 +22,4 @@
III. License Summary
- Apache License 2.0
+- JSON License
Modified: felix/trunk/karaf/webconsole/features/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/features/NOTICE?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/features/NOTICE (original)
+++ felix/trunk/karaf/webconsole/features/NOTICE Mon Sep 21 07:13:20 2009
@@ -8,6 +8,9 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
II. Used Software
@@ -19,3 +22,4 @@
III. License Summary
- Apache License 2.0
+- JSON License
Modified: felix/trunk/karaf/webconsole/gogo/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/NOTICE?rev=817175&r1=817174&r2=817175&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/gogo/NOTICE (original)
+++ felix/trunk/karaf/webconsole/gogo/NOTICE Mon Sep 21 07:13:20 2009
@@ -8,6 +8,9 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
This product includes software written by
Antony Lesuisse.
Licensed under Public Domain.
@@ -23,3 +26,5 @@
III. License Summary
- Apache License 2.0
+- JSON License
+- Public Domain
\ No newline at end of file
