Permalink
Browse files

Merge branch 'master' of https://github.com/boundary/high-scale-lib

* 'master' of https://github.com/boundary/high-scale-lib:
  incredibly odd failure condition
  fix repo
  • Loading branch information...
2 parents f09d691 + 536ae8d commit 2daed1be20df54e25366e6d979d0af98ab5277c7 @d2fn d2fn committed Aug 2, 2012
Showing with 23 additions and 8 deletions.
  1. +8 −5 README.md
  2. +4 −3 build.xml
  3. +3 −0 ivysettings.xml
  4. +8 −0 src/test/java/org/cliffc/high_scale_lib/NonBlockingSetIntTest.java
View
@@ -1,32 +1,35 @@
+High Scale Lib
+-------------
+
This is Boundary's fork of Cliff Click's high scale lib. We will be maintaining this fork with bug fixes, improvements and versioned builds in our public maven repository.
To use high scale lib from ivy add the following to your resolver chain in ivysettings.xml:
<url name="boundary" m2compatible="true">
- <artifact pattern="http://maven.boundary.com/repo/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]" />
- <ivy pattern="http://maven.boundary.com/repo/[organization]/[module]/[revision]/ivy-[module].xml" />
+ <artifact pattern="http://maven.boundary.com/artifactory/repo/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]" />
+ <ivy pattern="http://maven.boundary.com/artifactory/repo/[organization]/[module]/[revision]/ivy-[module].xml" />
</url>
and declare the dependency in ivy.xml:
<dependency
org="com.boundary"
name="high-scale-lib"
- rev="1.0.2" />
+ rev="1.0.3" />
From maven simply add the repository to the repositories element:
<repository>
<id>boundary-site</id>
- <url>http://maven.boundary.com/repo</url>
+ <url>http://maven.boundary.com/artifactory/repo</url>
</repository>
and then add the dependency to the dependencies element:
<dependency>
<groupId>com.boundary</groupId>
<artifactId>high-scale-lib</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</dependency>
Original README
View
@@ -57,7 +57,7 @@
</target>
<target name="ivy-retrieve-build" depends="ivy-init, resolve">
- <ivy:retrieve type="jar,source" pattern="${build.dir.lib}/[type]s/[artifact].[ext]"/>
+ <ivy:retrieve type="jar" pattern="${build.dir.lib}/[type]s/[artifact].[ext]"/>
</target>
<target name="resolve">
@@ -71,7 +71,7 @@
</target>
<target name="compile" depends="ivy-retrieve-build" description="Compilation target">
- <javac srcdir="${build.src.java}" destdir="${build.classes}"/>
+ <javac srcdir="${build.src.java}" destdir="${build.classes}" debug="true"/>
</target>
<target name="gen-pom" depends="ivy-init">
@@ -91,8 +91,9 @@
</target>
<target name="test" depends="compile-tests" description="run unit tests">
- <junit>
+ <junit haltonfailure="true" printsummary="yes">
<classpath refid="test.classpath"/>
+ <formatter type="plain" usefile="false"/>
<test name="org.cliffc.high_scale_lib.HighScaleLibTestSuite"/>
</junit>
</target>
View
@@ -20,6 +20,9 @@
pattern="http://maven.boundary.com/artifactory/external/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"/>
<ivy pattern="http://maven.boundary.com/artifactory/external/[organization]/[module]/[revision]/ivy-[module].xml"/>
</url>
+ <url name="ibiblio" m2compatible="true">
+ <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+ </url>
</chain>
</resolvers>
</ivysettings>
@@ -11,6 +11,14 @@
public class NonBlockingSetIntTest extends TestCase {
+ public void testDerp() {
+ NonBlockingSetInt a = new NonBlockingSetInt();
+ NonBlockingSetInt b = new NonBlockingSetInt();
+
+ a.add(1213446);
+ NonBlockingSetInt c = a.union(b);
+ }
+
public void testSetOperations() {
// add values to the following bitsets
// 'a' will get all values divisible by 63

0 comments on commit 2daed1b

Please sign in to comment.