Skip to content

Commit

Permalink
Merge in changes for Ordasity 0.4.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
C. Scott Andreas committed Mar 22, 2012
2 parents 6fc97f3 + d89ed6a commit 5c3aa95
Show file tree
Hide file tree
Showing 25 changed files with 3,039 additions and 607 deletions.
7 changes: 6 additions & 1 deletion .gitignore
View file
Expand Up @@ -4,4 +4,9 @@ build/
*.class
*.ipr
*.iml
*.iws
*.iws
*~
~*
#*
*#
.idea
12 changes: 6 additions & 6 deletions Example.scala
View file
@@ -1,5 +1,5 @@
//
// Copyright 2011, Boundary
// Copyright 2011-2012, Boundary
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@ import java.util.Random
import java.util.concurrent.CountDownLatch
import com.boundary.ordasity.{Cluster, ClusterConfig, SmartListener}
import com.codahale.logula.Logging
import com.yammer.metrics.scala.Meter
import com.yammer.metrics.Meter
import com.twitter.zookeeper.ZooKeeperClient
import java.util.concurrent.{ScheduledThreadPoolExecutor, TimeUnit, ScheduledFuture}
import java.util.{HashMap, TimerTask}
Expand All @@ -33,16 +33,16 @@ val futures = new HashMap[String, ScheduledFuture[_]]

val config = new ClusterConfig("localhost:2181").
setAutoRebalance(true).
setRebalanceInterval(60 * 5).
setRebalanceInterval(15).
useSmartBalancing(true).
setDrainTime(60).
setZKTimeout(3000).
setDrainTime(3).
setZKTimeout(3).
setUseSoftHandoff(true).
setNodeId(java.util.UUID.randomUUID().toString)

val listener = new SmartListener {
def onJoin(client: ZooKeeperClient) = {}
def onLeave() = { }
def onLeave() = {}

// Do yer thang, mark dat meter.
def startWork(workUnit: String, meter: Meter) = {
Expand Down
110 changes: 52 additions & 58 deletions pom.xml
View file
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.boundary</groupId>
<artifactId>ordasity</artifactId>
<version>0.2.0</version>
<artifactId>ordasity-scala_2.9.1</artifactId>
<version>0.4.0</version>

<name>Ordasity</name>
<url>http://www.boundary.com</url>
Expand All @@ -17,53 +17,38 @@

<dependencies>

<dependency>
<groupId>com.twitter</groupId>
<artifactId>zookeeper-client</artifactId>
<version>2.0.0-p01</version>
</dependency>

<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>2.0.0-RC0</version>
</dependency>

<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-scala_${scala.version}</artifactId>
<version>2.0.0-RC0</version>
</dependency>

<dependency>
<groupId>com.codahale</groupId>
<artifactId>logula_${scala.version}</artifactId>
<version>2.1.3</version>
</dependency>

<dependency>
<groupId>com.boundary</groupId>
<artifactId>overlock-scala_${scala.version}</artifactId>
<version>0.6.0</version>
</dependency>

<dependency>
<groupId>com.codahale</groupId>
<artifactId>jerkson_${scala.version}</artifactId>
<version>0.5.0</version>
<groupId>com.twitter.common</groupId>
<artifactId>zookeeper</artifactId>
<version>0.1.1</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.8.4</version>
<groupId>com.codahale</groupId>
<artifactId>jerkson_${scala.version}</artifactId>
<version>0.5.0</version>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.3.2</version>
<groupId>com.codahale</groupId>
<artifactId>simplespec_${scala.version}</artifactId>
<version>0.5.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -103,29 +88,21 @@
</configuration>
</plugin>

<!-- <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<exclude>org.scala-tools.testing:specs_2.8.0</exclude>
<exclude>com.twitter:json_2.8.0</exclude>
<exclude>junit:junit</exclude>
<exclude>org.scala-lang:scala-library</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin> -->
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<useFile>false</useFile>
<useSystemClassLoader>false</useSystemClassLoader>
<includes>
<include>**/*Spec.java</include>
</includes>
<excludes>
<exclude>**/*Test.java</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -141,6 +118,23 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<formats>
<format>xml</format>
<format>html</format>
</formats>
</configuration>
<executions>
<execution>
<phase>clean</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 5c3aa95

Please sign in to comment.