From 0295e8d44ddfc1f584ae70e1e8d5fd54bbd82a20 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Thu, 2 Feb 2012 11:14:30 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3606 - schema for
 karaf features xml

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1239540 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-karaf/pom.xml                        |  5 --
 .../src/main/resources/features-2.1.xml       | 67 -------------------
 .../src/main/resources/features.xml           |  4 +-
 3 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 activemq-karaf/src/main/resources/features-2.1.xml

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 099406d0de..e35f5b4619 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -195,11 +195,6 @@
                      <type>xml</type>
                      <classifier>features</classifier>
                    </artifact>
-                  <artifact>
-                    <file>target/classes/features-2.1.xml</file>
-                     <type>xml</type>
-                     <classifier>features-2.1</classifier>
-                   </artifact>
                  </artifacts>
                </configuration>
              </execution>
diff --git a/activemq-karaf/src/main/resources/features-2.1.xml b/activemq-karaf/src/main/resources/features-2.1.xml
deleted file mode 100644
index c2a04f53ee..0000000000
--- a/activemq-karaf/src/main/resources/features-2.1.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-
-    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.
-
--->
-
-<features name="activemq-${activemq-version}">
-
-    <feature name="activemq" version="${activemq-version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> 
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> 
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> 
-        <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-        <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle> 
-        <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-karaf/5.4.2</bundle> <!-- use the old one for compatibility reasons -->
-        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
-    </feature>
-
-    <feature name="activemq-spring" version="${activemq-version}">
-        <feature version="1.2.0">spring-dm</feature>
-        <feature version="${activemq-version}">activemq</feature> 
-        <bundle>mvn:org.apache.activemq/activemq-spring/${activemq-version}</bundle> 
-        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle> 
-    </feature>
-
-    <feature name="activemq-blueprint" version="${activemq-version}">
-        <feature version="${activemq-version}">activemq</feature> 
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.5.0</bundle>
-        <bundle>mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq-version}</bundle> 
-    </feature>
-
-    <!-- do "features:install war" before installing this one  -->
-    <feature name="activemq-web-console" version="${activemq-version}">
-        <bundle>war:mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war?Webapp-Context=activemq-web-console</bundle>
-    </feature>
-</features>
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 1ef23382c7..b7be001601 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -17,7 +17,7 @@
 
 -->
 
-<features name="activemq-${activemq-version}">
+<features name="activemq-${activemq-version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
     <feature name="activemq" version="${activemq-version}" resolver="(obr)">
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> 
@@ -62,7 +62,7 @@
 
     <feature name="activemq-optional" version="${activemq-version}" resolver="(obr)">
         <feature version="${activemq-version}">activemq-blueprint</feature>
-        <feature varesion="[7.0,8.0)">jetty</feature>
+        <feature version="[7.0,8.0)">jetty</feature>
         <bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
     </feature>