svn commit: r1366531 - /activemq/activemq-apollo/trunk/apollo-scala/pom.xml

[ch...@apache.org]

Author: chirino
Date: Fri Jul 27 20:47:51 2012
New Revision: 1366531

URL: http://svn.apache.org/viewvc?rev=1366531&view=rev
Log:
Fixing scala maven settings so that tests compile properly.

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

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1366531&r1=1366530&r2=1366531&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Jul 27 20:47:51 2012
@@ -34,7 +34,8 @@
   <description>Holds the common Maven settings for Scala based modules.</description>
   
   <properties>
-    <scala-plugin-compile-goal>compile</scala-plugin-compile-goal>
+    <scala-plugin-main-goal>compile</scala-plugin-main-goal>
+    <scala-plugin-test-goal>testCompile</scala-plugin-test-goal>
   </properties>
   
   <dependencies>
@@ -82,9 +83,11 @@
             <id>compile</id>
             <phase>compile</phase>
             <goals>
-              <goal>${scala-plugin-compile-goal}</goal>
+              <goal>${scala-plugin-main-goal}</goal>
             </goals>
             <configuration>
+              <displayCmd>true</displayCmd>
+              <testSourceDir>dontcompile</testSourceDir>
               <useFsc>true</useFsc>
               <once>true</once>
               <args>
@@ -101,12 +104,13 @@
           </execution>
           <execution>
             <id>test</id>
-           <phase>test-compile</phase>
+            <phase>test-compile</phase>
             <goals>
-              <goal>${scala-plugin-compile-goal}</goal>
+              <goal>${scala-plugin-test-goal}</goal>
             </goals>
             <configuration>
-              <mainSourceDir>${project.build.sourceDirectory}/../../test/scala</mainSourceDir>
+              <displayCmd>true</displayCmd>
+              <mainSourceDir>dontcompile</mainSourceDir>
               <useFsc>true</useFsc>
               <once>true</once>
               <args>
@@ -155,7 +159,8 @@
     <profile>
       <id>fsc</id>
       <properties>
-        <scala-plugin-compile-goal>cc</scala-plugin-compile-goal>
+        <scala-plugin-main-goal>cc</scala-plugin-main-goal>
+        <scala-plugin-test-goal>cc</scala-plugin-test-goal>
       </properties>
     </profile>