juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phau...@apache.org
Subject [2/2] incubator-juneau git commit: Merge remote-tracking branch 'origin/master'
Date Sun, 09 Oct 2016 01:56:25 GMT
Merge remote-tracking branch 'origin/master'

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/8dde0c9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/8dde0c9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/8dde0c9d

Branch: refs/heads/master
Commit: 8dde0c9dba486335c19c8e4d57886a828c2461d2
Parents: c747cff 7f2bcfd
Author: Peter Haumer <phaumer@apache.org>
Authored: Sat Oct 8 18:56:09 2016 -0700
Committer: Peter Haumer <phaumer@apache.org>
Committed: Sat Oct 8 18:56:09 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/juneau/BeanContext.java     |   2 +-
 .../main/java/org/apache/juneau/BeanMeta.java   |   2 +-
 .../org/apache/juneau/BeanPropertyMeta.java     |  12 +-
 .../main/java/org/apache/juneau/ClassMeta.java  |   2 +-
 .../java/org/apache/juneau/annotation/Bean.java |   8 +-
 .../juneau/annotation/BeanConstructor.java      |   4 +-
 .../apache/juneau/annotation/BeanProperty.java  |   4 +-
 .../org/apache/juneau/annotation/Consumes.java  |  10 +-
 .../org/apache/juneau/annotation/Produces.java  |   6 +-
 .../org/apache/juneau/dto/cognos/Column.java    |   2 +-
 .../org/apache/juneau/dto/cognos/DataSet.java   |   2 +-
 .../apache/juneau/dto/jsonschema/Schema.java    |  11 +-
 .../apache/juneau/dto/jsonschema/package.html   |   2 +-
 .../org/apache/juneau/dto/swagger/Contact.java  | 118 +++
 .../dto/swagger/ExternalDocumentation.java      |  93 ++
 .../org/apache/juneau/dto/swagger/Header.java   | 582 +++++++++++
 .../org/apache/juneau/dto/swagger/Info.java     | 205 ++++
 .../org/apache/juneau/dto/swagger/Items.java    | 558 +++++++++++
 .../org/apache/juneau/dto/swagger/License.java  |  93 ++
 .../apache/juneau/dto/swagger/Operation.java    | 611 ++++++++++++
 .../apache/juneau/dto/swagger/Parameter.java    | 776 +++++++++++++++
 .../org/apache/juneau/dto/swagger/Response.java | 194 ++++
 .../org/apache/juneau/dto/swagger/Schema.java   | 718 ++++++++++++++
 .../juneau/dto/swagger/SecurityScheme.java      | 315 ++++++
 .../org/apache/juneau/dto/swagger/Swagger.java  | 688 +++++++++++++
 .../java/org/apache/juneau/dto/swagger/Tag.java | 121 +++
 .../java/org/apache/juneau/dto/swagger/Xml.java | 173 ++++
 .../org/apache/juneau/dto/swagger/package.html  |  58 ++
 .../java/org/apache/juneau/html/HtmlParser.java |  44 +-
 .../org/apache/juneau/html/HtmlSerializer.java  |  53 +-
 .../juneau/html/HtmlSerializerContext.java      |  15 +-
 .../juneau/html/HtmlSerializerSession.java      |  14 +-
 .../java/org/apache/juneau/html/HtmlWriter.java |   2 +-
 .../java/org/apache/juneau/ini/package.html     |   4 +-
 .../org/apache/juneau/internal/FileUtils.java   | 100 ++
 .../apache/juneau/internal/ReflectionUtils.java |  30 +
 .../java/org/apache/juneau/jena/package.html    |  90 +-
 .../java/org/apache/juneau/json/JsonParser.java |   2 +-
 .../juneau/json/JsonSchemaSerializer.java       |   2 +-
 .../org/apache/juneau/json/JsonSerializer.java  |   4 +-
 .../java/org/apache/juneau/json/package.html    |  58 +-
 .../apache/juneau/msgpack/MsgPackParser.java    |   2 +-
 .../juneau/msgpack/MsgPackSerializer.java       |   2 +-
 .../main/java/org/apache/juneau/package.html    |   2 +-
 .../java/org/apache/juneau/parser/Parser.java   |   2 +-
 .../java/org/apache/juneau/parser/package.html  |   2 +-
 .../apache/juneau/serializer/Serializer.java    |   4 +-
 .../org/apache/juneau/serializer/package.html   |   2 +-
 .../transform/AnnotationBeanFilterBuilder.java  |   9 +-
 .../org/apache/juneau/transform/package.html    |   2 +-
 .../juneau/urlencoding/UonSerializer.java       |   4 +-
 .../urlencoding/UrlEncodingSerializer.java      |   4 +-
 .../org/apache/juneau/urlencoding/package.html  |  60 +-
 .../java/org/apache/juneau/xml/Namespace.java   |   2 +-
 .../java/org/apache/juneau/xml/XmlParser.java   |   2 +-
 .../java/org/apache/juneau/xml/package.html     |  60 +-
 juneau-core/src/main/javadoc/overview.html      | 237 ++---
 .../java/org/apache/juneau/AnnotationsTest.java |   2 +-
 .../java/org/apache/juneau/BeanConfigTest.java  |   4 +-
 .../juneau/a/rttests/RoundTripBeanMapsTest.java |   4 +-
 .../juneau/a/rttests/RoundTripGenericsTest.java |   2 +-
 .../juneau/a/rttests/RoundTripMapsTest.java     |   3 +-
 .../a/rttests/RoundTripReadOnlyBeansTest.java   |   4 +-
 .../apache/juneau/a/rttests/RoundTripTest.java  |  33 +-
 .../java/org/apache/juneau/html/CommonTest.java |  38 +-
 .../java/org/apache/juneau/html/HtmlTest.java   |  86 +-
 .../java/org/apache/juneau/jena/CommonTest.java |  14 +-
 .../java/org/apache/juneau/json/CommonTest.java |  14 +-
 .../juneau/transforms/BeanFilterTest.java       |   2 +-
 .../juneau/transforms/CalendarSwapTest.java     |   6 +-
 .../juneau/urlencoding/Common_UonTest.java      |  14 +-
 .../urlencoding/Common_UrlEncodingTest.java     |  14 +-
 .../java/org/apache/juneau/xml/CommonTest.java  |  14 +-
 .../org/apache/juneau/xml/XmlCollapsedTest.java |   4 +-
 .../java/org/apache/juneau/xml/XmlTest.java     |   4 +-
 .../microservice/sample/HelloWorldResource.java |   2 +-
 .../microservice/sample/RootResources.java      |   2 +-
 .../microservice/sample/nls/Messages.properties |   2 +-
 .../org/apache/juneau/microservice/package.html |   2 +-
 .../microservice/resources/ConfigEdit.html      |   2 +-
 .../microservice/resources/ConfigResource.java  |  47 +-
 .../resources/DirectoryResource.java            |   2 +-
 .../microservice/resources/LogsResource.java    |  16 +-
 .../resources/SampleRootResource.java           |   2 +-
 .../resources/ShutdownResource.java             |   2 +-
 .../juneau/server/samples/AtomFeedResource.java |   2 +-
 .../server/samples/CodeFormatterResource.java   |   2 +-
 .../server/samples/DockerRegistryResource.java  |   4 +-
 .../server/samples/JsonSchemaResource.java      |   2 +-
 .../server/samples/MethodExampleResource.java   |  16 +-
 .../juneau/server/samples/PhotosResource.java   |  12 +-
 .../juneau/server/samples/SourceResource.java   |   2 +-
 .../juneau/server/samples/SqlQueryResource.java |   2 +-
 .../server/samples/TumblrParserResource.java    |   2 +-
 .../server/samples/UrlEncodedFormResource.java  |   2 +-
 .../addressbook/AddressBookResource.java        |  51 +-
 .../server/samples/TempDirUploadPage.html       |   2 +-
 .../juneau/server/samples/UrlEncodedForm.html   |   2 +-
 .../nls/AddressBookResource.properties          | 129 +--
 .../samples/nls/AtomFeedResource.properties     |   2 +-
 .../nls/CodeFormatterResource.properties        |   2 +-
 .../samples/nls/HelloWorldResource.properties   |   2 +-
 .../samples/nls/JsonSchemaResource.properties   |   2 +-
 .../nls/MethodExampleResource.properties        |  42 +-
 .../samples/nls/PhotosResource.properties       |   2 +-
 .../samples/nls/RequestEchoResource.properties  |   2 +-
 .../server/samples/nls/RootResources.properties |   2 +-
 .../nls/SampleRemoteableServlet.properties      |   2 +-
 .../samples/nls/SourceResource.properties       |   2 +-
 .../samples/nls/SqlQueryResource.properties     |   2 +-
 .../samples/nls/TempDirResource.properties      |   2 +-
 .../samples/nls/TumblrParserResource.properties |   2 +-
 .../nls/UrlEncodedFormResource.properties       |   2 +-
 .../server/samples/RootResourcesTest.java       |  11 +-
 .../server/test/AcceptCharsetResource.java      |   2 +-
 .../test/BeanContextPropertiesResource.java     |   2 +-
 .../server/test/CallbackStringsResource.java    |   4 +-
 .../server/test/CharsetEncodingsResource.java   |   2 +-
 .../juneau/server/test/ConfigResource.java      |   2 +-
 .../juneau/server/test/ContentResource.java     |  18 +-
 .../test/DefaultContentTypesResource.java       |  12 +-
 .../server/test/ErrorConditionsResource.java    |  14 +-
 .../juneau/server/test/GroupsResource.java      |   6 +-
 .../apache/juneau/server/test/GzipResource.java |   4 +-
 .../juneau/server/test/InheritanceResource.java |   2 +-
 .../juneau/server/test/LargePojosResource.java  |   2 +-
 .../apache/juneau/server/test/NlsResource.java  |  70 +-
 .../server/test/NoParserInputResource.java      |  12 +-
 .../juneau/server/test/OnPostCallResource.java  |   2 +-
 .../juneau/server/test/OnPreCallResource.java   |   6 +-
 .../server/test/OptionsWithoutNlsResource.java  |   6 +-
 .../juneau/server/test/ParamsResource.java      |  86 +-
 .../juneau/server/test/ParsersResource.java     |  12 +-
 .../juneau/server/test/PropertiesResource.java  |   5 +-
 .../juneau/server/test/RestClient2Resource.java |   2 +-
 .../juneau/server/test/SerializersResource.java |   2 +-
 .../juneau/server/test/TransformsResource.java  |   8 +-
 .../juneau/server/test/UrlContentResource.java  |   8 +-
 .../juneau/server/test/NlsResource.properties   |  98 +-
 .../juneau/server/test/CallbackStringsTest.java |   2 +-
 .../apache/juneau/server/test/ContentTest.java  | 264 ++---
 .../juneau/server/test/ErrorConditionsTest.java |   4 +-
 .../org/apache/juneau/server/test/NlsTest.java  | 119 +--
 .../juneau/server/test/NoParserInputTest.java   |   6 +-
 .../server/test/OptionsWithoutNlsTest.java      |   6 +-
 .../apache/juneau/server/test/ParamsTest.java   |  26 +-
 .../juneau/server/test/UrlContentTest.java      |  16 +-
 .../org/apache/juneau/server/RestRequest.java   | 110 ++-
 .../org/apache/juneau/server/RestServlet.java   | 965 +++++++++++++++----
 .../juneau/server/RestServletContext.java       | 149 +--
 .../juneau/server/RestServletDefault.java       |   8 +-
 .../apache/juneau/server/annotation/Attr.java   |  74 --
 .../apache/juneau/server/annotation/Body.java   |  58 ++
 .../juneau/server/annotation/Content.java       |  58 --
 .../juneau/server/annotation/FormData.java      |  98 ++
 .../juneau/server/annotation/HasFormData.java   |  95 ++
 .../juneau/server/annotation/HasParam.java      |  95 --
 .../juneau/server/annotation/HasQParam.java     |  61 --
 .../juneau/server/annotation/HasQuery.java      |  61 ++
 .../apache/juneau/server/annotation/Param.java  |  98 --
 .../apache/juneau/server/annotation/Path.java   |  74 ++
 .../apache/juneau/server/annotation/QParam.java |  94 --
 .../apache/juneau/server/annotation/Query.java  |  94 ++
 .../juneau/server/annotation/Response.java      |  24 +-
 .../juneau/server/annotation/RestMethod.java    | 199 ++--
 .../juneau/server/annotation/RestResource.java  | 236 ++++-
 .../apache/juneau/server/annotation/Var.java    | 116 ++-
 .../juneau/server/annotation/VarCategory.java   |  36 -
 .../org/apache/juneau/server/jaxrs/package.html |  34 +-
 .../server/jena/RestServletJenaDefault.java     |   8 +-
 .../juneau/server/labels/BeanDescription.java   |   2 +-
 .../labels/ChildResourceDescriptions.java       |   2 +-
 .../juneau/server/labels/DefaultLabels.java     |  78 --
 .../juneau/server/labels/MethodDescription.java | 350 -------
 .../juneau/server/labels/NameDescription.java   |   2 +-
 .../juneau/server/labels/ParamDescription.java  | 103 --
 .../juneau/server/labels/ResourceOptions.java   | 252 -----
 .../org/apache/juneau/server/labels/Var.java    |  87 --
 .../java/org/apache/juneau/server/package.html  | 182 ++--
 .../server/remoteable/RemoteableServlet.java    |   4 +-
 .../apache/juneau/server/vars/RequestVar.java   |   6 +-
 .../org/apache/juneau/server/styles/devops.css  |   8 +-
 182 files changed, 8459 insertions(+), 3126 deletions(-)
----------------------------------------------------------------------



Mime
View raw message