activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1366441 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala apollo-scala/pom.xml apollo-website/pom.xml
Date Fri, 27 Jul 2012 16:41:06 GMT
Author: chirino
Date: Fri Jul 27 16:41:05 2012
New Revision: 1366441

URL: http://svn.apache.org/viewvc?rev=1366441&view=rev
Log:
Use the scala fast compiler (fsc) to make the build run a little faster.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala?rev=1366441&r1=1366440&r2=1366441&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
Fri Jul 27 16:41:05 2012
@@ -1255,7 +1255,9 @@ class LocalRouter(val virtual_host:Virtu
   /**
    * Returns true if the queue no longer exists.
    */
-  def destroy_queue(id:Long, security:SecurityContext) = dispatch_queue ! { _destroy_queue(id,security)
}
+  def destroy_queue(id:Long, security:SecurityContext)(cb: (Option[String])=>Unit) = dispatch_queue
{
+    cb(_destroy_queue(id,security))
+  }
 
   def _destroy_queue(id:Long, security:SecurityContext):Option[String] = {
     queues_by_store_id.get(id) match {

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1366441&r1=1366440&r2=1366441&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Jul 27 16:41:05 2012
@@ -75,11 +75,38 @@
         <version>${maven-scala-plugin-version}</version>
         <executions>
           <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>cc</goal>
+            </goals>
+            <configuration>
+              <useFsc>true</useFsc>
+              <once>true</once>
+              <!-- <displayCmd>true</displayCmd> -->
+              <args>
+                <arg>-deprecation</arg>
+              </args>
+              <compilerPlugins>
+                <compilerPlugin>
+                  <groupId>org.fusesource.jvmassert</groupId>
+                  <artifactId>jvmassert</artifactId>
+                  <version>1.2</version>
+                </compilerPlugin>
+              </compilerPlugins>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test</id>
+            <phase>test-compile</phase>
             <goals>
-              <goal>compile</goal>
               <goal>testCompile</goal>
             </goals>
             <configuration>
+              <mainSourceDir>${project.build.sourceDirectory}/../../test/scala</mainSourceDir>
+              <useFsc>true</useFsc>
+              <once>true</once>
+              <!-- <displayCmd>true</displayCmd> -->
               <args>
                 <arg>-deprecation</arg>
               </args>

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1366441&r1=1366440&r2=1366441&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Fri Jul 27 16:41:05 2012
@@ -21,7 +21,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>apollo-scala</artifactId>
+    <artifactId>apollo-project</artifactId>
     <version>99-trunk-SNAPSHOT</version>
     <relativePath>../apollo-scala</relativePath>
   </parent>
@@ -98,6 +98,27 @@
       </plugin>
 
       <plugin>
+        <groupId>org.scala-tools</groupId>
+        <artifactId>maven-scala-plugin</artifactId>
+        <version>${maven-scala-plugin-version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jvmArgs>
+            <jvmArg>-Xmx1024m</jvmArg>
+            <jvmArg>-Xss8m</jvmArg>
+          </jvmArgs>
+          <scalaVersion>${scala-version}</scalaVersion>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin-version}</version>
         <configuration>



Mime
View raw message