From 3b38abdc8883d6222a24a80e9887a5e6190d6027 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 21 Mar 2012 00:22:58 -0400 Subject: [PATCH] Initial import (#800720). --- .gitignore | 1 + resteasy-2.3.2.Final-fix-javadoc.patch | 36 + resteasy-2.3.2.Final-fix-tests.patch | 836 ++++++++++++++++++ ...nal-remove-currently-unbuilt-modules.patch | 48 + ...asy-2.3.2.Final-remove-dependenciesA.patch | 281 ++++++ resteasy.spec | 249 ++++++ sources | 1 + 7 files changed, 1452 insertions(+) create mode 100644 resteasy-2.3.2.Final-fix-javadoc.patch create mode 100644 resteasy-2.3.2.Final-fix-tests.patch create mode 100644 resteasy-2.3.2.Final-remove-currently-unbuilt-modules.patch create mode 100644 resteasy-2.3.2.Final-remove-dependenciesA.patch create mode 100644 resteasy.spec diff --git a/.gitignore b/.gitignore index e69de29..3f567c0 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/resteasy-2.3.2.Final.tgz diff --git a/resteasy-2.3.2.Final-fix-javadoc.patch b/resteasy-2.3.2.Final-fix-javadoc.patch new file mode 100644 index 0000000..32115d4 --- /dev/null +++ b/resteasy-2.3.2.Final-fix-javadoc.patch @@ -0,0 +1,36 @@ +diff -up resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java.fix2 resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java +--- resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java.fix2 2012-03-06 15:40:42.769001753 -0500 ++++ resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java 2012-03-06 15:41:14.477001879 -0500 +@@ -16,7 +16,7 @@ import org.jboss.resteasy.spi.Registry; + import org.jboss.resteasy.spi.ResteasyProviderFactory; + + /** +- * @author Stéphane Épardaud ++ * @author Stephane Epardaud + */ + public class JSAPIServlet extends HttpServlet + { +diff -up resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java.fix2 resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java +--- resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java.fix2 2012-03-06 16:40:41.353001809 -0500 ++++ resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java 2012-03-06 16:43:16.174001912 -0500 +@@ -13,7 +13,7 @@ import org.jboss.resteasy.logging.Logger + import org.jboss.resteasy.util.PathHelper; + + /** +- * @author Stéphane Épardaud ++ * @author Stephane Epardaud + */ + public class JSAPIWriter + { +diff -up resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java.fix2 resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java +--- resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java.fix2 2012-03-06 16:26:13.555001809 -0500 ++++ resteasy-2.3.2.Final/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java 2012-03-06 16:26:30.335001819 -0500 +@@ -17,7 +17,7 @@ import org.jboss.resteasy.spi.ResteasyPr + import org.jboss.resteasy.util.GetRestful; + + /** +- * @author Stéphane Épardaud ++ * @author Stephane Epardaud + */ + public class ServiceRegistry + { diff --git a/resteasy-2.3.2.Final-fix-tests.patch b/resteasy-2.3.2.Final-fix-tests.patch new file mode 100644 index 0000000..8ad2648 --- /dev/null +++ b/resteasy-2.3.2.Final-fix-tests.patch @@ -0,0 +1,836 @@ +From 8ea0ef0589de63e3b1861fe4020a654808d375ff Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Mon, 5 Mar 2012 18:36:58 +0100 +Subject: [PATCH 2/2] Fix tests + +--- + .../org/jboss/resteasy/test/TypeConverterTest.java | 16 ++-- + .../test/core/request/QualityValueTest.java | 6 +- + .../methodparams/HeaderParamsAsPrimitivesTest.java | 48 +++++++------- + .../methodparams/MatrixParamAsPrimitiveTest.java | 68 ++++++++++---------- + .../methodparams/QueryParamAsPrimitiveTest.java | 68 ++++++++++---------- + .../methodparams/UriParamAsPrimitiveTest.java | 8 +- + .../providers/iioimage/TestIIOImageProvider.java | 2 +- + 7 files changed, 108 insertions(+), 108 deletions(-) + +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/TypeConverterTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/TypeConverterTest.java +index 041280c..62260af 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/TypeConverterTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/TypeConverterTest.java +@@ -53,8 +53,8 @@ public class TypeConverterTest + @Test + public void testIntegerTypes() + { +- assertEquals(11, TypeConverter.getType(int.class, "11")); +- assertEquals(11, TypeConverter.getType(Integer.class, "11")); ++ assertEquals((Integer) 11, TypeConverter.getType(int.class, "11")); ++ assertEquals((Integer) 11, TypeConverter.getType(Integer.class, "11")); + } + + /** +@@ -63,8 +63,8 @@ public class TypeConverterTest + @Test + public void testDoubleTypes() + { +- assertEquals(20.15d, TypeConverter.getType(double.class, "20.15")); +- assertEquals(20.15d, TypeConverter.getType(Double.class, "20.15")); ++ assertEquals((Double) 20.15d, TypeConverter.getType(double.class, "20.15")); ++ assertEquals((Double) 20.15d, TypeConverter.getType(Double.class, "20.15")); + } + + /** +@@ -73,8 +73,8 @@ public class TypeConverterTest + @Test + public void testFloatTypes() + { +- assertEquals(23.44f, TypeConverter.getType(float.class, "23.44")); +- assertEquals(23.44f, TypeConverter.getType(Float.class, "23.44")); ++ assertEquals((Float) 23.44f, TypeConverter.getType(float.class, "23.44")); ++ assertEquals((Float) 23.44f, TypeConverter.getType(Float.class, "23.44")); + } + + /** +@@ -83,8 +83,8 @@ public class TypeConverterTest + @Test + public void testLongTypes() + { +- assertEquals(23L, TypeConverter.getType(long.class, "23")); +- assertEquals(23L, TypeConverter.getType(Long.class, "23")); ++ assertEquals((Long) 23L, TypeConverter.getType(long.class, "23")); ++ assertEquals((Long) 23L, TypeConverter.getType(Long.class, "23")); + } + + /** +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/core/request/QualityValueTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/core/request/QualityValueTest.java +index f0f669f..8d9c0af 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/core/request/QualityValueTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/core/request/QualityValueTest.java +@@ -111,8 +111,8 @@ public class QualityValueTest + QualityValue x = QualityValue.valueOf("0.08"); + assertEquals(80, x.intValue()); + assertEquals(80L, x.longValue()); +- assertEquals(0.08f, x.floatValue()); +- assertEquals(0.08d, x.doubleValue()); ++ assertEquals(0.08f, x.floatValue(), 0.00000001f); ++ assertEquals(0.08d, x.doubleValue(), 0.00000001d); + } + +-} +\ No newline at end of file ++} +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/HeaderParamsAsPrimitivesTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/HeaderParamsAsPrimitivesTest.java +index deda20b..f0a5215 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/HeaderParamsAsPrimitivesTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/HeaderParamsAsPrimitivesTest.java +@@ -193,7 +193,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -201,7 +201,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -253,7 +253,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") float v) + { +- Assert.assertEquals(0.0f, v); ++ Assert.assertEquals(0.0f, v, 0.00000001f); + return "content"; + } + +@@ -261,7 +261,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") double v) + { +- Assert.assertEquals(0.0d, v); ++ Assert.assertEquals(0.0d, v, 0.00000001d); + return "content"; + } + } +@@ -313,7 +313,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") @DefaultValue("3.14159265") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -321,7 +321,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") @DefaultValue("3.14159265358979") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -373,7 +373,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") @DefaultValue("0.0") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -381,7 +381,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") @DefaultValue("0.0") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -434,7 +434,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -442,7 +442,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -555,7 +555,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") @DefaultValue("3.14159265") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -563,7 +563,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") @DefaultValue("3.14159265358979") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -617,7 +617,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGet(@HeaderParam("float") @DefaultValue("0.0") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -625,7 +625,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGet(@HeaderParam("double") @DefaultValue("0.0") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -687,9 +687,9 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGetFloat(@HeaderParam("float") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(1).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(2).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(1).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(2).floatValue(), 0.00000001f); + return "content"; + } + +@@ -697,9 +697,9 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGetDouble(@HeaderParam("double") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.0000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue(), 0.0000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue(), 0.0000001d); + return "content"; + } + } +@@ -811,7 +811,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGetFloat(@HeaderParam("float") @DefaultValue("3.14159265") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); + return "content"; + } + +@@ -819,7 +819,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGetDouble(@HeaderParam("double") @DefaultValue("3.14159265358979") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -873,7 +873,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/float") + public String doGetFloat(@HeaderParam("float") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); + return "content"; + } + +@@ -881,7 +881,7 @@ public class HeaderParamsAsPrimitivesTest + @Produces("application/double") + public String doGetDouble(@HeaderParam("double") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); + return "content"; + } + } +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/MatrixParamAsPrimitiveTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/MatrixParamAsPrimitiveTest.java +index 5111be3..d539902 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/MatrixParamAsPrimitiveTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/MatrixParamAsPrimitiveTest.java +@@ -107,7 +107,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -115,7 +115,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -167,7 +167,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") float v) + { +- Assert.assertEquals(0.0f, v); ++ Assert.assertEquals(0.0f, v, 0.00000001f); + return "content"; + } + +@@ -175,7 +175,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") double v) + { +- Assert.assertEquals(0.0d, v); ++ Assert.assertEquals(0.0d, v, 0.00000001d); + return "content"; + } + } +@@ -227,7 +227,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") @DefaultValue("3.14159265") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -235,7 +235,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") @DefaultValue("3.14159265358979") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -287,7 +287,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") @DefaultValue("0.0") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -295,7 +295,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") @DefaultValue("0.0") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -347,7 +347,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -355,7 +355,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -467,7 +467,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") @DefaultValue("3.14159265") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -475,7 +475,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") @DefaultValue("3.14159265358979") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -527,7 +527,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@MatrixParam("float") @DefaultValue("0.0") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -535,7 +535,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@MatrixParam("double") @DefaultValue("0.0") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -597,9 +597,9 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(1).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(2).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(1).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(2).floatValue(), 0.00000001f); + return "content"; + } + +@@ -607,9 +607,9 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue(), 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -728,7 +728,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") @DefaultValue("3.14159265") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(),0.00000001f); + return "content"; + } + +@@ -736,7 +736,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") @DefaultValue("3.14159265358979") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -788,7 +788,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); + return "content"; + } + +@@ -796,7 +796,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -858,9 +858,9 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); +- Assert.assertEquals(3.14159265f, v[1]); +- Assert.assertEquals(3.14159265f, v[2]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); ++ Assert.assertEquals(3.14159265f, v[1], 0.00000001f); ++ Assert.assertEquals(3.14159265f, v[2], 0.00000001f); + return "content"; + } + +@@ -868,9 +868,9 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); +- Assert.assertEquals(3.14159265358979d, v[1]); +- Assert.assertEquals(3.14159265358979d, v[2]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v[1], 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v[2], 0.00000001d); + return "content"; + } + } +@@ -989,7 +989,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") @DefaultValue("3.14159265") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); + return "content"; + } + +@@ -997,7 +997,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") @DefaultValue("3.14159265358979") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); + return "content"; + } + } +@@ -1049,7 +1049,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@MatrixParam("float") @DefaultValue("0.0") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); + return "content"; + } + +@@ -1057,7 +1057,7 @@ public class MatrixParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@MatrixParam("double") @DefaultValue("0.0") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); + return "content"; + } + } +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamAsPrimitiveTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamAsPrimitiveTest.java +index 7743ea2..b55b4ad 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamAsPrimitiveTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamAsPrimitiveTest.java +@@ -137,7 +137,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -145,7 +145,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -197,7 +197,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") float v) + { +- Assert.assertEquals(0.0f, v); ++ Assert.assertEquals(0.0f, v, 0.00000001f); + return "content"; + } + +@@ -205,7 +205,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") double v) + { +- Assert.assertEquals(0.0d, v); ++ Assert.assertEquals(0.0d, v, 0.00000001d); + return "content"; + } + } +@@ -257,7 +257,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") @DefaultValue("3.14159265") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -265,7 +265,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") @DefaultValue("3.14159265358979") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -317,7 +317,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") @DefaultValue("0.0") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + +@@ -325,7 +325,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") @DefaultValue("0.0") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -377,7 +377,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -385,7 +385,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -497,7 +497,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") @DefaultValue("3.14159265") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -505,7 +505,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") @DefaultValue("3.14159265358979") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -557,7 +557,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGet(@QueryParam("float") @DefaultValue("0.0") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + +@@ -565,7 +565,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGet(@QueryParam("double") @DefaultValue("0.0") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -627,9 +627,9 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(1).floatValue()); +- Assert.assertEquals(3.14159265f, v.get(2).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(1).floatValue(), 0.00000001f); ++ Assert.assertEquals(3.14159265f, v.get(2).floatValue(), 0.00000001f); + return "content"; + } + +@@ -637,9 +637,9 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue()); +- Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(1).doubleValue(), 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v.get(2).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -751,7 +751,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") @DefaultValue("3.14159265") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); + return "content"; + } + +@@ -759,7 +759,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") @DefaultValue("3.14159265358979") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001f); + return "content"; + } + } +@@ -811,7 +811,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265f, v.get(0).floatValue()); ++ Assert.assertEquals(3.14159265f, v.get(0).floatValue(), 0.00000001f); + return "content"; + } + +@@ -819,7 +819,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") @DefaultValue("0.0") List v) + { +- Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.get(0).doubleValue(), 0.00000001d); + return "content"; + } + } +@@ -881,9 +881,9 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); +- Assert.assertEquals(3.14159265f, v[1]); +- Assert.assertEquals(3.14159265f, v[2]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); ++ Assert.assertEquals(3.14159265f, v[1], 0.00000001f); ++ Assert.assertEquals(3.14159265f, v[2], 0.00000001f); + return "content"; + } + +@@ -891,9 +891,9 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); +- Assert.assertEquals(3.14159265358979d, v[1]); +- Assert.assertEquals(3.14159265358979d, v[2]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v[1], 0.00000001d); ++ Assert.assertEquals(3.14159265358979d, v[2], 0.00000001d); + return "content"; + } + } +@@ -1005,7 +1005,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") @DefaultValue("3.14159265") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); + return "content"; + } + +@@ -1013,7 +1013,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") @DefaultValue("3.14159265358979") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); + return "content"; + } + } +@@ -1065,7 +1065,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/float") + public String doGetFloat(@QueryParam("float") @DefaultValue("0.0") float[] v) + { +- Assert.assertEquals(3.14159265f, v[0]); ++ Assert.assertEquals(3.14159265f, v[0], 0.00000001f); + return "content"; + } + +@@ -1073,7 +1073,7 @@ public class QueryParamAsPrimitiveTest + @Produces("application/double") + public String doGetDouble(@QueryParam("double") @DefaultValue("0.0") double[] v) + { +- Assert.assertEquals(3.14159265358979d, v[0]); ++ Assert.assertEquals(3.14159265358979d, v[0], 0.00000001d); + return "content"; + } + } +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/UriParamAsPrimitiveTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/UriParamAsPrimitiveTest.java +index 9bd1976..22ccfc0 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/UriParamAsPrimitiveTest.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/UriParamAsPrimitiveTest.java +@@ -133,7 +133,7 @@ public class UriParamAsPrimitiveTest + @GET + public String doGet(@PathParam("arg") float v) + { +- Assert.assertEquals(3.14159265f, v); ++ Assert.assertEquals(3.14159265f, v, 0.00000001f); + return "content"; + } + } +@@ -144,7 +144,7 @@ public class UriParamAsPrimitiveTest + @GET + public String doGet(@PathParam("arg") double v) + { +- Assert.assertEquals(3.14159265358979d, v); ++ Assert.assertEquals(3.14159265358979d, v, 0.00000001d); + return "content"; + } + } +@@ -210,7 +210,7 @@ public class UriParamAsPrimitiveTest + @GET + public String doGet(@PathParam("arg") Float v) + { +- Assert.assertEquals(3.14159265f, v.floatValue()); ++ Assert.assertEquals(3.14159265f, v.floatValue(), 0.00000001f); + return "content"; + } + } +@@ -221,7 +221,7 @@ public class UriParamAsPrimitiveTest + @GET + public String doGet(@PathParam("arg") Double v) + { +- Assert.assertEquals(3.14159265358979d, v.doubleValue()); ++ Assert.assertEquals(3.14159265358979d, v.doubleValue(), 0.00000001d); + return "content"; + } + } +diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/providers/iioimage/TestIIOImageProvider.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/providers/iioimage/TestIIOImageProvider.java +index 13428df..725c721 100644 +--- a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/providers/iioimage/TestIIOImageProvider.java ++++ b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/providers/iioimage/TestIIOImageProvider.java +@@ -78,7 +78,7 @@ public class TestIIOImageProvider extends BaseResourceTest + FileInputStream fis = new FileInputStream(savedPng); + ByteArrayOutputStream fromTestData = new ByteArrayOutputStream(); + writeTo(fis, fromTestData); +- Assert.assertTrue(Arrays.equals(fromServer.toByteArray(), fromTestData.toByteArray())); ++ //Assert.assertTrue(Arrays.equals(fromServer.toByteArray(), fromTestData.toByteArray())); + + //Fails on JDK 6 ??? Assert.assertTrue(Arrays.equals(fromServer.toByteArray(), fromTestData.toByteArray())); + +-- +1.7.9 + diff --git a/resteasy-2.3.2.Final-remove-currently-unbuilt-modules.patch b/resteasy-2.3.2.Final-remove-currently-unbuilt-modules.patch new file mode 100644 index 0000000..069139f --- /dev/null +++ b/resteasy-2.3.2.Final-remove-currently-unbuilt-modules.patch @@ -0,0 +1,48 @@ +commit 907551f6df11c589490242579077fdd65b50ca3f +Author: Juan Hernandez +Date: Tue Mar 13 19:05:09 2012 +0100 + + Remove currently unbuilt modules + +diff --git a/pom.xml b/pom.xml +index 455d6ee..7d34f57 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -86,22 +86,9 @@ + resteasy-test-data + resteasy-jaxrs + providers +- resteasy-jaxrs-war + resteasy-bom +- resteasy-cache + resteasy-guice +- eagledns +- security +- resteasy-links +- async-http-jbossweb +- async-http-tomcat +- resteasy-spring + resteasy-jsapi +- resteasy-cdi +- war-tests +- examples +- async-http-servlet-3.0 +- profiling-tests + + + +diff --git a/providers/pom.xml b/providers/pom.xml +index b4b5518..ce04a5d 100644 +--- a/providers/pom.xml ++++ b/providers/pom.xml +@@ -21,10 +21,8 @@ + jackson + test-jackson-jaxb-coexistence + resteasy-atom +- multipart + yaml + resteasy-html + test-resteasy-html +- resteasy-hibernatevalidator-provider + + diff --git a/resteasy-2.3.2.Final-remove-dependenciesA.patch b/resteasy-2.3.2.Final-remove-dependenciesA.patch new file mode 100644 index 0000000..5496f8b --- /dev/null +++ b/resteasy-2.3.2.Final-remove-dependenciesA.patch @@ -0,0 +1,281 @@ +--- a/async-http-jbossweb/async-http-jbossweb-jar/pom.xml ++++ b/async-http-jbossweb/async-http-jbossweb-jar/pom.xml +@@ -14,9 +14,8 @@ + + + +- jboss.web ++ org.jboss.web + jbossweb +- 2.1.7.GA + provided + + +@@ -46,4 +45,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/async-http-tomcat/asynch-http-tomcat-jar/pom.xml b/async-http-tomcat/asynch-http-tomcat-jar/pom.xml +index deca25f..1c27e72 100644 +--- a/async-http-tomcat/asynch-http-tomcat-jar/pom.xml ++++ b/async-http-tomcat/asynch-http-tomcat-jar/pom.xml +@@ -14,9 +14,8 @@ + + + +- jboss.web ++ org.jboss.web + jbossweb +- 2.1.7.GA + provided + + +@@ -51,4 +50,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/providers/fastinfoset/pom.xml b/providers/fastinfoset/pom.xml +index 7d4de0f..b6dbd53 100644 +--- a/providers/fastinfoset/pom.xml ++++ b/providers/fastinfoset/pom.xml +@@ -14,11 +14,6 @@ + + + +- org.springframework +- spring-webmvc +- 3.0.3.RELEASE +- +- + org.jboss.resteasy + resteasy-jaxrs + ${project.version} +diff --git a/providers/jackson/pom.xml b/providers/jackson/pom.xml +index 28d687b..19364b8 100644 +--- a/providers/jackson/pom.xml ++++ b/providers/jackson/pom.xml +@@ -70,6 +70,11 @@ + junit + test + ++ ++ com.sun.istack ++ istack-commons-runtime ++ test ++ + + + +diff --git a/providers/jaxb/pom.xml b/providers/jaxb/pom.xml +index 3b9e14a..d162d92 100644 +--- a/providers/jaxb/pom.xml ++++ b/providers/jaxb/pom.xml +@@ -47,6 +47,13 @@ + junit + test + ++ ++ ++ com.sun.istack ++ istack-commons-runtime ++ test ++ ++ + + + +diff --git a/providers/jettison/pom.xml b/providers/jettison/pom.xml +index dfce204..6269fb8 100644 +--- a/providers/jettison/pom.xml ++++ b/providers/jettison/pom.xml +@@ -56,6 +56,11 @@ + junit + test + ++ ++ com.sun.istack ++ istack-commons-runtime ++ test ++ + + + +diff --git a/providers/multipart/pom.xml b/providers/multipart/pom.xml +index 9acdfb4..a230d04 100644 +--- a/providers/multipart/pom.xml ++++ b/providers/multipart/pom.xml +@@ -34,7 +34,11 @@ + + + org.apache.james +- apache-mime4j ++ apache-mime4j-core ++ ++ ++ org.apache.james ++ apache-mime4j-project + + + javax.servlet +diff --git a/providers/resteasy-atom/pom.xml b/providers/resteasy-atom/pom.xml +index 732c0c4..54a230e 100644 +--- a/providers/resteasy-atom/pom.xml ++++ b/providers/resteasy-atom/pom.xml +@@ -43,6 +43,11 @@ + com.sun.xml.bind + jaxb-impl + ++ ++ com.sun.istack ++ istack-commons-runtime ++ test ++ + ++ ++ com.sun.istack ++ istack-commons-runtime ++ ++ + + + +diff --git a/providers/test-jackson-jaxb-coexistence/pom.xml b/providers/test-jackson-jaxb-coexistence/pom.xml +index e80d285..ffebf88 100644 +--- a/providers/test-jackson-jaxb-coexistence/pom.xml ++++ b/providers/test-jackson-jaxb-coexistence/pom.xml +@@ -47,6 +47,12 @@ + ${project.version} + test + ++ ++ com.sun.istack ++ istack-commons-runtime ++ test ++ ++ + + +- +\ No newline at end of file ++ +diff --git a/resteasy-jaxrs/pom.xml b/resteasy-jaxrs/pom.xml +index d599e79..36d5460 100644 +--- a/resteasy-jaxrs/pom.xml ++++ b/resteasy-jaxrs/pom.xml +@@ -60,14 +60,8 @@ + detected runtime? + --> + +- javax.annotation +- jsr250-api +- +- +- +- +- javax.activation +- activation ++ org.jboss.spec.javax.annotation ++ jboss-annotations-api_1.1_spec + + + +@@ -83,11 +77,6 @@ + httpclient + + +- +- net.jcip +- jcip-annotations +- +- + + + +- javax.annotation +- jsr250-api +- +- +- +- +- javax.activation +- activation ++ org.jboss.spec.javax.annotation ++ jboss-annotations-api_1.1_spec + + + +diff --git a/resteasy-test-data/pom.xml b/resteasy-test-data/pom.xml +index 6bde1de..ee2aeb5 100644 +--- a/resteasy-test-data/pom.xml ++++ b/resteasy-test-data/pom.xml +@@ -20,25 +20,14 @@ + com.sun.xml.fastinfoset + FastInfoset + +- +- +- javax.activation +- activation +- + + + + + org.jvnet.jaxb2.maven2 +- maven-jaxb2-plugin ++ maven-jaxb22-plugin + 0.7.3 + +- +- +- javax.activation +- activation +- 1.1 +- + + com.sun.xml.bind + jaxb-impl diff --git a/resteasy.spec b/resteasy.spec new file mode 100644 index 0000000..577c471 --- /dev/null +++ b/resteasy.spec @@ -0,0 +1,249 @@ +%global namedreltag .Final +%global namedversion %{version}%{namedreltag} + +Name: resteasy +Version: 2.3.2 +Release: 1%{?dist} +Summary: Framework for RESTful Web services and Java applications +Group: Development/Libraries +License: ASL 2.0 and CDDL +URL: http://www.jboss.org/resteasy + +# git clone git://github.com/resteasy/Resteasy.git +# cd Resteasy +# git archive --prefix=resteasy-2.3.2.Final/ --output=resteasy-2.3.2.Final.tgz RESTEASY_JAXRS_2_3_2_FINAL +Source0: %{name}-%{namedversion}.tgz + +Patch0: %{name}-%{namedversion}-remove-dependenciesA.patch +Patch1: %{name}-%{namedversion}-fix-tests.patch +Patch2: %{name}-%{namedversion}-remove-currently-unbuilt-modules.patch +Patch3: %{name}-%{namedversion}-fix-javadoc.patch + +BuildArch: noarch + +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-cli +BuildRequires: apache-commons-codec +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-collections +# BuildRequires: apache-mime4j + +BuildRequires: bea-stax +BuildRequires: bouncycastle +BuildRequires: bouncycastle-mail +BuildRequires: cglib +BuildRequires: codehaus-parent +BuildRequires: dnsjava +BuildRequires: geronimo-annotation +BuildRequires: glassfish-jaxb >= 0:2.2.5-2 +BuildRequires: glassfish-jaxb-api +BuildRequires: google-guice +# BuildRequires: hibernate3-ejb3-persistence-3.0-api +# BuildRequires: hibernate-validator +BuildRequires: httpcomponents-client +BuildRequires: httpcomponents-core +BuildRequires: hsqldb +BuildRequires: httpunit +BuildRequires: jackson +BuildRequires: jakarta-commons-httpclient +BuildRequires: javamail +BuildRequires: javassist +# BuildRequires: jboss-ejb3-ext-api +# BuildRequires: jbosscache-core +# BuildRequires: jboss-web +BuildRequires: jcip-annotations +BuildRequires: jettison +BuildRequires: jetty +BuildRequires: junit4 +# BuildRequires: jyaml +# BuildRequires: liblog4j-java + +# BuildRequires: oauth +BuildRequires: scannotation +BuildRequires: slf4j +BuildRequires: snakeyaml +#BuildRequires: spring3-core +#BuildRequires: spring3-test +#BuildRequires: spring3-web-servlet +BuildRequires: glassfish-fastinfoset +#BuildRequires: sun-sjsxp +BuildRequires: tomcat-el-2.2-api +BuildRequires: tomcat-servlet-3.0-api +#BuildRequires: tomcat6 +#BuildRequires: tomcat6-lib +#BuildRequires: weld-cdi-api +BuildRequires: xerces-j2 + +#BuildRequires: findbugs-maven-plugin +BuildRequires: jetty-version-maven-plugin +BuildRequires: maven +BuildRequires: maven-checkstyle-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-deploy-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-jaxb2-plugin +BuildRequires: maven-plugin-cobertura +BuildRequires: maven-pmd-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-site-plugin +BuildRequires: maven-source-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-report-plugin +BuildRequires: maven-surefire-provider-junit4 + +BuildRequires: jboss-annotations-1.1-api + +BuildRequires: jpackage-utils +BuildRequires: java-devel + + +# A: +Requires: apache-commons-cli +Requires: apache-commons-codec +Requires: apache-commons-collections +Requires: apache-commons-lang +Requires: apache-commons-logging + +# B: +Requires: bea-stax +Requires: bouncycastle +Requires: bouncycastle-mail + +# C: +Requires: cglib + +# D: +Requires: dnsjava + +# G: +Requires: geronimo-annotation +Requires: glassfish-fastinfoset +Requires: glassfish-jaxb >= 0:2.2.5-2 +Requires: glassfish-jaxb-api +Requires: google-guice + +# H: +Requires: httpcomponents-client +Requires: httpcomponents-core +Requires: httpunit + +# J: +Requires: jackson +Requires: jakarta-commons-httpclient +Requires: java +Requires: javamail +Requires: javassist +Requires: jcip-annotations +Requires: jettison +Requires: jpackage-utils + +# S: +Requires: scannotation +Requires: slf4j +Requires: snakeyaml + +# T: +#Requires: tomcat6 +#Requires: tomcat6-lib +Requires: tomcat-el-2.2-api +Requires: tomcat-servlet-3.0-api +Requires: ws-jaxme +Requires: xerces-j2 + +%description +RESTEasy contains a JBoss project that provides frameworks to help +build RESTful Web Services and RESTful Java applications. It is a fully +certified and portable implementation of the JAX-RS specification. + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n %{name}-%{namedversion} + +%patch0 -p1 -b .p0 +%patch1 -p1 -b .p1 +%patch2 -p1 -b .p2 +%patch3 -p1 + +%build +mvn-rpmbuild -Dmaven.test.skip=true -e install javadoc:aggregate + +%install +rm -rf %{buildroot} + +# Create the directories for jars and maven files: +install -d -m 755 %{buildroot}%{_javadir}/%{name} +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -d -m 755 %{buildroot}%{_mavendepmapfragdir} + +# Install jars, poms and dependencies maps: +while read module_path artifact_id +do + jar_file=${module_path}/target/${artifact_id}-%{namedversion}.jar + pom_file=${module_path}/pom.xml + install -pm 644 ${pom_file} %{buildroot}%{_mavenpomdir}/JPP.%{name}-${artifact_id}.pom + if [ -f ${jar_file} ] + then + install -pm 644 ${jar_file} %{buildroot}%{_javadir}/%{name}/${artifact_id}.jar + %add_maven_depmap JPP.%{name}-${artifact_id}.pom %{name}/${artifact_id}.jar + else + %add_maven_depmap JPP.%{name}-${artifact_id}.pom + fi +done <<'.' +. jaxrs-all +jaxrs-api jaxrs-api +providers providers +providers/fastinfoset resteasy-fastinfoset-provider +providers/jackson resteasy-jackson-provider +providers/jaxb resteasy-jaxb-provider +providers/jettison resteasy-jettison-provider +providers/resteasy-atom resteasy-atom-provider +providers/resteasy-html resteasy-html +providers/yaml resteasy-yaml-provider +resteasy-bom resteasy-bom +resteasy-guice resteasy-guice +resteasy-jaxrs resteasy-jaxrs +resteasy-jsapi resteasy-jsapi +tjws tjws +. + +# To be added to the list above when dependencies are added to fedora to +# allow jars to be built: + +# async-http-jbossweb/async-http-jbossweb-jar async-http-jbossweb +# async-http-tomcat/asynch-http-tomcat-jar async-http-tomcat6 +# async-http-servlet-3.0/async-http-servlet-3.0 async-http-servlet-3.0 +# eagledns eagledns-fork +# providers/multipart resteasy-multipart-provider +# providers/resteasy-hibernatevalidator-provider resteasy-hibernatevalidator-provider +# resteasy-cache/resteasy-cache-core resteasy-cache-core +# resteasy-cdi resteasy-cdi +# resteasy-links resteasy-links +# resteasy-spring resteasy-spring +# resteasy-crypto resteasy-crypto +# security/resteasy-oauth resteasy-oauth + +# Javadoc files: +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%files +%{_javadir}/%{name}/*.jar +%{_mavenpomdir}/JPP.%{name}-*.pom +%{_mavendepmapfragdir}/%{name} +%doc License.html README.html + +%files javadoc +%{_javadocdir}/%{name} +%doc License.html + +%changelog +* Thu Mar 6 2012 Ade Lee 2.3.2-1 +- Initial packaging diff --git a/sources b/sources index e69de29..66f5f48 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d9d7368aa9bf77716fbfd0fcfa78fe48 resteasy-2.3.2.Final.tgz