Merge branch 'scala-port'

ticktock · Jun 11, 2010 · 38f92c1 · 38f92c1
2 parents 545c51e + d07d388
commit 38f92c1
Show file tree

Hide file tree

Showing 19 changed files with 751 additions and 1,021 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,12 @@
             <name>Shorrockin Repository</name>
             <url>http://maven.shorrockin.com/</url>
         </repository>
+
+        <repository>
+            <id>clapper.org</id>
+            <name>Clapper Repository</name>
+            <url>http://maven.clapper.org/</url>
+        </repository>
     </repositories>
 
 
@@ -77,6 +83,58 @@
             </testResource>
         </testResources>
         <plugins>
+            <plugin>
+                <groupId>org.scala-tools</groupId>
+                <artifactId>maven-scala-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>scala-compile-first</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>scala-test-compile</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- no luck <vscaladocVersion>1.1</vscaladocVersion> -->
+                    <scalaVersion>${scala.version}</scalaVersion>
+                </configuration>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>org.scala-lang</groupId>
+                        <artifactId>scala-library</artifactId>
+                        <version>${scala.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.scala-lang</groupId>
+                        <artifactId>scala-compiler</artifactId>
+                        <version>${scala.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -107,18 +165,44 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
 
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq.version}</version>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
@@ -141,9 +225,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala.version}</version>
+            <groupId>com.shorrockin</groupId>
+            <artifactId>cascal</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.clapper</groupId>
+            <artifactId>grizzled-slf4j_2.7.7</artifactId>
+            <version>0.2.2</version>
         </dependency>
 
 
@@ -228,18 +318,19 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
@@ -0,0 +1,24 @@
+<assembly>
+    <id>install</id>
+    <baseDirectory>qsandra-install</baseDirectory>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib/optional</outputDirectory>
+             <excludes>
+                 <exclude>junit*</exclude>
+                 <exclude>log4j*</exclude>
+                 <exclude>commons-pool*</exclude>
+                 <exclude>jline*</exclude>
+                 <exclude>jms*</exclude>
+                 <exclude>jmx*</exclude>
+                 <exclude>activation*</exclude>
+                 <exclude>mail*</exclude>
+             </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>