Return-Path: 
 <commits-return-15464-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 8572 invoked from network); 28 Jan 2011 13:10:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 28 Jan 2011 13:10:33 -0000
Received: (qmail 84654 invoked by uid 500); 28 Jan 2011 13:10:33 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 84590 invoked by uid 500); 28 Jan 2011 13:10:32 -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 84582 invoked by uid 99); 28 Jan 2011 13:10:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 13:10:31 +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; Fri, 28 Jan 2011 13:10:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 13AA22388A6E; Fri, 28 Jan 2011 13:10:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1064656 -
 /activemq/activemq-apollo/trunk/apollo-broker/pom.xml
Date: Fri, 28 Jan 2011 13:10:09 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110128131009.13AA22388A6E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Fri Jan 28 13:10:08 2011
New Revision: 1064656

URL: http://svn.apache.org/viewvc?rev=1064656&view=rev
Log:
Fixing up osgi meta-data

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1064656&r1=1064655&r2=1064656&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Fri Jan 28 13:10:08 2011
@@ -86,6 +86,13 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1.1</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
       <version>${jetty-version}</version>
@@ -159,7 +166,7 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Bundle-Activator>org.apache.activemq.apollo.osgi.ApolloActivator</Bundle-Activator>
+            <Bundle-Activator>org.apache.activemq.apollo.broker.osgi.ApolloActivator</Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>