[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
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@817175 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/filtered-resources/etc/config.properties b/karaf/assembly/src/main/filtered-resources/etc/config.properties
index 7d6774b..a968995 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/config.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/config.properties
@@ -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
diff --git a/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg b/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
index 74e733d..daaf02d 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
+++ b/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
@@ -25,4 +25,4 @@
#
# Comma separated list of features to install at startup
#
-featuresBoot=
+featuresBoot=ssh,management
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index 4ab558a..7fb4a8c 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -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>
diff --git a/karaf/webconsole/admin/NOTICE b/karaf/webconsole/admin/NOTICE
index 2f69501..083fb18 100644
--- a/karaf/webconsole/admin/NOTICE
+++ b/karaf/webconsole/admin/NOTICE
@@ -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
diff --git a/karaf/webconsole/features/NOTICE b/karaf/webconsole/features/NOTICE
index 2f69501..083fb18 100644
--- a/karaf/webconsole/features/NOTICE
+++ b/karaf/webconsole/features/NOTICE
@@ -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
diff --git a/karaf/webconsole/gogo/NOTICE b/karaf/webconsole/gogo/NOTICE
index 547bae5..535e0ab 100644
--- a/karaf/webconsole/gogo/NOTICE
+++ b/karaf/webconsole/gogo/NOTICE
@@ -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