Return-Path: 
 <commits-return-18008-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 358569279
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu,  2 Feb 2012 11:14:54 +0000 (UTC)
Received: (qmail 51047 invoked by uid 500); 2 Feb 2012 11:14:54 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 50977 invoked by uid 500); 2 Feb 2012 11:14:52 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 50970 invoked by uid 99); 2 Feb 2012 11:14:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 11:14:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 11:14:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C92F32388865
	for <commits@activemq.apache.org>; Thu,  2 Feb 2012 11:14:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1239540 - in /activemq/trunk/activemq-karaf: pom.xml
 src/main/resources/features-2.1.xml src/main/resources/features.xml
Date: Thu, 02 Feb 2012 11:14:30 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120202111430.C92F32388865@eris.apache.org>

Author: dejanb
Date: Thu Feb  2 11:14:30 2012
New Revision: 1239540

URL: http://svn.apache.org/viewvc?rev=1239540&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3606 - schema for karaf features xml

Removed:
    activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
Modified:
    activemq/trunk/activemq-karaf/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1239540&r1=1239539&r2=1239540&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Thu Feb  2 11:14:30 2012
@@ -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>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1239540&r1=1239539&r2=1239540&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Feb  2 11:14:30 2012
@@ -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>