commit fd8468d54ad2d6f15223bd607df0d6a02f14a06c
author cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Sat Mar 06 19:56:56 2010 +0000
committer cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Sat Mar 06 19:56:56 2010 +0000
tree c7fa6a01760d472e2de08c8a3cde681fa604df5c
parent 07f858ec43c29001f904bdbe4733f63d8145f376

Implemented [JACKSON-245], ability to enable JSONP wrapping for JAX-RS provider (for single static function name)

lib/jaxrs/jersey-core-1.1.5.jar

diff --git a/lib/jaxrs/jersey-core-1.1.5.jar b/lib/jaxrs/jersey-core-1.1.5.jar
new file mode 100644
index 0000000..097bfd8
--- /dev/null
+++ b/lib/jaxrs/jersey-core-1.1.5.jar
Binary files differ

lib/jaxrs/jersey-server-1.1.5.jar

diff --git a/lib/jaxrs/jersey-server-1.1.5.jar b/lib/jaxrs/jersey-server-1.1.5.jar
new file mode 100644
index 0000000..751660b
--- /dev/null
+++ b/lib/jaxrs/jersey-server-1.1.5.jar
Binary files differ

lib/jaxrs/jsr311-api-1.0.jar

diff --git a/lib/jaxrs/jsr311-api-1.0.jar b/lib/jaxrs/jsr311-api-1.0.jar
deleted file mode 100644
index 2bede66..0000000
--- a/lib/jaxrs/jsr311-api-1.0.jar
+++ /dev/null
Binary files differ

lib/jaxrs/jsr311-api-1.1.jar

diff --git a/lib/jaxrs/jsr311-api-1.1.jar b/lib/jaxrs/jsr311-api-1.1.jar
new file mode 100644
index 0000000..440c531
--- /dev/null
+++ b/lib/jaxrs/jsr311-api-1.1.jar
Binary files differ

release-notes/VERSION

diff --git a/release-notes/VERSION b/release-notes/VERSION
index dc29145..db3e189 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -43,6 +43,8 @@
   * [JACKSON-241] Add a mechanism for adding new "untouchable" types for
     JAX-RS JSON provider, to allow excluding types from being handled
     (added method "JacksonJsonProvider.addUntouchable()")
+  * [JACKSON-245] Add configuration setting in JAX-RS provider to allow
+    automatic JSONP wrapping (provider.setJSONPFunctionName())
 
   Backwards incompatible changes:
 

src/test/org/codehaus/jackson/jaxrs/TestJsonpWrapping.java

diff --git a/src/test/org/codehaus/jackson/jaxrs/TestJsonpWrapping.java b/src/test/org/codehaus/jackson/jaxrs/TestJsonpWrapping.java
new file mode 100644
index 0000000..849ff54
--- /dev/null
+++ b/src/test/org/codehaus/jackson/jaxrs/TestJsonpWrapping.java
@@ -0,0 +1,27 @@
+package org.codehaus.jackson.jaxrs;
+
+import java.io.*;
+import java.lang.annotation.Annotation;
+
+import javax.ws.rs.core.MediaType;
+
+public class TestJsonpWrapping
+    extends main.BaseTest
+{
+    public void testSimple() throws Exception
+    {
+        JacksonJsonProvider prov = new JacksonJsonProvider();
+        Object bean = new Integer[] { 1, 2, 3 };
+
+        // First: no JSONP wrapping:
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        prov.writeTo(bean, bean.getClass(), bean.getClass(), new Annotation[0], MediaType.APPLICATION_JSON_TYPE, null, out);
+        assertEquals("[1,2,3]", out.toString("UTF-8"));
+        
+        // then with wrapping:
+        prov.setJSONPFunctionName("addAll");
+        out = new ByteArrayOutputStream();
+        prov.writeTo(bean, bean.getClass(), bean.getClass(), new Annotation[0], MediaType.APPLICATION_JSON_TYPE, null, out);
+        assertEquals("addAll([1,2,3])", out.toString("UTF-8"));
+    }
+}

src/test/org/codehaus/jackson/main/TestJsonFactory.java

diff --git a/src/test/org/codehaus/jackson/main/TestJsonFactory.java b/src/test/org/codehaus/jackson/main/TestJsonFactory.java
index c88fc26..8975ab1 100644
--- a/src/test/org/codehaus/jackson/main/TestJsonFactory.java
+++ b/src/test/org/codehaus/jackson/main/TestJsonFactory.java
@@ -71,7 +71,7 @@
         jp.close();
 
         // Then via URL:
-        jp = f.createJsonParser(file.toURL());
+        jp = f.createJsonParser(file.toURI().toURL());
         assertToken(JsonToken.START_OBJECT, jp.nextToken());
         assertToken(JsonToken.END_OBJECT, jp.nextToken());
         assertNull(jp.nextToken());