Return-Path: 
 <commits-return-13148-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 44227 invoked from network); 19 Feb 2010 11:07:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Feb 2010 11:07:21 -0000
Received: (qmail 11089 invoked by uid 500); 19 Feb 2010 11:07:21 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 11029 invoked by uid 500); 19 Feb 2010 11:07:21 -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 11015 invoked by uid 99); 19 Feb 2010 11:07:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 11:07:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 19 Feb 2010 11:07:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B6A1F2388900; Fri, 19 Feb 2010 11:06:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r911784 - in /activemq/trunk: assembly/pom.xml
 assembly/src/main/descriptors/common-bin.xml pom.xml
Date: Fri, 19 Feb 2010 11:06:59 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100219110659.B6A1F2388900@eris.apache.org>

Author: dejanb
Date: Fri Feb 19 11:06:59 2010
New Revision: 911784

URL: http://svn.apache.org/viewvc?rev=911784&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2617 - adapting assembly

Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=911784&r1=911783&r2=911784&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Feb 19 11:06:59 2010
@@ -224,7 +224,10 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
     </dependency>
-    
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
     <dependency>
        <groupId>org.apache.xbean</groupId>
        <artifactId>xbean-spring</artifactId>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=911784&r1=911783&r2=911784&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Fri Feb 19 11:06:59 2010
@@ -157,13 +157,11 @@
       <scope>runtime</scope>
       <includes>
         <include>commons-logging:commons-logging</include>
-        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
         <include>${pom.groupId}:activemq-core</include>
         <include>${pom.groupId}:activemq-console</include>
         <include>${pom.groupId}:activemq-jaas</include>
         <include>${pom.groupId}:kahadb</include>
         <include>org.apache.activemq.protobuf:activemq-protobuf</include>
-        <include>mx4j:mx4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
@@ -192,7 +190,6 @@
         <include>${pom.groupId}:activemq-optional</include>
         <include>${pom.groupId}:activemq-pool</include>
         <include>${pom.groupId}:activemq-xmpp</include>
-        <include>${pom.groupId}:activecluster</include>
         <include>${pom.groupId}:activeio-core</include>
         <include>${pom.groupId}:activemq-jmdns_1.0</include>
         <include>commons-beanutils:commons-beanutils</include>
@@ -204,12 +201,8 @@
         <include>commons-net:commons-net</include>
         <include>commons-lang:commons-lang</include>
         <include>log4j:log4j</include>
-        <include>mx4j:mx4j-remote</include>
-        <include>mx4j:mx4j-tools</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
-        <include>org.eclipse.jetty:jetty-client</include>
         <include>org.springframework:spring-aop</include>
         <include>org.springframework:spring-core</include>
         <include>org.springframework:spring-beans</include>
@@ -218,12 +211,13 @@
         <include>org.springframework:spring-jms</include>
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
-        <include>org.apache.hadoop.zookeeper:zookeeper</include>
         <include>org.codehaus.woodstox:wstx-asl</include>
         <include>org.springframework.ws:spring-oxm-tiger</include>
         <include>org.codehaus.jettison:jettison</include>
         <include>org.apache.velocity:velocity</include>
         <include>net.sf.josql:josql</include>
+        <include>org.osgi:org.osgi.core</include>
+        <include>org.springframework.osgi:spring-osgi-core</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -234,6 +228,7 @@
         <include>org.springframework:spring-web</include>
         <include>org.springframework:spring-webmvc</include>
         <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
+        <include>org.eclipse.jetty:jetty-websocket</include>
         <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:slf4j-jcl</include>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=911784&r1=911783&r2=911784&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Feb 19 11:06:59 2010
@@ -411,7 +411,6 @@
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>4.1.0</version>
-        <scope>provided</scope>
       </dependency>
 
       <dependency>