Index: nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusJsonProvider.java =================================================================== --- nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusJsonProvider.java (revision 63290) +++ nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusJsonProvider.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,16 +43,15 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import java.util.Collection; import java.util.Set; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; -import org.codehaus.jackson.JsonEncoding; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; +import com.fasterxml.jackson.core.JsonEncoding; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.glassfish.api.admin.ProgressStatus; import org.glassfish.api.admin.progress.ProgressStatusBase; import org.glassfish.api.admin.progress.ProgressStatusBase.ChildProgressStatus; @@ -64,18 +63,18 @@ @Provider @Produces({MediaType.APPLICATION_JSON, "application/x-javascript"}) public class ProgressStatusJsonProvider extends BaseProvider { - + private static final JsonFactory factory = new JsonFactory(); - + public ProgressStatusJsonProvider() { super(ProgressStatus.class, MediaType.APPLICATION_JSON_TYPE, new MediaType("application", "x-javascript")); } - + @Override protected boolean isGivenTypeWritable(Class type, Type genericType) { return desiredType.isAssignableFrom(type); } - + @Override public void writeTo(ProgressStatusBase proxy, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { @@ -85,7 +84,7 @@ out.writeEndObject(); out.flush(); } - + public void writeJson(String name, ProgressStatusBase ps, int allocatedSteps, JsonGenerator out) throws IOException { if (ps == null) { return; @@ -118,5 +117,5 @@ public String getContent(ProgressStatusBase proxy) { throw new UnsupportedOperationException("Not supported yet."); } - + } Index: nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusEventJsonProvider.java =================================================================== --- nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusEventJsonProvider.java (revision 63290) +++ nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ProgressStatusEventJsonProvider.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -49,9 +49,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; -import org.codehaus.jackson.JsonEncoding; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; +import com.fasterxml.jackson.core.JsonEncoding; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.glassfish.api.admin.progress.ProgressStatusEvent; import org.glassfish.api.admin.progress.ProgressStatusEventComplete; import org.glassfish.api.admin.progress.ProgressStatusEventCreateChild; @@ -65,18 +65,18 @@ @Provider @Produces({MediaType.APPLICATION_JSON, "application/x-javascript"}) public class ProgressStatusEventJsonProvider extends BaseProvider { - + private static final JsonFactory factory = new JsonFactory(); - + public ProgressStatusEventJsonProvider() { super(ProgressStatusEvent.class, MediaType.APPLICATION_JSON_TYPE, new MediaType("application", "x-javascript")); } - + @Override protected boolean isGivenTypeWritable(Class type, Type genericType) { return desiredType.isAssignableFrom(type); } - + @Override public void writeTo(ProgressStatusEvent proxy, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { @@ -86,7 +86,7 @@ out.writeEndObject(); out.flush(); } - + private void writePSEvent(ProgressStatusEvent event, JsonGenerator out) throws IOException { if (event == null) { return; @@ -101,10 +101,10 @@ writePSEventComplete((ProgressStatusEventComplete) event, out); } else if (event instanceof ProgressStatusEventCreateChild) { writePSEventCreateChild((ProgressStatusEventCreateChild) event, out); - } else + } else out.writeEndObject(); } - + private void writePSEventSet(ProgressStatusEventSet event, JsonGenerator out) throws IOException { out.writeObjectFieldStart("set"); if (event.getTotalStepCount() != null) { @@ -115,7 +115,7 @@ } out.writeEndObject(); } - + private void writePSEventProgress(ProgressStatusEventProgress event, JsonGenerator out) throws IOException { out.writeObjectFieldStart("progres"); out.writeNumberField("steps", event.getSteps()); @@ -127,7 +127,7 @@ } out.writeEndObject(); } - + private void writePSEventComplete(ProgressStatusEventComplete event, JsonGenerator out) throws IOException { out.writeObjectFieldStart("complete"); if (StringUtils.ok(event.getMessage())) { @@ -135,7 +135,7 @@ } out.writeEndObject(); } - + private void writePSEventCreateChild(ProgressStatusEventCreateChild event, JsonGenerator out) throws IOException { out.writeObjectFieldStart("create-child"); out.writeStringField("id", event.getChildId()); @@ -146,10 +146,10 @@ } out.writeEndObject(); } - + @Override public String getContent(ProgressStatusEvent proxy) { throw new UnsupportedOperationException("Not supported yet."); } - + } Index: nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusEventJsonProprietaryReader.java =================================================================== --- nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusEventJsonProprietaryReader.java (revision 63290) +++ nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusEventJsonProprietaryReader.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -42,9 +42,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.glassfish.api.admin.progress.ProgressStatusEvent; import org.glassfish.api.admin.progress.ProgressStatusEventComplete; import org.glassfish.api.admin.progress.ProgressStatusEventCreateChild; @@ -56,14 +56,14 @@ * @author mmares */ public class ProgressStatusEventJsonProprietaryReader implements ProprietaryReader { - + private static final JsonFactory factory = new JsonFactory(); - + @Override public boolean isReadable(Class type, String mimetype) { return type.isAssignableFrom(ProgressStatusEvent.class); } - + public ProgressStatusEvent readFrom(HttpURLConnection urlConnection) throws IOException { return readFrom(urlConnection.getInputStream(), urlConnection.getContentType()); } @@ -75,7 +75,7 @@ JsonToken token = jp.nextToken(); //sorounding object jp.nextToken(); //Name progress-status-event JsonToken token2 = jp.nextToken(); - if (token != JsonToken.START_OBJECT || + if (token != JsonToken.START_OBJECT || token2 != JsonToken.START_OBJECT || !"progress-status-event".equals(jp.getCurrentName())) { throw new IOException("Not expected type (progress-status-event) but (" + jp.getCurrentName() + ")"); @@ -85,7 +85,7 @@ jp.close(); } } - + public static ProgressStatusEvent readProgressStatusEvent(JsonParser jp) throws IOException { String id = null; JsonToken token = null; @@ -116,7 +116,7 @@ } return result; } - + public static void readToPSEventSet(ProgressStatusEventSet event, JsonParser jp) throws IOException { while (jp.nextToken() != JsonToken.END_OBJECT) { String fieldname = jp.getCurrentName(); @@ -128,7 +128,7 @@ } } } - + public static void readToPSEventProgress(ProgressStatusEventProgress event, JsonParser jp) throws IOException { while (jp.nextToken() != JsonToken.END_OBJECT) { String fieldname = jp.getCurrentName(); @@ -142,7 +142,7 @@ } } } - + public static void readToPSEventComplete(ProgressStatusEventComplete event, JsonParser jp) throws IOException { while (jp.nextToken() != JsonToken.END_OBJECT) { String fieldname = jp.getCurrentName(); @@ -152,7 +152,7 @@ } } } - + public static void readToPSEventCreateChild(ProgressStatusEventCreateChild event, JsonParser jp) throws IOException { while (jp.nextToken() != JsonToken.END_OBJECT) { String fieldname = jp.getCurrentName(); Index: nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusDTOJsonProprietaryReader.java =================================================================== --- nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusDTOJsonProprietaryReader.java (revision 63290) +++ nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ProgressStatusDTOJsonProprietaryReader.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -42,9 +42,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.glassfish.api.admin.progress.ProgressStatusDTO; import org.glassfish.api.admin.progress.ProgressStatusDTO.ChildProgressStatusDTO; @@ -53,14 +53,14 @@ * @author mmares */ public class ProgressStatusDTOJsonProprietaryReader implements ProprietaryReader { - + private static final JsonFactory factory = new JsonFactory(); - + @Override public boolean isReadable(Class type, String mimetype) { return type.isAssignableFrom(ProgressStatusDTO.class); } - + public ProgressStatusDTO readFrom(final HttpURLConnection urlConnection) throws IOException { return readFrom(urlConnection.getInputStream(), urlConnection.getContentType()); } @@ -72,7 +72,7 @@ JsonToken token = jp.nextToken(); //sorounding object jp.nextToken(); //Name progress-status JsonToken token2 = jp.nextToken(); - if (token != JsonToken.START_OBJECT || + if (token != JsonToken.START_OBJECT || token2 != JsonToken.START_OBJECT || !"progress-status".equals(jp.getCurrentName())) { throw new IOException("Not expected type (progress-status) but (" + jp.getCurrentName() + ")"); @@ -87,7 +87,7 @@ ChildProgressStatusDTO child = readChildProgressStatus(jp); return child.getProgressStatus(); } - + public static ChildProgressStatusDTO readChildProgressStatus(JsonParser jp) throws IOException { ProgressStatusDTO psd = new ProgressStatusDTO(); int allocatedSteps = 0; Index: nucleus/admin/util/pom.xml =================================================================== --- nucleus/admin/util/pom.xml (revision 63290) +++ nucleus/admin/util/pom.xml (working copy) @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -50,7 +50,7 @@ admin-util glassfish-jar - + admin-util Admin Utilities @@ -174,8 +174,8 @@ provided - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base Index: nucleus/pom.xml =================================================================== --- nucleus/pom.xml (revision 63290) +++ nucleus/pom.xml (working copy) @@ -154,8 +154,8 @@ 4.0.0-b001 4.1.2 2.7.6 - 2.8 - 1.9.11 + 2.9 + 2.3.2 1.3.3 2.0 1.9.4 @@ -747,23 +747,28 @@ ${javax.annotation-api.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base ${jackson.version} - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-core ${jackson.version} + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.core + jackson-databind ${jackson.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider ${jackson.version} @@ -1026,7 +1031,7 @@ org.glassfish.external asm-all 3.3 - + Index: nucleus/packager/nucleus-jersey/pom.xml =================================================================== --- nucleus/packager/nucleus-jersey/pom.xml (revision 63290) +++ nucleus/packager/nucleus-jersey/pom.xml (working copy) @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -103,22 +103,26 @@ javax.ws.rs-api - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.core + jackson-databind - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + org.codehaus.jettison jettison