activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961096 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/pom.xml activemq-scala/pom.xml activemq-stomp/pom.xml activemq-web/pom.xml pom.xml
Date Wed, 07 Jul 2010 03:53:00 GMT
Author: chirino
Date: Wed Jul  7 03:53:00 2010
New Revision: 961096

URL: http://svn.apache.org/viewvc?rev=961096&view=rev
Log:
moved common scala maven settings into a parent pom.

Added:
    activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml
      - copied, changed from r961095, activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml
    activemq/sandbox/activemq-apollo-actor/pom.xml

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml?rev=961096&r1=961095&r2=961096&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml Wed Jul  7 03:53:00 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-project</artifactId>
+    <artifactId>activemq-scala</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 
@@ -61,13 +61,13 @@
       <version>${hawtdispatch-version}</version>
     </dependency>
 
+    <!-- Scala Support -->
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
       <scope>compile</scope>
       <version>${scala-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-compiler</artifactId>
@@ -96,7 +96,6 @@
       <version>${scalatest-version}</version>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -107,27 +106,6 @@
   </dependencies>
 
   <build>
-  
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-
-    <resources>
-      <resource>
-        <directory>target/schema</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-      
     <plugins>
 
       <!-- Generate a test jar for the test cases in this package -->
@@ -142,43 +120,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>2.13.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <jvmArgs>
-            <jvmArg>-Xmx1024m</jvmArg>
-          </jvmArgs>
-          <args>
-            <arg>-deprecation</arg>
-            <arg>-Xno-varargs-conversion</arg>
-          </args>
-          <scalaVersion>${scala-version}</scalaVersion>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <!-- we must turn off the use of system class loader so our tests can find stuff
- otherwise ScalaSupport compiler can't find stuff -->
-          <useSystemClassLoader>false</useSystemClassLoader>
-          <!--forkMode>pertest</forkMode-->
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml (from r961095, activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml?p2=activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml&p1=activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml&r1=961095&r2=961096&rev=961096&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml Wed Jul  7 03:53:00 2010
@@ -25,93 +25,41 @@
   </parent>
 
   <groupId>org.apache.activemq</groupId>
-  <artifactId>activemq-stomp</artifactId>
-  <packaging>jar</packaging>
+  <artifactId>activemq-scala</artifactId>
+  <packaging>pom</packaging>
   <version>6.0-SNAPSHOT</version>
 
-  <name>ActiveMQ :: Stomp</name>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
-      <version>6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-tcp</artifactId>
-      <version>6.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-compiler</artifactId>
-      <version>${scala-version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>${xstream-version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-util</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-jaxb</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <version>${junit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
-      <version>${scalatest-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <!--<scope>test</scope>-->
-      <version>${log4j-version}</version>
-    </dependency>
-    
-  </dependencies>
-
+  <name>ActiveMQ :: Scala Settings</name>
+  <description>Holds the common Maven settings for Scala based modules.</description>
+  
   <build>
-
+  
     <defaultGoal>install</defaultGoal>
     <sourceDirectory>src/main/scala</sourceDirectory>
     <testSourceDirectory>src/test/scala</testSourceDirectory>
 
+    <resources>
+      <resource>
+        <directory>target/schema</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+      
     <plugins>
+
       <plugin>
         <groupId>org.scala-tools</groupId>
         <artifactId>maven-scala-plugin</artifactId>
-        <version>2.13.1</version>
+        <version>${maven-scala-plugin-version}</version>
         <executions>
           <execution>
             <goals>
@@ -131,10 +79,12 @@
           <scalaVersion>${scala-version}</scalaVersion>
         </configuration>
       </plugin>
-
+      
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>${maven-surefire-plugin-version}</version>
+        
         <configuration>
           <!-- we must turn off the use of system class loader so our tests can find stuff
- otherwise ScalaSupport compiler can't find stuff -->
           <useSystemClassLoader>false</useSystemClassLoader>
@@ -147,5 +97,5 @@
 
     </plugins>
   </build>
-  
+
 </project>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml?rev=961096&r1=961095&r2=961096&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml Wed Jul  7 03:53:00 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-project</artifactId>
+    <artifactId>activemq-scala</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 
@@ -44,6 +44,13 @@
       <version>6.0-SNAPSHOT</version>
     </dependency>
 
+    <!-- Scala Support -->
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <scope>compile</scope>
+      <version>${scala-version}</version>
+    </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-compiler</artifactId>
@@ -100,52 +107,5 @@
     </dependency>
     
   </dependencies>
-
-  <build>
-
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-
-    <plugins>
-      <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>2.13.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <jvmArgs>
-            <jvmArg>-Xmx1024m</jvmArg>
-          </jvmArgs>
-          <args>
-            <arg>-deprecation</arg>
-            <arg>-Xno-varargs-conversion</arg>
-          </args>
-          <scalaVersion>${scala-version}</scalaVersion>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <!-- we must turn off the use of system class loader so our tests can find stuff
- otherwise ScalaSupport compiler can't find stuff -->
-          <useSystemClassLoader>false</useSystemClassLoader>
-          <!--forkMode>pertest</forkMode-->
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
   
 </project>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml?rev=961096&r1=961095&r2=961096&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml Wed Jul  7 03:53:00 2010
@@ -4,7 +4,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-project</artifactId>
+    <artifactId>activemq-scala</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 
@@ -17,13 +17,14 @@
 
   <properties>
     <jetty-port>8080</jetty-port>
-    <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     <scalate-editor>${env.SCALATE_EDITOR}</scalate-editor>
     <scalate-workdir>${basedir}/target/_scalate</scalate-workdir>
+    <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
   </properties>
 
   <dependencies>
     
+    <!-- ActiveMQ APIs -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -35,47 +36,64 @@
       <version>6.0-SNAPSHOT</version>
     </dependency>
 
+    <!-- Web Framework APIs -->
     <dependency>
       <groupId>org.fusesource.scalate</groupId>
       <artifactId>scalate-war</artifactId>
       <version>${scalate-version}</version>
       <type>war</type>
     </dependency>
-    
     <dependency>
       <groupId>org.fusesource.scalate</groupId>
       <artifactId>scalate-guice</artifactId>
       <version>${scalate-version}</version>
     </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>${servlet-api-version}</version>
       <scope>provided</scope>
     </dependency>
-    
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-jaxrs</artifactId>
       <version>1.3.2</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- Scala Support -->
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <scope>compile</scope>
+      <version>${scala-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>${scala-version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- Testing -->
     <dependency>
       <groupId>org.fusesource.scalate</groupId>
       <artifactId>scalate-test</artifactId>
       <version>${scalate-version}</version>
       <scope>test</scope>
     </dependency>
+    
   </dependencies>
 
   <build>
+    
     <plugins>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin-version}</version>
+        
         <configuration>
           <forkMode>once</forkMode>
           <!-- these settings are mandatory to avoid SureFire giving a bogus system property
to the web container -->
@@ -91,10 +109,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
 
       <plugin>
         <groupId>org.mortbay.jetty</groupId>

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961096&r1=961095&r2=961096&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 03:53:00 2010
@@ -101,7 +101,8 @@
     
     <scala-version>2.8.0.Beta1</scala-version>
     <scalatest-version>1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT</scalatest-version>
-    <scala-plugin-version>2.9.1</scala-plugin-version>
+    <maven-scala-plugin-version>2.13.1</maven-scala-plugin-version>
+    <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
   </properties>
@@ -132,6 +133,7 @@
   </distributionManagement>
 
   <modules>
+    <module>activemq-scala</module>
     <module>activemq-util</module>
     <module>activemq-transport</module>
     <module>activemq-store</module>
@@ -141,6 +143,7 @@
     <module>activemq-hawtdb</module>
     <module>activemq-jaxb</module>
     <module>activemq-stomp</module>
+    <module>activemq-web</module>
   </modules>
 
   <scm>
@@ -270,6 +273,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-surefire-plugin-version}</version>
           <configuration>
             <redirectTestOutputToFile>false</redirectTestOutputToFile>
             <forkMode>once</forkMode>
@@ -297,11 +301,11 @@
           <artifactId>maven-bundle-plugin</artifactId>
           <version>${felix-version}</version>
         </plugin>
-        <plugin>
+        <!-- <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>ianal-maven-plugin</artifactId>
           <version>1.0-alpha-1</version>
-        </plugin>
+        </plugin> -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>javacc-maven-plugin</artifactId>
@@ -367,7 +371,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
+      <!-- <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>ianal-maven-plugin</artifactId>
         <executions>
@@ -380,7 +384,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
       <!--<plugin>-->
         <!--<groupId>org.apache.felix</groupId>-->
         <!--<artifactId>maven-bundle-plugin</artifactId>-->
@@ -555,6 +559,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin-version}</version>
             <configuration>
               <test>false</test>
             </configuration>
@@ -563,6 +568,152 @@
       </build>
     </profile>
 
+
+    <!-- enables extra repositories which may have some
+         goodies that have not reached central yet -->
+    <profile>
+      <id>download</id>
+      <repositories>
+        <repository>
+          <id>repo1.maven</id>
+          <name>Maven Central Repo</name>
+          <url>http://repo1.maven.org/maven2</url>
+        </repository>
+        <repository>
+          <id>fusesource.m2</id>
+          <name>FuseSource Community Release Repository</name>
+          <url>http://repo.fusesource.com/maven2</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
+        <repository>
+          <id>fusesource.m2-snapshot</id>
+          <name>FuseSource Community Snapshot Repository</name>
+          <url>http://repo.fusesource.com/maven2-snapshot</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+        </repository>
+
+        <repository>
+          <id>java.net.m2</id>
+          <name>java.net Maven 2 Repo</name>
+          <url>http://download.java.net/maven/2</url>
+        </repository>
+        <repository>
+          <id>openqa-releases</id>
+          <name>OpenQA Releases</name>
+          <url>http://archiva.openqa.org/repository/releases</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+
+        <repository>
+          <id>glassfish-repo-archive</id>
+          <name>Nexus repository collection for Glassfish</name>
+          <url>http://maven.glassfish.org/content/groups/glassfish</url>
+          <snapshots>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+        </repository>
+
+        <repository>
+          <id>scala</id>
+          <name>Scala Tools</name>
+<!--
+          <url>http://nexus.scala-tools.org/content/repositories/releases</url>
+-->
+          <url>http://scala-tools.org/repo-releases</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+        <repository>
+          <id>snapshots.scala-tools.org</id>
+          <name>Scala-Tools Maven2 Snapshot Repository</name>
+          <url>http://scala-tools.org/repo-snapshots</url>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </releases>
+        </repository>
+<!--
+        <repository>
+          <id>nexus.snapshots.scala-tools.org</id>
+          <name>Scala-Tools Maven2 Snapshot Repository</name>
+          <url>http://nexus.scala-tools.org/content/repositories/snapshots</url>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </releases>
+        </repository>
+-->
+        <repository>
+          <id>apache.snapshots</id>
+          <name>Apache Development Snapshot Repository</name>
+          <url>https://repository.apache.org/content/repositories/snapshots</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>scala</id>
+          <name>Scala Tools</name>
+<!--
+          <url>http://nexus.scala-tools.org/content/repositories/releases</url>
+-->
+          <url>http://scala-tools.org/repo-releases</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+          <id>snapshots.scala-tools.org</id>
+          <name>Scala-Tools Maven2 Snapshot Repository</name>
+          <url>http://scala-tools.org/repo-snapshots</url>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>fail</checksumPolicy>
+          </releases>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
   </profiles>
 
 </project>



Mime
View raw message