rpms/resteasy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream release 3.0.1.Final

Browse Source
This commit is contained in:
Marek Goldmann 2013-08-09 09:14:51 +02:00
parent 1dc5922184
commit aef3acddb9
10 changed files with 327 additions and 1588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/resteasy-2.3.2.Final.tgz
/3.0.1.Final.tar.gz

246
0001-Mime4j-0.7.2-support.patch Normal file
View File

@ -0,0 +1,246 @@
From 0e66cb23968c8ec56e4c26566790a8f09f380bca Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 16 Jul 2013 14:14:07 +0200
Subject: [PATCH] Mime4j 0.7.2 support
---
jaxrs/pom.xml | 14 ++++-
jaxrs/providers/multipart/pom.xml | 12 ++++-
.../multipart/MultipartFormDataInputImpl.java | 6 +--
.../providers/multipart/MultipartInputImpl.java | 61 ++++++++++------------
.../multipart/MultipartRelatedInputImpl.java | 4 +-
jaxrs/security/resteasy-crypto/pom.xml | 10 +++-
6 files changed, 64 insertions(+), 43 deletions(-)
mode change 100755 => 100644 jaxrs/pom.xml
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
old mode 100755
new mode 100644
index 062e8da..45e5e8d
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -251,8 +251,18 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- <version>0.6</version>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-storage</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>0.7.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/jaxrs/providers/multipart/pom.xml b/jaxrs/providers/multipart/pom.xml
index 16bdbd2..a6b25f0 100755
--- a/jaxrs/providers/multipart/pom.xml
+++ b/jaxrs/providers/multipart/pom.xml
@@ -34,7 +34,15 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-storage</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -81,4 +89,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
index d9ed2ad..b7aab17 100644
--- a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
+++ b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
@@ -1,9 +1,9 @@
package org.jboss.resteasy.plugins.providers.multipart;
-import org.apache.james.mime4j.field.ContentDispositionField;
-import org.apache.james.mime4j.field.FieldName;
+import org.apache.james.mime4j.dom.field.ContentDispositionField;
+import org.apache.james.mime4j.dom.field.FieldName;
import org.apache.james.mime4j.message.BodyPart;
-import org.apache.james.mime4j.parser.Field;
+import org.apache.james.mime4j.stream.Field;
import org.jboss.resteasy.util.GenericType;
import javax.ws.rs.core.MediaType;
diff --git a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
index 938c88e..01ddfa1 100644
--- a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
+++ b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
@@ -4,22 +4,22 @@ import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.MimeIOException;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
-import org.apache.james.mime4j.field.ContentTypeField;
-import org.apache.james.mime4j.message.BinaryBody;
-import org.apache.james.mime4j.message.Body;
+import org.apache.james.mime4j.message.MessageImpl;
+import org.apache.james.mime4j.parser.AbstractContentHandler;
+import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.message.BodyFactory;
+import org.apache.james.mime4j.dom.MessageBuilder;
+import org.apache.james.mime4j.dom.MessageServiceFactory;
+import org.apache.james.mime4j.dom.field.ContentTypeField;
+import org.apache.james.mime4j.dom.BinaryBody;
+import org.apache.james.mime4j.dom.Body;
+import org.apache.james.mime4j.dom.Entity;
import org.apache.james.mime4j.message.BodyPart;
-import org.apache.james.mime4j.message.Entity;
-import org.apache.james.mime4j.message.Message;
-import org.apache.james.mime4j.message.MessageBuilder;
-import org.apache.james.mime4j.message.Multipart;
-import org.apache.james.mime4j.message.TextBody;
-import org.apache.james.mime4j.parser.Field;
+import org.apache.james.mime4j.dom.Message;
+import org.apache.james.mime4j.dom.Multipart;
+import org.apache.james.mime4j.dom.TextBody;
+import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.storage.DefaultStorageProvider;
-import org.apache.james.mime4j.storage.StorageProvider;
-import org.apache.james.mime4j.util.CharsetUtil;
import org.apache.james.mime4j.util.MimeUtil;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
@@ -43,6 +43,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -65,7 +66,7 @@ public class MultipartInputImpl implements MultipartInput
protected String defaultPartCharset = null;
// We hack MIME4j so that it always returns a BinaryBody so we don't have to deal with Readers and their charset conversions
- private static class BinaryOnlyMessageBuilder extends MessageBuilder
+ private static class BinaryOnlyMessageBuilder extends AbstractContentHandler
{
private Method expectMethod;
private java.lang.reflect.Field bodyFactoryField;
@@ -88,18 +89,6 @@ public class MultipartInputImpl implements MultipartInput
}
}
- private BinaryOnlyMessageBuilder(Entity entity)
- {
- super(entity);
- init();
- }
-
- private BinaryOnlyMessageBuilder(Entity entity, StorageProvider storageProvider)
- {
- super(entity, storageProvider);
- init();
- }
-
@Override
public void body(BodyDescriptor bd, InputStream is) throws MimeException, IOException
{
@@ -143,13 +132,13 @@ public class MultipartInputImpl implements MultipartInput
}
}
- private static class BinaryMessage extends Message
+ private static class BinaryMessage extends MessageImpl
{
private BinaryMessage(InputStream is) throws IOException, MimeIOException
{
try {
- MimeStreamParser parser = new MimeStreamParser(null);
- parser.setContentHandler(new BinaryOnlyMessageBuilder(this, DefaultStorageProvider.getInstance()));
+ MimeStreamParser parser = new MimeStreamParser();
+ parser.setContentHandler(new BinaryOnlyMessageBuilder());
parser.parse(is);
} catch (MimeException e) {
throw new MimeIOException(e);
@@ -194,8 +183,14 @@ public class MultipartInputImpl implements MultipartInput
public void parse(InputStream is) throws IOException
{
- mimeMessage = new BinaryMessage(addHeaderToHeadlessStream(is));
- extractParts();
+ try {
+ MessageServiceFactory factory = MessageServiceFactory.newInstance();
+ MessageBuilder builder = factory.newMessageBuilder();
+ mimeMessage = builder.parseMessage(addHeaderToHeadlessStream(is));
+ extractParts();
+ } catch (MimeException e) {
+ throw new IOException("Couldn't parse message", e);
+ }
}
protected InputStream addHeaderToHeadlessStream(InputStream is)
@@ -225,8 +220,8 @@ public class MultipartInputImpl implements MultipartInput
protected void extractParts() throws IOException
{
Multipart multipart = (Multipart) mimeMessage.getBody();
- for (BodyPart bodyPart : multipart.getBodyParts())
- parts.add(extractPart(bodyPart));
+ for (Entity bodyPart : multipart.getBodyParts())
+ parts.add(extractPart((BodyPart) bodyPart));
}
protected InputPart extractPart(BodyPart bodyPart) throws IOException
diff --git a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
index 698f937..fa2d889 100644
--- a/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
+++ b/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
@@ -1,7 +1,7 @@
package org.jboss.resteasy.plugins.providers.multipart;
-import org.apache.james.mime4j.field.ContentTypeField;
-import org.apache.james.mime4j.field.FieldName;
+import org.apache.james.mime4j.dom.field.ContentTypeField;
+import org.apache.james.mime4j.dom.field.FieldName;
import org.apache.james.mime4j.message.BodyPart;
import javax.ws.rs.core.MediaType;
diff --git a/jaxrs/security/resteasy-crypto/pom.xml b/jaxrs/security/resteasy-crypto/pom.xml
index 855f791..bd23c9f 100755
--- a/jaxrs/security/resteasy-crypto/pom.xml
+++ b/jaxrs/security/resteasy-crypto/pom.xml
@@ -70,7 +70,15 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-storage</artifactId>
</dependency>
</dependencies>
<build>
--
1.8.3.1

75
resteasy-2.3.2.Final-Removed-Tomcat-6-dependency.patch
View File

@ -1,75 +0,0 @@
From dff39e93cefe92475caa1008cd7c3c1e2d0b3752 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Wed, 3 Apr 2013 14:07:34 -0400
Subject: [PATCH] Removed Tomcat 6 dependency
---
async-http-servlet-3.0/async-http-servlet-3.0/pom.xml | 2 +-
pom.xml | 6 +++---
resteasy-jaxrs/pom.xml | 4 ++--
tjws/pom.xml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml b/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
index 480582611cbb4a89dff781775f53f72a1ee468d3..a1f6d889a50ff5b8fb1e273455afa7b98ce80258 100644
--- a/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
+++ b/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
@@ -16,7 +16,7 @@
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.1.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 2f72f897e62633fab1f074a3059045825a99a269..4b4f734599fab99acb46a28a5290f4576651444c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,9 +238,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
+ <version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
diff --git a/resteasy-jaxrs/pom.xml b/resteasy-jaxrs/pom.xml
index 36d546096dde31d5b0255ff30fa2ac46379d18ed..b256334bc5d03e403c70649ec9d484c0cb02d6f7 100644
--- a/resteasy-jaxrs/pom.xml
+++ b/resteasy-jaxrs/pom.xml
@@ -25,8 +25,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/tjws/pom.xml b/tjws/pom.xml
index 1f703262dbcd6ac3facfb3b59bb8c59999cb9c0a..e95bb6ad9c326394285ed7231180a8d5b57d6a98 100644
--- a/tjws/pom.xml
+++ b/tjws/pom.xml
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
--
1.8.1.4

36
resteasy-2.3.2.Final-fix-javadoc.patch
View File

@ -1,36 +0,0 @@
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 <stef@epardaud.fr>
+ * @author Stephane Epardaud <stef@epardaud.fr>
*/
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 <stef@epardaud.fr>
+ * @author Stephane Epardaud <stef@epardaud.fr>
*/
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 <stef@epardaud.fr>
+ * @author Stephane Epardaud <stef@epardaud.fr>
*/
public class ServiceRegistry
{

836
resteasy-2.3.2.Final-fix-tests.patch
View File

@ -1,836 +0,0 @@
From 8ea0ef0589de63e3b1861fe4020a654808d375ff Mon Sep 17 00:00:00 2001
From: Juan Hernandez <juan.hernandez@redhat.com>
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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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<Float> 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<Double> 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

113
resteasy-2.3.2.Final-mime4j-0.7.2.patch
View File

@ -1,113 +0,0 @@
diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
index 6763d4e..cc41e2f 100644
--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
@@ -10,10 +10,10 @@ import java.util.Map;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Providers;
-import org.apache.james.mime4j.field.ContentDispositionField;
-import org.apache.james.mime4j.field.FieldName;
+import org.apache.james.mime4j.dom.field.ContentDispositionField;
+import org.apache.james.mime4j.dom.field.FieldName;
import org.apache.james.mime4j.message.BodyPart;
-import org.apache.james.mime4j.parser.Field;
+import org.apache.james.mime4j.stream.Field;
import org.jboss.resteasy.util.GenericType;
/**
diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
index 2865174..d5a1e0c 100644
--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
@@ -1,14 +1,18 @@
package org.jboss.resteasy.plugins.providers.multipart;
-import org.apache.james.mime4j.field.ContentTypeField;
-import org.apache.james.mime4j.message.BinaryBody;
-import org.apache.james.mime4j.message.Body;
+import org.apache.james.mime4j.dom.MessageBuilder;
+import org.apache.james.mime4j.dom.MessageServiceFactory;
+import org.apache.james.mime4j.dom.field.ContentTypeField;
+import org.apache.james.mime4j.dom.BinaryBody;
+import org.apache.james.mime4j.dom.Body;
+import org.apache.james.mime4j.dom.Entity;
import org.apache.james.mime4j.message.BodyPart;
-import org.apache.james.mime4j.message.Message;
-import org.apache.james.mime4j.message.Multipart;
-import org.apache.james.mime4j.message.TextBody;
-import org.apache.james.mime4j.parser.Field;
+import org.apache.james.mime4j.dom.Message;
+import org.apache.james.mime4j.dom.Multipart;
+import org.apache.james.mime4j.dom.TextBody;
+import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.util.CharsetUtil;
+import org.apache.james.mime4j.MimeException;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.jboss.resteasy.util.CaseInsensitiveMap;
@@ -29,6 +33,7 @@ import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -73,8 +78,14 @@ public class MultipartInputImpl implements MultipartInput
public void parse(InputStream is) throws IOException
{
- mimeMessage = new Message(addHeaderToHeadlessStream(is));
- extractParts();
+ try {
+ MessageServiceFactory factory = MessageServiceFactory.newInstance();
+ MessageBuilder builder = factory.newMessageBuilder();
+ mimeMessage = builder.parseMessage(addHeaderToHeadlessStream(is));
+ extractParts();
+ } catch (MimeException e) {
+ throw new IOException("Couldn't parse message", e);
+ }
}
protected InputStream addHeaderToHeadlessStream(InputStream is)
@@ -104,8 +115,8 @@ public class MultipartInputImpl implements MultipartInput
protected void extractParts() throws IOException
{
Multipart multipart = (Multipart) mimeMessage.getBody();
- for (BodyPart bodyPart : multipart.getBodyParts())
- parts.add(extractPart(bodyPart));
+ for (Entity bodyPart : multipart.getBodyParts())
+ parts.add(extractPart((BodyPart) bodyPart));
}
protected InputPart extractPart(BodyPart bodyPart) throws IOException
@@ -197,8 +208,11 @@ public class MultipartInputImpl implements MultipartInput
try
{
String charset = contentType.getParameters().get("charset");
- if (charset != null)
- charset = CharsetUtil.toJavaCharset(charset);
+ if (charset != null) {
+ Charset c = CharsetUtil.lookup(charset);
+ if (c != null)
+ charset = c.name();
+ }
inputStreamReader = charset == null ? new InputStreamReader(
inputStream)
: new InputStreamReader(inputStream, charset);
diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
index da7f0b7..2063a76 100644
--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
@@ -8,8 +8,8 @@ import java.util.Map;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Providers;
-import org.apache.james.mime4j.field.ContentTypeField;
-import org.apache.james.mime4j.field.FieldName;
+import org.apache.james.mime4j.dom.field.ContentTypeField;
+import org.apache.james.mime4j.dom.field.FieldName;
import org.apache.james.mime4j.message.BodyPart;
/**

38
resteasy-2.3.2.Final-remove-currently-unbuilt-modules.patch
View File

@ -1,38 +0,0 @@
diff --git a/pom.xml b/pom.xml
index 455d6ee..2ce1d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,22 +86,11 @@
<module>resteasy-test-data</module>
<module>resteasy-jaxrs</module>
<module>providers</module>
- <module>resteasy-jaxrs-war</module>
<module>resteasy-bom</module>
- <module>resteasy-cache</module>
<module>resteasy-guice</module>
- <module>eagledns</module>
- <module>security</module>
- <module>resteasy-links</module>
- <module>async-http-jbossweb</module>
- <module>async-http-tomcat</module>
- <module>resteasy-spring</module>
<module>resteasy-jsapi</module>
<module>resteasy-cdi</module>
- <module>war-tests</module>
- <module>examples</module>
<module>async-http-servlet-3.0</module>
- <module>profiling-tests</module>
</modules>
<dependencyManagement>
diff --git a/providers/pom.xml b/providers/pom.xml
index b4b5518..eb9826b 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -25,6 +25,5 @@
<module>yaml</module>
<module>resteasy-html</module>
<module>test-resteasy-html</module>
- <module>resteasy-hibernatevalidator-provider</module>
</modules>
</project>

305
resteasy-2.3.2.Final-remove-dependenciesA.patch
View File

@ -1,305 +0,0 @@
diff --git a/async-http-jbossweb/async-http-jbossweb-jar/pom.xml b/async-http-jbossweb/async-http-jbossweb-jar/pom.xml
index 4a31c8b..80b5a58 100644
--- a/async-http-jbossweb/async-http-jbossweb-jar/pom.xml
+++ b/async-http-jbossweb/async-http-jbossweb-jar/pom.xml
@@ -14,9 +14,8 @@
<dependencies>
<dependency>
- <groupId>jboss.web</groupId>
+ <groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>2.1.7.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -46,4 +45,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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 @@
<dependencies>
<dependency>
- <groupId>jboss.web</groupId>
+ <groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>2.1.7.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -51,4 +50,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 455d6ee..5250f81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,8 +255,8 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- <version>0.6</version>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>0.7.2</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
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 @@
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>3.0.3.RELEASE</version>
- </dependency>
- <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${project.version}</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 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
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 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
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 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/providers/multipart/pom.xml b/providers/multipart/pom.xml
index 9acdfb4..c4cef26 100644
--- a/providers/multipart/pom.xml
+++ b/providers/multipart/pom.xml
@@ -34,7 +34,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -70,4 +74,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
<!--
<dependency>
<groupId>tjws</groupId>
diff --git a/providers/test-all-jaxb/pom.xml b/providers/test-all-jaxb/pom.xml
index a4f72a1..2fec2f6 100644
--- a/providers/test-all-jaxb/pom.xml
+++ b/providers/test-all-jaxb/pom.xml
@@ -69,6 +69,11 @@
<scope>test</scope>
</dependency>
-->
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ </dependency>
+
</dependencies>
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 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!--
<dependency>
<groupId>tjws</groupId>
diff --git a/resteasy-guice/pom.xml b/resteasy-guice/pom.xml
index 2990ce0..52892c4 100644
--- a/resteasy-guice/pom.xml
+++ b/resteasy-guice/pom.xml
@@ -14,9 +14,8 @@
<dependencies>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -48,4 +47,4 @@
</dependency>
-->
</dependencies>
-</project>
\ No newline at end of file
+</project>
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?
-->
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
-
- <!-- javax.activation.DataSource provider is required by spec -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
</dependency>
<!-- Used for org.jboss.resteasy.plugins.client.httpclient.* -->
@@ -83,11 +77,6 @@
<artifactId>httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </dependency>
-
<!-- Used by org.jboss.resteasy.plugins.server.tjws.* -->
<!--
<dependency>
diff --git a/resteasy-spring/pom.xml b/resteasy-spring/pom.xml
index aa7cdd2..ae4fe77 100644
--- a/resteasy-spring/pom.xml
+++ b/resteasy-spring/pom.xml
@@ -125,14 +125,8 @@
detected runtime?
-->
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
-
- <!-- javax.activation.DataSource provider is required by spec -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
</dependency>
<!-- Used for org.jboss.resteasy.plugins.client.httpclient.* -->
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 @@
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
- <!-- javax.activation.DataSource provider is required by spec -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
+ <artifactId>maven-jaxb22-plugin</artifactId>
<version>0.7.3</version>
<dependencies>
- <!-- javax.activation.DataSource provider is required by spec -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>

263
resteasy.spec
View File

@ -1,26 +1,16 @@
%global namedreltag .Final
%global namedversion %{version}%{namedreltag}
Name: resteasy
Version: 2.3.2
Release: 14%{?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
Name: resteasy
Version: 3.0.1
Release: 1%{?dist}
Summary: Framework for RESTful Web services and Java applications
License: ASL 2.0 and CDDL
URL: http://www.jboss.org/resteasy
Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}.tar.gz
# 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
# Support for mime4j 0.7.2
Patch4: %{name}-%{namedversion}-mime4j-0.7.2.patch
Patch5: %{name}-%{namedversion}-Removed-Tomcat-6-dependency.patch
Patch0: 0001-Mime4j-0.7.2-support.patch
BuildArch: noarch
@ -33,52 +23,48 @@ BuildRequires: apache-mime4j >= 0:0.7.2-2
BuildRequires: apache-james-project
BuildRequires: bea-stax
BuildRequires: bean-validation-api
BuildRequires: bouncycastle
BuildRequires: bouncycastle-mail
BuildRequires: cglib
BuildRequires: classmate
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: hibernate-validator
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: hsqldb
BuildRequires: httpunit
BuildRequires: jackson
BuildRequires: infinispan
BuildRequires: jackson-databind
BuildRequires: jackson-module-jaxb-annotations
BuildRequires: jackson-annotations
BuildRequires: jackson-core
BuildRequires: jackson-jaxrs-json-provider
BuildRequires: jakarta-commons-httpclient
BuildRequires: javamail
BuildRequires: javassist
BuildRequires: jandex >= 1.0.3-4
# BuildRequires: jboss-ejb3-ext-api
# BuildRequires: jbosscache-core
BuildRequires: jandex
BuildRequires: jboss-servlet-2.5-api
BuildRequires: jboss-servlet-3.0-api
# BuildRequires: jboss-web
BuildRequires: jcip-annotations
BuildRequires: jettison
BuildRequires: jetty
BuildRequires: jetty-server
BuildRequires: junit4
# BuildRequires: jyaml
# BuildRequires: liblog4j-java
# BuildRequires: oauth
BuildRequires: netty
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: cdi-api
BuildRequires: xerces-j2
#BuildRequires: findbugs-maven-plugin
BuildRequires: picketbox
BuildRequires: springframework-webmvc
BuildRequires: jetty-version-maven-plugin
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
@ -94,67 +80,8 @@ 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
Requires: apache-mime4j >= 0:0.7.2-2
# B:
Requires: bea-stax
Requires: bouncycastle
Requires: bouncycastle-mail
# C:
Requires: cglib
Requires: cdi-api
# 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: jboss-servlet-2.5-api
Requires: jboss-servlet-3.0-api
Requires: jcip-annotations
Requires: jettison
Requires: jpackage-utils
# S:
Requires: scannotation
Requires: slf4j
Requires: snakeyaml
# T:
Requires: tomcat-el-2.2-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
@ -162,109 +89,77 @@ 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}
%setup -q -n Resteasy-%{namedversion}
%patch0 -p1 -b .p0
%patch1 -p1 -b .p1
%patch2 -p1 -b .p2
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Disable unnecesary modules
%pom_disable_module examples jaxrs/pom.xml
%pom_disable_module profiling-tests jaxrs/pom.xml
%pom_disable_module resteasy-test-data jaxrs/pom.xml
%pom_disable_module war-tests jaxrs/pom.xml
%pom_disable_module eagledns jaxrs/pom.xml
%pom_disable_module resteasy-links jaxrs/pom.xml
%pom_disable_module jboss-modules jaxrs/pom.xml
%pom_disable_module resteasy-oauth jaxrs/security/pom.xml
%pom_disable_module login-module-authenticator jaxrs/security/pom.xml
%pom_disable_module skeleton-key-idm jaxrs/security/pom.xml
%pom_disable_module keystone/keystone-as7 jaxrs/security/pom.xml
%pom_disable_module keystone/keystone-as7-modules jaxrs/security/pom.xml
%pom_disable_module async-http-servlet-3.0-test jaxrs/async-http-servlet-3.0/pom.xml
%pom_disable_module resteasy-hibernatevalidator-provider jaxrs/providers/pom.xml
# Replace 2.5 servlet with the jboss-servlet-2.5-api provides
for m in jaxrs/tjws; do
%pom_remove_dep "javax.servlet:servlet-api" ${m}/pom.xml
%pom_add_dep "org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec" ${m}/pom.xml
done
%pom_add_dep "javax.validation:validation-api:1" jaxrs/providers/resteasy-validator-provider-11/pom.xml
# Need to be patched to work with Jetty 9
rm jaxrs/resteasy-spring/src/main/java/org/jboss/resteasy/springmvc/JettyLifecycleManager.java
%pom_remove_dep "org.springframework:spring-test" jaxrs/resteasy-spring/pom.xml
%pom_remove_dep "org.mortbay.jetty:jetty" jaxrs/resteasy-spring/pom.xml
%pom_add_dep "org.eclipse.jetty:jetty-server" jaxrs/resteasy-spring/pom.xml
# Fixing JDK7 ASCII issues
files='
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java
'
for f in ${files}; do
native2ascii -encoding UTF8 ${f} ${f}
done
%patch0 -p1
%build
mvn-rpmbuild -Dmaven.test.skip=true -e install javadoc:aggregate
%mvn_build -f
%install
rm -rf %{buildroot}
%mvn_install
# 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}
%files -f .mfiles
%dir %{_javadir}/%{name}
%doc jaxrs/License.html jaxrs/README.html
# Install jars, poms and dependencies maps:
while read module_path artifact_id additional_aid_gid
do
base_name=${module_path}/target/${artifact_id}-%{namedversion}
jar_file=${base_name}.jar
jandex_file=${base_name}-jandex.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
# Create also the Jandex index files
# Required by JBoss AS7
java -cp $(build-classpath jandex) org.jboss.jandex.Main -j ${jar_file}
install -pm 644 ${jandex_file} %{buildroot}%{_javadir}/%{name}/${artifact_id}-jandex.jar
if [ -z "${additional_aid_gid}" ]
then
%add_maven_depmap JPP.%{name}-${artifact_id}.pom %{name}/${artifact_id}.jar
else
%add_maven_depmap JPP.%{name}-${artifact_id}.pom %{name}/${artifact_id}.jar -a ${additional_aid_gid}
fi
else
%add_maven_depmap JPP.%{name}-${artifact_id}.pom
fi
done <<'.'
. jaxrs-all
async-http-servlet-3.0 asynch-http-servlet-3.0
async-http-servlet-3.0/async-http-servlet-3.0 async-http-servlet-3.0
jaxrs-api jaxrs-api org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec
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/multipart resteasy-multipart-provider
providers/yaml resteasy-yaml-provider
resteasy-bom resteasy-bom
resteasy-guice resteasy-guice
resteasy-jaxrs resteasy-jaxrs
resteasy-jsapi resteasy-jsapi
resteasy-cdi resteasy-cdi
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
# eagledns eagledns-fork
# providers/resteasy-hibernatevalidator-provider resteasy-hibernatevalidator-provider
# resteasy-cache/resteasy-cache-core resteasy-cache-core
# 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
%files javadoc -f .mfiles-javadoc
%doc jaxrs/License.html
%changelog
* Fri Aug 09 2013 Marek Goldmann <mgoldman@redhat.com> - 3.0.1-1
- Upstream release 3.0.1.Final
- Using xmvn
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
d9d7368aa9bf77716fbfd0fcfa78fe48 resteasy-2.3.2.Final.tgz
c649ab36f12e92eed55ba1d6883f1b1d 3.0.1.Final.tar.gz