Return-Path: 
 <commits-return-6886-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 98692 invoked from network); 10 Aug 2007 15:39:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 Aug 2007 15:39:30 -0000
Received: (qmail 80522 invoked by uid 500); 10 Aug 2007 15:39:28 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 80470 invoked by uid 500); 10 Aug 2007 15:39:28 -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 80461 invoked by uid 99); 10 Aug 2007 15:39:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 08:39:28 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 15:39:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B862F1A981A; Fri, 10 Aug 2007 08:39:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r564622 - in /activemq/trunk: assembly/pom.xml
 assembly/src/main/descriptors/unix-bin.xml
 assembly/src/main/descriptors/windows-bin.xml pom.xml
Date: Fri, 10 Aug 2007 15:39:06 -0000
To: commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070810153906.B862F1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Fri Aug 10 08:39:05 2007
New Revision: 564622

URL: http://svn.apache.org/viewvc?view=rev&rev=564622
Log:
Patched the ActiveMQ build to work with Camel 1.1

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

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Aug 10 08:39:05 2007
@@ -120,6 +120,16 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-activemq</artifactId>
     </dependency>
+    <!-- for the XML parsing -->
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+
 
     <!-- commons -->
     <dependency>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Aug 10 08:39:05 2007
@@ -158,6 +158,12 @@
         <include>org.apache.camel:camel-spring</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-activemq</include>
+				<!-- Java 5 only -->
+        <include>javax.xml:jaxb-api</include>
+        <include>javax.activation:activation</include>
+        <include>com.sun.xml.bind:jaxb-impl</include>
+        <include>stax:stax-api</include>
+        <include>stax:stax</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Aug 10 08:39:05 2007
@@ -163,6 +163,12 @@
         <include>org.apache.camel:camel-spring</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-activemq</include>
+				<!-- Java 5 only -->
+        <include>javax.xml:jaxb-api</include>
+        <include>javax.activation:activation</include>
+        <include>com.sun.xml.bind:jaxb-impl</include>
+        <include>stax:stax-api</include>
+        <include>stax:stax</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Aug 10 08:39:05 2007
@@ -414,6 +414,34 @@
         </exclusions>
       </dependency>
 
+			<!-- for the XML parsing -->
+      <dependency>
+        <groupId>javax.xml</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml</groupId>
+            <artifactId>jsr173</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>2.0.3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
       <!-- camel testing -->
       <dependency>
         <groupId>org.apache.camel</groupId>