Return-Path: 
 <commits-return-16101-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 F204D50F5
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 12 May 2011 18:38:32 +0000 (UTC)
Received: (qmail 20439 invoked by uid 500); 12 May 2011 18:38:32 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 20413 invoked by uid 500); 12 May 2011 18:38: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 20406 invoked by uid 99); 12 May 2011 18:38:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 18:38:32 +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, 12 May 2011 18:38:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 03B94238890D; Thu, 12 May 2011 18:38:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1102412 - in /activemq/activemq-apollo/trunk: ./
 apollo-bdb/
 apollo-broker/
 apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/
 apollo-cassandra/ apollo-cli/ apollo-hawtdb/ apollo-jdbm2/ apollo-openwire/
 apollo-scala/ apo...
Date: Thu, 12 May 2011 18:38:10 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110512183811.03B94238890D@eris.apache.org>

Author: chirino
Date: Thu May 12 18:38:10 2011
New Revision: 1102412

URL: http://svn.apache.org/viewvc?rev=1102412&view=rev
Log:
Upgrade to scala 2.9.0

Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
    activemq/activemq-apollo/trunk/apollo-cli/pom.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
    activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/apollo-web/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Thu May 12 18:38:10 2011
@@ -85,7 +85,7 @@
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Thu May 12 18:38:10 2011
@@ -144,7 +144,7 @@
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala Thu May 12 18:38:10 2011
@@ -150,7 +150,8 @@ abstract class StoreFunSuiteSupport exte
     val B = add_queue("B")
     val C = add_queue("C")
 
-    expectCB(List(A,B,C).toSeq) { cb=>
+    val seq:Seq[Long] = List(A,B,C).toSeq
+    expectCB(seq) { cb=>
       store.list_queues(cb)
     }
   }

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml Thu May 12 18:38:10 2011
@@ -76,7 +76,7 @@
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Thu May 12 18:38:10 2011
@@ -81,7 +81,7 @@
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml Thu May 12 18:38:10 2011
@@ -91,7 +91,7 @@
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml Thu May 12 18:38:10 2011
@@ -85,7 +85,7 @@
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Thu May 12 18:38:10 2011
@@ -112,7 +112,7 @@
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Thu May 12 18:38:10 2011
@@ -100,7 +100,7 @@
                 <compilerPlugin>
                   <groupId>org.fusesource.jvmassert</groupId>
                   <artifactId>jvmassert</artifactId>
-                  <version>1.0</version>
+                  <version>1.1-SNAPSHOT</version>
                 </compilerPlugin>
               </compilerPlugins>
             </configuration>
@@ -159,7 +159,7 @@
                 <compilerPlugin>
                   <groupId>org.fusesource.jvmassert</groupId>
                   <artifactId>jvmassert</artifactId>
-                  <version>1.0</version>
+                  <version>1.1-SNAPSHOT</version>
                 </compilerPlugin>
               </compilerPlugins>
             </configuration>

Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Thu May 12 18:38:10 2011
@@ -117,7 +117,7 @@
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Thu May 12 18:38:10 2011
@@ -133,7 +133,7 @@
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Thu May 12 18:38:10 2011
@@ -135,7 +135,7 @@
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
+      <artifactId>${scalatest-artifact}</artifactId>
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Thu May 12 18:38:10 2011
@@ -117,7 +117,7 @@
         <version>${scalate-version}</version>
         
         <configuration>
-          <warSourceDirectory>${basedir}/src</warSourceDirectory>
+          <webappDirectory>${basedir}/src</webappDirectory>
           <remoteServerId>apollo-website</remoteServerId>
           <remoteServerUrl>${website-base-url}/versions/${project.version}/website/</remoteServerUrl>
         </configuration>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1102412&r1=1102411&r2=1102412&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Thu May 12 18:38:10 2011
@@ -40,8 +40,9 @@
     <projectName>Apache Apollo</projectName>
 
     <!-- dependencies that track scala version changes -->
-    <scala-version>2.8.1</scala-version>
-    <scalatest-version>1.2</scalatest-version>
+    <scala-version>2.9.0</scala-version>
+    <scalatest-artifact>scalatest_2.9.0</scalatest-artifact>
+    <scalatest-version>1.4.1</scalatest-version>
     
     <activemq-version>5.4.1</activemq-version>
     <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
@@ -103,7 +104,7 @@
     <bdb-version>4.1.6</bdb-version>
     <jasypt-version>1.6</jasypt-version>
 
-    <scalate-version>1.4.0</scalate-version>
+    <scalate-version>1.5.0-SNAPSHOT</scalate-version>
     <scalamd-version>1.5</scalamd-version>
 
     <servlet-api-version>2.5</servlet-api-version>