Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Created a top-level chapter for media types support #1

Merged
merged 1 commit into from

3 participants

Martin Matula BuildHive Pavel Bucek
Martin Matula
  • moved json and xml under that, added multipart.
Martin Matula

testing gerrit/java.net sync

Pavel Bucek pavelbucek was assigned
Pavel Bucek pavelbucek merged commit 1a1d21e into from
Marek Potociar mpotociar referenced this pull request from a commit
Marek Potociar mpotociar Introduced client-side ChunkedInput.
+ some minor fixes.
+ incorporated changes based on PatchSet #1 review feedback.

Change-Id: I290774876e888dd1c489fcec4bab11210ae9cd95
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
b51a32e
Marek Potociar mpotociar referenced this pull request from a commit
Marek Potociar mpotociar Jersey internal server injection clean-up part #1.
- introduced internal RequestProcessingContext class
- refactored all server module processing stages to use the new RequestProcessingContext
- removed RoutingContext retrieval via injection and providers.
- removed RoutingBinder and all related injection bindings.
- removed RespondingContext retrieval via injection.
- moved request-scoped monitoring support to RequestProcessingContext
- deprecated the unused ResourceModelContext & ResourceModelListener
- cleaned-up some minor TODOs ...and added some new TODOs :)

Change-Id: I00ec15f30b9c7ac411468da2238a7e2f38721872
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
65a8bb1
Marek Potociar mpotociar referenced this pull request from a commit
Marek Potociar mpotociar Jersey internal server injection clean-up part #1.
- introduced internal RequestProcessingContext class
- refactored all server module processing stages to use the new RequestProcessingContext
- removed RoutingContext retrieval via injection and providers.
- removed RoutingBinder and all related injection bindings.
- removed RespondingContext retrieval via injection.
- moved request-scoped monitoring support to RequestProcessingContext
- deprecated the unused ResourceModelContext & ResourceModelListener
- cleaned-up some minor TODOs ...and added some new TODOs :)

- Cherry-picked on 2.6.x branch

Change-Id: Id0b44b6c2bbce173859e7dc28eb5d6fbea836fc0
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
92d3a22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 23, 2012
  1. Martin Matula

    Created a top-level chapter for media types support - moved json and …

    mmatula authored
    …xml under that, added multipart.
This page is out of date. Refresh to see the latest.
52 docs/src/main/docbook/json.xml
View
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright (c) 2012 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
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can
- obtain a copy of the License at
- http://glassfish.java.net/public/CDDL+GPL_1_1.html
- or packager/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at packager/legal/LICENSE.txt.
-
- GPL Classpath Exception:
- Oracle designates this particular file as subject to the "Classpath"
- exception as provided by Oracle in the GPL Version 2 section of the License
- file that accompanied this code.
-
- Modifications:
- If applicable, add the following below the License Header, with the fields
- enclosed by brackets [] replaced by your own identifying information:
- "Portions Copyright [year] [name of copyright owner]"
-
- Contributor(s):
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
-
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"[
-<!ENTITY % ents SYSTEM "jersey.ent" >
-%ents;
-]>
-
-<chapter id="json">
- <title>JSON Support</title>
- TODO: Describe support for JSON (various notations/options)
-</chapter>
15 docs/src/main/docbook/xml.xml → docs/src/main/docbook/media.xml
View
@@ -46,7 +46,18 @@
%ents;
]>
-<chapter id="xml">
- <title>XML Support</title>
+<chapter id="media">
+ <title>Support for Common Media Types</title>
+ <section id="json">
+ <title>JSON</title>
+ TODO: Describe support for JSON (various notations/options)
+ </section>
+ <section id="xml">
+ <title>XML</title>
TODO: Describe support for XML
+ </section>
+ <section id="multipart">
+ <title>Multipart</title>
+ TODO: Describe support for multipart
+ </section>
</chapter>
Something went wrong with that request. Please try again.