Use blueprint for web console
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786276 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/webconsole/src/main/resources/META-INF/spring/webconsole.xml b/karaf/webconsole/src/main/resources/META-INF/spring/webconsole.xml
deleted file mode 100644
index 3d24aad..0000000
--- a/karaf/webconsole/src/main/resources/META-INF/spring/webconsole.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ctx="http://www.springframework.org/schema/context"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
- http://servicemix.apache.org/schema/servicemix-gshell
- http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
-
- <osgi:reference id="featuresService" interface="org.apache.felix.karaf.gshell.features.FeaturesService" cardinality="1..1"/>
-
- <bean id="featuresPlugin" class="org.apache.felix.karaf.webconsole.FeaturesPlugin">
- <property name="featuresService" ref="featuresService" />
- </bean>
-
- <osgi:service ref="featuresPlugin" interface="javax.servlet.Servlet" >
- <osgi:service-properties>
- <entry key="felix.webconsole.label" value="features"/>
- </osgi:service-properties>
- </osgi:service>
-
-</beans>
diff --git a/karaf/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole.xml b/karaf/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole.xml
new file mode 100644
index 0000000..7f3d106
--- /dev/null
+++ b/karaf/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0">
+
+ <reference id="featuresService" interface="org.apache.felix.karaf.gshell.features.FeaturesService" />
+
+ <bean id="featuresPlugin" class="org.apache.felix.karaf.webconsole.FeaturesPlugin">
+ <property name="featuresService" ref="featuresService" />
+ </bean>
+
+ <service ref="featuresPlugin" interface="javax.servlet.Servlet" >
+ <service-properties>
+ <entry key="felix.webconsole.label" value="features"/>
+ </service-properties>
+ </service>
+
+</blueprint>