users@jersey.java.net

FYI: Moved com.sun.ws.rest.impl.json.JSONJAXBContext to com.sun.jersey.api.json.JSONJAXBContext.

From: Paul Sandoz <Paul.Sandoz_at_Sun.COM>
Date: Fri, 16 May 2008 18:25:29 +0200

TODO: Need to ad JavaDoc.

Paul.

-- 
| ? + ? = To question
----------------\
    Paul Sandoz
         x38109
+33-4-76188109

attached mail follows:



Author: sandoz
Date: 2008-05-16 16:23:53+0000
New Revision: 1015

Added:
   trunk/jersey/src/api/com/sun/jersey/api/json/
   trunk/jersey/src/api/com/sun/jersey/api/json/JSONJAXBContext.java
      - copied, changed from r1014, /trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java
   trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONTransformer.java
Removed:
   trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java
Modified:
   trunk/jersey/changes.txt
   trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java
   trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java
   trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java
   trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java
   trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java
   trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java
   trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java
   trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java
   trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java
   trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java

Log:
Moved com.sun.ws.rest.impl.json.JSONJAXBContext to com.sun.jersey.api.json.JSONJAXBContext.

Modified: trunk/jersey/changes.txt
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/changes.txt?view=diff&rev=1015&p1=trunk/jersey/changes.txt&p2=trunk/jersey/changes.txt&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/changes.txt (original)
+++ trunk/jersey/changes.txt 2008-05-16 16:23:53+0000
@@ -1,4 +1,7 @@
 release 0.8 (2008-06-20 or 2008-07-25)
+- Moved com.sun.ws.rest.impl.json.JSONJAXBContext to
+ com.sun.jersey.api.json.JSONJAXBContext.
+- Removed JAX-WS container.
 - Set<T> and SortedSet<T> can be used in addition to List<T> for the type of
   @*Param annotation parameters.
 - Packages "com.sun.ws.rest.api.*" renamed to "com.sun.jersey.api.*"

Modified: trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java?view=diff&rev=1015&p1=trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java&p2=trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java (original)
+++ trunk/jersey/examples/JsonFromJaxb/src/java/com/sun/jersey/samples/jsonfromjaxb/config/JAXBContextResolver.java 2008-05-16 16:23:53+0000
@@ -22,7 +22,7 @@
 
 package com.sun.jersey.samples.jsonfromjaxb.config;
 
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.samples.jsonfromjaxb.jaxb.FlightType;
 import com.sun.jersey.samples.jsonfromjaxb.jaxb.Flights;
 import java.util.Arrays;

Modified: trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java?view=diff&rev=1015&p1=trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java&p2=trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java (original)
+++ trunk/jersey/examples/jMakiBackend/src/java/com/sun/jersey/samples/jmaki/config/JAXBContextResolver.java 2008-05-16 16:23:53+0000
@@ -21,7 +21,7 @@
  */
 package com.sun.jersey.samples.jmaki.config;
 
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.samples.jmaki.beans.Printer;
 import com.sun.jersey.samples.jmaki.beans.PrinterTableModel;
 import com.sun.jersey.samples.jmaki.beans.TreeModel;

Copied: trunk/jersey/src/api/com/sun/jersey/api/json/JSONJAXBContext.java (from r1014, /trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java)
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/api/com/sun/jersey/api/json/JSONJAXBContext.java?view=diff&rev=1015&p1=/trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java&p2=trunk/jersey/src/api/com/sun/jersey/api/json/JSONJAXBContext.java&r1=1014&r2=1015
==============================================================================
--- /trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java (original)
+++ trunk/jersey/src/api/com/sun/jersey/api/json/JSONJAXBContext.java 2008-05-16 16:23:53+0000
@@ -20,13 +20,12 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  */
 
-package com.sun.jersey.impl.json;
+package com.sun.jersey.api.json;
 
