commit b0f827c6abc82a8fae4e990275e5921a2caabb50
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Fri Nov 1 11:42:38 2013 -0500
Initial import
.gitignore | 1 +
curator-2.2.0-commons-math3.patch | 52 ++++++++++++++++
curator-2.2.0-jetty9.patch | 123 +++++++++++++++++++++++++++++++++++++
curator.spec | 93 ++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 270 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c16c773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/apache-curator-2.2.0-incubating-source-release.zip
diff --git a/curator-2.2.0-commons-math3.patch b/curator-2.2.0-commons-math3.patch
new file mode 100644
index 0000000..4ecc433
--- /dev/null
+++ b/curator-2.2.0-commons-math3.patch
@@ -0,0 +1,52 @@
+diff -Nru
apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java
apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java
+---
apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java 2013-07-04
18:09:10.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java 2013-10-11
01:37:05.486241243 +0200
+@@ -24,8 +24,8 @@
+ import org.apache.curator.framework.recipes.BaseClassForTests;
+ import org.apache.curator.retry.ExponentialBackoffRetry;
+ import org.apache.curator.retry.RetryOneTime;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+-import org.apache.commons.math.stat.descriptive.SynchronizedSummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SynchronizedSummaryStatistics;
+ import org.testng.Assert;
+ import org.testng.annotations.Test;
+ import org.testng.collections.Lists;
+diff -Nru
apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java
apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java
+---
apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java 2013-10-11
01:37:05.487241183 +0200
+@@ -28,7 +28,7 @@
+ import org.apache.curator.retry.RetryOneTime;
+ import org.apache.curator.test.Timing;
+ import junit.framework.Assert;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+ import org.testng.annotations.Test;
+ import java.util.Set;
+ import java.util.concurrent.CountDownLatch;
+diff -Nru apache-curator-2.2.0-incubating/curator-test/pom.xml
apache-curator-2.2.0-incubating-gil/curator-test/pom.xml
+--- apache-curator-2.2.0-incubating/curator-test/pom.xml 2013-07-31 19:12:34.000000000
+0200
++++ apache-curator-2.2.0-incubating-gil/curator-test/pom.xml 2013-10-11
01:38:07.609478250 +0200
+@@ -44,8 +44,8 @@
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+- <artifactId>commons-math</artifactId>
+- <version>2.2</version>
++ <artifactId>commons-math3</artifactId>
++ <version>3.2</version>
+ </dependency>
+ </dependencies>
+ </project>
+diff -Nru
apache-curator-2.2.0-incubating/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java
apache-curator-2.2.0-incubating-gil/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java
+---
apache-curator-2.2.0-incubating/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java 2013-10-11
01:37:05.488241122 +0200
+@@ -23,7 +23,7 @@
+ import org.apache.curator.x.discovery.strategies.RandomStrategy;
+ import org.apache.curator.x.discovery.strategies.RoundRobinStrategy;
+ import org.apache.curator.x.discovery.strategies.StickyStrategy;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+ import org.testng.Assert;
+ import org.testng.annotations.Test;
+ import java.util.List;
diff --git a/curator-2.2.0-jetty9.patch b/curator-2.2.0-jetty9.patch
new file mode 100644
index 0000000..576d765
--- /dev/null
+++ b/curator-2.2.0-jetty9.patch
@@ -0,0 +1,123 @@
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml 2013-07-31
19:12:34.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml 2013-10-11
00:50:27.293103260 +0200
+@@ -100,9 +100,16 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
+- <version>6.1.22</version>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-server</artifactId>
++ <version>9.0.3</version>
++ <scope>test</scope>
++ </dependency>
++
++ <dependency>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-servlet</artifactId>
++ <version>9.0.3</version>
+ <scope>test</scope>
+ </dependency>
+
+diff -Nru
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
+---
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-10-11
01:31:17.896361960 +0200
+@@ -40,9 +40,9 @@
+ import org.apache.curator.x.discovery.server.entity.ServiceNames;
+ import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
+ import org.apache.curator.x.discovery.strategies.RandomStrategy;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -93,7 +93,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/",
ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
+---
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-10-11
01:31:45.104703519 +0200
+@@ -26,9 +26,9 @@
+ import junit.framework.Assert;
+
+ import org.apache.curator.test.InstanceSpec;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Sets;
+@@ -94,7 +94,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/",
ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
+---
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-10-11
01:03:11.767769021 +0200
+@@ -39,9 +39,9 @@
+ import com.sun.jersey.api.core.DefaultResourceConfig;
+ import com.sun.jersey.spi.container.servlet.ServletContainer;
+ import junit.framework.Assert;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -91,7 +91,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/",
ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+---
apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-06-29
19:58:12.000000000 +0200
++++
apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-10-11
01:04:35.885692654 +0200
+@@ -30,9 +30,9 @@
+ import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
+ import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
+ import org.jboss.resteasy.spi.ResteasyProviderFactory;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -64,7 +64,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/",
ServletContextHandler.SESSIONS);
+ root.getInitParams().put("javax.ws.rs.Application",
RestEasyApplication.class.getName());
+ root.addServlet(new ServletHolder(dispatcher), "/*");
+ root.addEventListener(new ResteasyBootstrap());
diff --git a/curator.spec b/curator.spec
new file mode 100644
index 0000000..2298219
--- /dev/null
+++ b/curator.spec
@@ -0,0 +1,93 @@
+%global namedreltag -incubating
+%global namedversion %{version}%{?namedreltag}
+Name: curator
+Version: 2.2.0
+Release: 1%{?dist}
+Summary: A set of Java libraries that make using Apache ZooKeeper much easier
+License: ASL 2.0
+URL:
http://curator.incubator.apache.org/
+Source0:
http://www.apache.org/dist/incubator/%{name}/%{namedversion}/apache-%{nam...
+# Fix test deps
+Patch0: %{name}-2.2.0-jetty9.patch
+Patch1: %{name}-2.2.0-commons-math3.patch
+
+BuildRequires: java-devel
+# guava 14.0.1
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(com.google.inject:guice)
+BuildRequires: mvn(javax.ws.rs:jsr311-api)
+BuildRequires: mvn(org.apache.commons:commons-math3)
+BuildRequires: mvn(org.apache.zookeeper:zookeeper)
+BuildRequires: mvn(org.codehaus.jackson:jackson-mapper-asl)
+BuildRequires: mvn(org.javassist:javassist)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+
+# Test depsle
+BuildRequires: mvn(com.sun.jersey:jersey-client)
+BuildRequires: mvn(com.sun.jersey:jersey-core)
+BuildRequires: mvn(com.sun.jersey:jersey-server)
+BuildRequires: mvn(com.sun.jersey:jersey-servlet)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
+# resteasy 2.3.0.GA
+BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs)
+BuildRequires: mvn(org.mockito:mockito-core)
+BuildRequires: mvn(org.scannotation:scannotation)
+BuildRequires: mvn(org.testng:testng)
+
+BuildRequires: maven-local
+BuildRequires: maven-doxia-module-confluence
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-site-plugin
+
+BuildArch: noarch
+
+%description
+Curator is a set of Java libraries that
+make using Apache ZooKeeper much easier.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}
+
+%prep
+%setup -q -n apache-%{name}-%{namedversion}
+find -name '*.class' -print -delete
+find -name '*.jar' -print -delete
+
+%patch0 -p1
+%patch1 -p1
+
+# disable cause build failure
+%pom_remove_plugin :maven-license-plugin
+
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId =
'scannotation' ]/pom:groupId" org.scannotation %{name}-x-discovery-server
+
+# remove flakey tests
+rm -f
curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedQueue.java
+rm -f
curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java
+rm -f
curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java
+rm -f
curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+
+
+%build
+
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc DISCLAIMER LICENSE NOTICE README
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
+
+%changelog
+* Thu Oct 10 2013 gil cattaneo <puntogil(a)libero.it> 2.2.0-1
+- initial rpm
diff --git a/sources b/sources
index e69de29..a6df5ea 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+15b28f4b7cd9c4f8ba6a74c8c8857e51 apache-curator-2.2.0-incubating-source-release.zip