-import java.util.Collection;
+import com.sun.jersey.impl.json.JSONMarshaller;
+import com.sun.jersey.impl.json.JSONUnmarshaller;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.xml.bind.JAXBContext;
@@ -34,9 +33,6 @@
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.Validator;
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
 
 /**
  *
@@ -109,43 +105,4 @@
     private Map<String, Object> getJsonProperties() {
         return jsonProperties;
     }
-
- @SuppressWarnings("unchecked")
- static <T> Map<String, T> asMap(String jsonObjectVal) throws JSONException {
- if (null == jsonObjectVal) {
- return null;
- }
- Map<String, T> result = new HashMap<String, T>();
-
- JSONObject sourceMap = new JSONObject(jsonObjectVal);
- Iterator<String> keyIterator = sourceMap.keys();
- while (keyIterator.hasNext()) {
- String key = keyIterator.next();
- result.put(key, (T)sourceMap.get(key));
- }
- return result;
- }
-
-
- @SuppressWarnings("unchecked")
- static <T> Collection<T> asCollection(String jsonArrayVal) throws JSONException {
- if (null == jsonArrayVal) {
- return null;
- }
- Collection<T> result = new LinkedList<T>();
-
- JSONArray arrayVal = new JSONArray(jsonArrayVal);
- for (int i = 0; i < arrayVal.length(); i++) {
- result.add((T)arrayVal.get(i));
- }
- return result;
- }
-
- static String asJsonArray(Collection<? extends Object> collection) {
- return (null == collection) ? "[]" : (new JSONArray(collection)).toString();
- }
-
- static String asJsonObject(Map map) {
- return (null == map) ? "{}" : (new JSONObject(map)).toString();
- }
 }

Removed: trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONJAXBContext.java?view=auto&rev=1014

Modified: trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java?view=diff&rev=1015&p1=trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java&p2=trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java (original)
+++ trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONMarshaller.java 2008-05-16 16:23:53+0000
@@ -21,6 +21,7 @@
  */
 package com.sun.jersey.impl.json;
 
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.impl.json.writer.JsonXmlStreamWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -144,19 +145,19 @@
             this.jsonRootUnwrapping = (Boolean) value;
         } else if (JSONJAXBContext.JSON_ARRAYS.equals(key)) {
             try {
- this.arrays = JSONJAXBContext.asCollection((String) value);
+ this.arrays = JSONTransformer.asCollection((String) value);
             } catch (JSONException e) {
                 throw new PropertyException("JSON exception when trying to set " + JSONJAXBContext.JSON_ARRAYS + " property.", e);
             }
         } else if (JSONJAXBContext.JSON_NON_STRINGS.equals(key)) {
             try {
- this.nonStrings = JSONJAXBContext.asCollection((String) value);
+ this.nonStrings = JSONTransformer.asCollection((String) value);
             } catch (JSONException e) {
                 throw new PropertyException("JSON exception when trying to set " + JSONJAXBContext.JSON_NON_STRINGS + " property.", e);
             }
         } else if (JSONJAXBContext.JSON_XML2JSON_NS.equals(key)) {
             try {
- this.xml2jsonNamespace = JSONJAXBContext.asMap((String) value);
+ this.xml2jsonNamespace = JSONTransformer.asMap((String) value);
             } catch (JSONException e) {
                 throw new PropertyException("JSON exception when trying to set " + JSONJAXBContext.JSON_XML2JSON_NS + " property.", e);
             }
@@ -176,11 +177,11 @@
         } else if (JSONJAXBContext.JSON_ROOT_UNWRAPPING.equals(key)) {
             return this.jsonRootUnwrapping;
         } else if (JSONJAXBContext.JSON_ARRAYS.equals(key)) {
- return JSONJAXBContext.asJsonArray(this.arrays);
+ return JSONTransformer.asJsonArray(this.arrays);
         } else if (JSONJAXBContext.JSON_NON_STRINGS.equals(key)) {
- return JSONJAXBContext.asJsonArray(this.nonStrings);
+ return JSONTransformer.asJsonArray(this.nonStrings);
         } else if (JSONJAXBContext.JSON_XML2JSON_NS.equals(key)) {
- return JSONJAXBContext.asJsonObject(this.xml2jsonNamespace);
+ return JSONTransformer.asJsonObject(this.xml2jsonNamespace);
         } else {
             if (key.startsWith(JSONJAXBContext.NAMESPACE)) {
                 return null;

Added: trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONTransformer.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONTransformer.java?view=auto&rev=1015
==============================================================================
--- (empty file)
+++ trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONTransformer.java 2008-05-16 16:23:53+0000
@@ -0,0 +1,77 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of the Common Development
+ * and Distribution License("CDDL") (the "License"). You may not use this file
+ * except in compliance with the License.
+ *
+ * You can obtain a copy of the License at:
+ * https://jersey.dev.java.net/license.txt
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * When distributing the Covered Code, include this CDDL Header Notice in each
+ * file and include the License file at:
+ * https://jersey.dev.java.net/license.txt
+ * If applicable, add the following below this CDDL Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ */
+
+package com.sun.jersey.impl.json;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+
+/**
+ *
+ * @author ps23762
+ */
+final class JSONTransformer {
+ @SuppressWarnings("unchecked")
+ static <T> Map<String, T> asMap(String jsonObjectVal) throws JSONException {
+ if (null == jsonObjectVal) {
+ return null;
+ }
+ Map<String, T> result = new HashMap<String, T>();
+
+ JSONObject sourceMap = new JSONObject(jsonObjectVal);
+ Iterator<String> keyIterator = sourceMap.keys();
+ while (keyIterator.hasNext()) {
+ String key = keyIterator.next();
+ result.put(key, (T)sourceMap.get(key));
+ }
+ return result;
+ }
+
+
+ @SuppressWarnings("unchecked")
+ static <T> Collection<T> asCollection(String jsonArrayVal) throws JSONException {
+ if (null == jsonArrayVal) {
+ return null;
+ }
+ Collection<T> result = new LinkedList<T>();
+
+ JSONArray arrayVal = new JSONArray(jsonArrayVal);
+ for (int i = 0; i < arrayVal.length(); i++) {
+ result.add((T)arrayVal.get(i));
+ }
+ return result;
+ }
+
+ static String asJsonArray(Collection<? extends Object> collection) {
+ return (null == collection) ? "[]" : (new JSONArray(collection)).toString();
+ }
+
+ static String asJsonObject(Map map) {
+ return (null == map) ? "{}" : (new JSONObject(map)).toString();
+ }
+}

Modified: trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java?view=diff&rev=1015&p1=trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java&p2=trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java (original)
+++ trunk/jersey/src/impl/com/sun/jersey/impl/json/JSONUnmarshaller.java 2008-05-16 16:23:53+0000
@@ -19,8 +19,10 @@
  * enclosed by brackets [] replaced by your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
  */
+
 package com.sun.jersey.impl.json;
 
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.impl.json.reader.JsonXmlStreamReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -237,7 +239,7 @@
             this.jsonRootUnwrapping = (Boolean) value;
         } else if (JSONJAXBContext.JSON_XML2JSON_NS.equals(key)) {
             try {
- this.xml2jsonNamespace = JSONJAXBContext.asMap((String) value);
+ this.xml2jsonNamespace = JSONTransformer.asMap((String) value);
             } catch (JSONException e) {
                 throw new PropertyException("JSON exception when trying to set " + JSONJAXBContext.JSON_XML2JSON_NS + " property.", e);
             }
@@ -256,7 +258,7 @@
         } else if (JSONJAXBContext.JSON_ROOT_UNWRAPPING.equals(key)) {
             return this.jsonRootUnwrapping;
         } else if (JSONJAXBContext.JSON_XML2JSON_NS.equals(key)) {
- return JSONJAXBContext.asJsonObject(this.xml2jsonNamespace);
+ return JSONTransformer.asJsonObject(this.xml2jsonNamespace);
         } else {
             if (key.startsWith(JSONJAXBContext.NAMESPACE)) {
                 return null;

Modified: trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java?view=diff&rev=1015&p1=trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java&p2=trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java (original)
+++ trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONJAXBElementProvider.java 2008-05-16 16:23:53+0000
@@ -23,7 +23,7 @@
 package com.sun.jersey.impl.provider.entity;
 
 import com.sun.jersey.impl.ImplMessages;
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.impl.json.JSONMarshaller;
 import com.sun.jersey.impl.json.JSONUnmarshaller;
 import com.sun.jersey.impl.json.reader.JsonXmlStreamReader;

Modified: trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java?view=diff&rev=1015&p1=trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java&p2=trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java (original)
+++ trunk/jersey/src/impl/com/sun/jersey/impl/provider/entity/JSONRootElementProvider.java 2008-05-16 16:23:53+0000
@@ -23,7 +23,7 @@
 package com.sun.jersey.impl.provider.entity;
 
 import com.sun.jersey.impl.ImplMessages;
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.impl.json.JSONMarshaller;
 import com.sun.jersey.impl.json.JSONUnmarshaller;
 import com.sun.jersey.impl.json.reader.JsonXmlStreamReader;

Modified: trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java?view=diff&rev=1015&p1=trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java&p2=trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java (original)
+++ trunk/jersey/test/com/sun/jersey/impl/entity/CharsetTest.java 2008-05-16 16:23:53+0000
@@ -26,7 +26,7 @@
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import java.io.Reader;
 import java.io.StringReader;
 import javax.ws.rs.POST;

Modified: trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java?view=diff&rev=1015&p1=trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java&p2=trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java (original)
+++ trunk/jersey/test/com/sun/jersey/impl/json/JSONJAXBRoudtripTest.java 2008-05-16 16:23:53+0000
@@ -21,7 +21,7 @@
  */
 package com.sun.jersey.impl.json;
 
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.impl.json.JSONUnmarshaller;
 import com.sun.jersey.impl.json.JSONMarshaller;
 import com.sun.jersey.impl.test.util.TestHelper;

Modified: trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java?view=diff&rev=1015&p1=trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java&p2=trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java (original)
+++ trunk/jersey/test/com/sun/jersey/impl/json/JSONMarshallerTest.java 2008-05-16 16:23:53+0000
@@ -22,7 +22,7 @@
 
 package com.sun.jersey.impl.json;
 
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.logging.Level;

Modified: trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java
Url: https://jersey.dev.java.net/source/browse/jersey/trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java?view=diff&rev=1015&p1=trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java&p2=trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java&r1=1014&r2=1015
==============================================================================
--- trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java (original)
+++ trunk/jersey/test/com/sun/jersey/impl/json/JSONUnmarshallerTest.java 2008-05-16 16:23:53+0000
@@ -22,7 +22,7 @@
 
 package com.sun.jersey.impl.json;
 
-import com.sun.jersey.impl.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONJAXBContext;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.logging.Level;

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe_at_jersey.dev.java.net
For additional commands, e-mail: commits-help_at_jersey.dev.java.net