Rename server and client projects.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/91a388d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/91a388d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/91a388d0 Branch: refs/heads/master Commit: 91a388d0d864498c8db755568072672aa87f7d9d Parents: 4fb0103 Author: JamesBognar <[email protected]> Authored: Sat Jan 21 18:29:24 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Sat Jan 21 18:29:24 2017 -0500 ---------------------------------------------------------------------- juneau-all/pom.xml | 8 +- juneau-client/.gitignore | 3 - juneau-client/.project | 30 - juneau-client/pom.xml | 82 - .../apache/juneau/client/AllowAllRedirects.java | 29 - .../org/apache/juneau/client/DateHeader.java | 41 - .../org/apache/juneau/client/HttpMethod.java | 61 - .../apache/juneau/client/NameValuePairs.java | 46 - .../apache/juneau/client/ResponsePattern.java | 136 - .../java/org/apache/juneau/client/RestCall.java | 925 ----- .../apache/juneau/client/RestCallException.java | 151 - .../juneau/client/RestCallInterceptor.java | 60 - .../apache/juneau/client/RestCallLogger.java | 120 - .../org/apache/juneau/client/RestClient.java | 1443 ------- .../apache/juneau/client/RestRequestEntity.java | 88 - .../java/org/apache/juneau/client/RetryOn.java | 37 - .../java/org/apache/juneau/client/SSLOpts.java | 184 - .../juneau/client/SerializedNameValuePair.java | 83 - .../juneau/client/SimpleX509TrustManager.java | 66 - .../java/org/apache/juneau/client/package.html | 857 ----- juneau-client/src/test/java/.gitignore | 12 - juneau-distrib/pom.xml | 8 +- juneau-microservice/.project | 4 +- juneau-microservice/pom.xml | 4 +- .../apache/juneau/microservice/Resource.java | 4 +- .../juneau/microservice/ResourceGroup.java | 4 +- .../juneau/microservice/ResourceJena.java | 4 +- .../juneau/microservice/RestMicroservice.java | 2 +- .../org/apache/juneau/microservice/package.html | 50 +- .../microservice/resources/ConfigResource.java | 4 +- .../resources/DirectoryResource.java | 10 +- .../microservice/resources/LogsResource.java | 10 +- .../resources/SampleRootResource.java | 2 +- .../resources/ShutdownResource.java | 2 +- juneau-releng/launches/Package Juneau.launch | 2 +- juneau-rest-client/.gitignore | 3 + juneau-rest-client/.project | 30 + juneau-rest-client/pom.xml | 82 + .../juneau/rest/client/AllowAllRedirects.java | 29 + .../apache/juneau/rest/client/DateHeader.java | 41 + .../apache/juneau/rest/client/HttpMethod.java | 61 + .../juneau/rest/client/NameValuePairs.java | 46 + .../juneau/rest/client/ResponsePattern.java | 136 + .../org/apache/juneau/rest/client/RestCall.java | 925 +++++ .../juneau/rest/client/RestCallException.java | 151 + .../juneau/rest/client/RestCallInterceptor.java | 60 + .../juneau/rest/client/RestCallLogger.java | 120 + .../apache/juneau/rest/client/RestClient.java | 1443 +++++++ .../juneau/rest/client/RestRequestEntity.java | 88 + .../org/apache/juneau/rest/client/RetryOn.java | 37 + .../org/apache/juneau/rest/client/SSLOpts.java | 184 + .../rest/client/SerializedNameValuePair.java | 83 + .../rest/client/SimpleX509TrustManager.java | 66 + .../org/apache/juneau/rest/client/package.html | 857 +++++ juneau-rest-test/.gitignore | 4 + juneau-rest-test/.project | 28 + juneau-rest-test/juneau-rest-test.cfg | 111 + juneau-rest-test/juneau-rest-test.launch | 29 + juneau-rest-test/pom.xml | 70 + .../juneau/rest/test/AcceptCharsetResource.java | 76 + .../test/BeanContextPropertiesResource.java | 44 + .../rest/test/CallbackStringsResource.java | 53 + .../rest/test/CharsetEncodingsResource.java | 55 + .../juneau/rest/test/ClientVersionResource.java | 93 + .../apache/juneau/rest/test/ConfigResource.java | 38 + .../juneau/rest/test/ContentResource.java | 81 + .../java/org/apache/juneau/rest/test/DTO2s.java | 139 + .../rest/test/DefaultContentTypesResource.java | 128 + .../rest/test/ErrorConditionsResource.java | 135 + .../apache/juneau/rest/test/GroupsResource.java | 72 + .../apache/juneau/rest/test/GzipResource.java | 111 + .../juneau/rest/test/InheritanceResource.java | 317 ++ .../org/apache/juneau/rest/test/LargePojo.java | 45 + .../juneau/rest/test/LargePojosResource.java | 39 + .../juneau/rest/test/MessagesResource.java | 62 + .../juneau/rest/test/NlsPropertyResource.java | 61 + .../apache/juneau/rest/test/NlsResource.java | 193 + .../juneau/rest/test/NoParserInputResource.java | 56 + .../juneau/rest/test/OnPostCallResource.java | 94 + .../juneau/rest/test/OnPreCallResource.java | 85 + .../rest/test/OptionsWithoutNlsResource.java | 44 + .../rest/test/OverlappingMethodsResource.java | 146 + .../apache/juneau/rest/test/ParamsResource.java | 293 ++ .../juneau/rest/test/ParsersResource.java | 112 + .../apache/juneau/rest/test/PathResource.java | 69 + .../apache/juneau/rest/test/PathsResource.java | 73 + .../juneau/rest/test/PropertiesResource.java | 89 + .../juneau/rest/test/RestClient2Resource.java | 36 + .../java/org/apache/juneau/rest/test/Root.java | 71 + .../juneau/rest/test/SerializersResource.java | 103 + .../juneau/rest/test/StaticFilesResource.java | 36 + .../rest/test/TransformsParentResource.java | 26 + .../juneau/rest/test/TransformsResource.java | 114 + .../apache/juneau/rest/test/UrisResource.java | 121 + .../juneau/rest/test/UrlContentResource.java | 59 + .../rest/test/Messages2Resource.properties | 16 + .../rest/test/MessagesResource.properties | 16 + .../rest/test/NlsPropertyResource.properties | 16 + .../juneau/rest/test/NlsResource.properties | 71 + .../org/apache/juneau/rest/test/xdocs/test.txt | 13 + .../juneau/rest/test/xdocs/xdocs/test.txt | 13 + .../juneau/rest/test/AcceptCharsetTest.java | 123 + .../rest/test/BeanContextPropertiesTest.java | 37 + .../juneau/rest/test/CallbackStringsTest.java | 50 + .../juneau/rest/test/CharsetEncodingsTest.java | 96 + .../juneau/rest/test/ClientVersionTest.java | 90 + .../org/apache/juneau/rest/test/ConfigTest.java | 59 + .../org/apache/juneau/rest/test/Constants.java | 53 + .../apache/juneau/rest/test/ContentTest.java | 706 ++++ .../java/org/apache/juneau/rest/test/DTOs.java | 139 + .../rest/test/DefaultContentTypesTest.java | 497 +++ .../juneau/rest/test/ErrorConditionsTest.java | 219 ++ .../org/apache/juneau/rest/test/GroupsTest.java | 122 + .../org/apache/juneau/rest/test/GzipTest.java | 344 ++ .../juneau/rest/test/InheritanceTest.java | 126 + .../juneau/rest/test/JacocoDummyTest.java | 38 + .../apache/juneau/rest/test/LargePojosTest.java | 84 + .../apache/juneau/rest/test/MessagesTest.java | 47 + .../juneau/rest/test/NlsPropertyTest.java | 48 + .../org/apache/juneau/rest/test/NlsTest.java | 115 + .../juneau/rest/test/NoParserInputTest.java | 70 + .../apache/juneau/rest/test/OnPostCallTest.java | 121 + .../apache/juneau/rest/test/OnPreCallTest.java | 61 + .../juneau/rest/test/OptionsWithoutNlsTest.java | 51 + .../rest/test/OverlappingMethodsTest.java | 170 + .../org/apache/juneau/rest/test/ParamsTest.java | 716 ++++ .../apache/juneau/rest/test/ParsersTest.java | 162 + .../org/apache/juneau/rest/test/PathTest.java | 44 + .../org/apache/juneau/rest/test/PathsTest.java | 1368 +++++++ .../apache/juneau/rest/test/PropertiesTest.java | 48 + .../apache/juneau/rest/test/RestClientTest.java | 199 + .../apache/juneau/rest/test/RestUtilsTest.java | 188 + .../juneau/rest/test/SerializersTest.java | 152 + .../juneau/rest/test/StaticFilesTest.java | 56 + .../apache/juneau/rest/test/TestRestClient.java | 69 + .../org/apache/juneau/rest/test/TestUtils.java | 60 + .../apache/juneau/rest/test/TransformsTest.java | 68 + .../org/apache/juneau/rest/test/UrisTest.java | 918 +++++ .../apache/juneau/rest/test/UrlContentTest.java | 74 + .../juneau/rest/test/UrlPathPatternTest.java | 40 + .../org/apache/juneau/rest/test/_TestSuite.java | 92 + juneau-rest/.gitignore | 3 + juneau-rest/.project | 30 + juneau-rest/pom.xml | 87 + .../juneau/rest/ClientVersionMatcher.java | 50 + .../org/apache/juneau/rest/ReaderResource.java | 99 + .../java/org/apache/juneau/rest/Redirect.java | 138 + .../org/apache/juneau/rest/ResponseHandler.java | 92 + .../org/apache/juneau/rest/RestConverter.java | 74 + .../org/apache/juneau/rest/RestException.java | 135 + .../java/org/apache/juneau/rest/RestGuard.java | 95 + .../org/apache/juneau/rest/RestMatcher.java | 76 + .../juneau/rest/RestMatcherReflecting.java | 33 + .../org/apache/juneau/rest/RestRequest.java | 1870 +++++++++ .../org/apache/juneau/rest/RestResponse.java | 425 +++ .../org/apache/juneau/rest/RestServlet.java | 3393 +++++++++++++++++ .../apache/juneau/rest/RestServletContext.java | 353 ++ .../apache/juneau/rest/RestServletDefault.java | 233 ++ .../juneau/rest/RestServletException.java | 47 + .../juneau/rest/RestServletGroupDefault.java | 41 + .../java/org/apache/juneau/rest/RestUtils.java | 248 ++ .../org/apache/juneau/rest/StreamResource.java | 89 + .../org/apache/juneau/rest/UrlPathPattern.java | 159 + .../org/apache/juneau/rest/annotation/Body.java | 57 + .../apache/juneau/rest/annotation/FormData.java | 96 + .../juneau/rest/annotation/HasFormData.java | 94 + .../apache/juneau/rest/annotation/HasQuery.java | 59 + .../apache/juneau/rest/annotation/Header.java | 52 + .../apache/juneau/rest/annotation/Inherit.java | 32 + .../apache/juneau/rest/annotation/Messages.java | 50 + .../apache/juneau/rest/annotation/Method.java | 49 + .../juneau/rest/annotation/Parameter.java | 180 + .../org/apache/juneau/rest/annotation/Path.java | 72 + .../juneau/rest/annotation/PathRemainder.java | 46 + .../juneau/rest/annotation/Properties.java | 64 + .../apache/juneau/rest/annotation/Property.java | 63 + .../apache/juneau/rest/annotation/Query.java | 92 + .../apache/juneau/rest/annotation/Response.java | 87 + .../juneau/rest/annotation/RestMethod.java | 505 +++ .../juneau/rest/annotation/RestResource.java | 592 +++ .../apache/juneau/rest/annotation/package.html | 41 + .../juneau/rest/converters/Introspectable.java | 59 + .../juneau/rest/converters/Queryable.java | 96 + .../juneau/rest/converters/Traversable.java | 67 + .../apache/juneau/rest/converters/package.html | 41 + .../juneau/rest/doc-files/AddressBook.png | Bin 0 -> 44553 bytes .../juneau/rest/doc-files/AddressBookJson.png | Bin 0 -> 30639 bytes .../rest/doc-files/AddressBookOptions.png | Bin 0 -> 224346 bytes .../rest/doc-files/AddressBook_juneaustyle.png | Bin 0 -> 52768 bytes .../rest/doc-files/HelloWorldResource1.png | Bin 0 -> 14206 bytes .../rest/doc-files/HelloWorldResource2.png | Bin 0 -> 30721 bytes .../rest/doc-files/HelloWorldResource3.png | Bin 0 -> 11040 bytes .../rest/doc-files/HelloWorldResource4.png | Bin 0 -> 16188 bytes .../doc-files/HelloWorldResourceOptions.png | Bin 0 -> 172104 bytes .../doc-files/HelloWorldResourceOptionsJson.png | Bin 0 -> 167174 bytes .../apache/juneau/rest/doc-files/Options2.png | Bin 0 -> 9809 bytes .../juneau/rest/doc-files/OptionsPage.png | Bin 0 -> 56895 bytes .../rest/doc-files/Samples_RootResources.png | Bin 0 -> 62372 bytes .../juneau/rest/doc-files/UrlEncodedForm.png | Bin 0 -> 21379 bytes .../apache/juneau/rest/jaxrs/BaseProvider.java | 189 + .../juneau/rest/jaxrs/DefaultProvider.java | 71 + .../juneau/rest/jaxrs/JuneauProvider.java | 96 + .../org/apache/juneau/rest/jaxrs/package.html | 360 ++ .../rest/jaxrs/rdf/DefaultJenaProvider.java | 91 + .../apache/juneau/rest/jaxrs/rdf/package.html | 34 + .../rest/jena/RestServletJenaDefault.java | 272 ++ .../rest/jena/RestServletJenaGroupDefault.java | 41 + .../org/apache/juneau/rest/jena/package.html | 47 + .../main/java/org/apache/juneau/rest/juneau.ico | Bin 0 -> 39438 bytes .../juneau/rest/labels/BeanDescription.java | 70 + .../rest/labels/ChildResourceDescriptions.java | 61 + .../juneau/rest/labels/NameDescription.java | 72 + .../juneau/rest/labels/ResourceDescription.java | 106 + .../apache/juneau/rest/labels/ResourceLink.java | 66 + .../org/apache/juneau/rest/labels/package.html | 41 + .../rest/matchers/MultipartFormDataMatcher.java | 26 + .../rest/matchers/UrlEncodedFormMatcher.java | 26 + .../apache/juneau/rest/matchers/package.html | 34 + .../java/org/apache/juneau/rest/package.html | 3560 ++++++++++++++++++ .../remoteable/RemoteableServiceProperties.java | 37 + .../rest/remoteable/RemoteableServlet.java | 152 + .../juneau/rest/remoteable/doc-files/1.png | Bin 0 -> 15845 bytes .../juneau/rest/remoteable/doc-files/2.png | Bin 0 -> 20379 bytes .../juneau/rest/remoteable/doc-files/3.png | Bin 0 -> 33919 bytes .../juneau/rest/remoteable/doc-files/4.png | Bin 0 -> 21108 bytes .../juneau/rest/remoteable/doc-files/5.png | Bin 0 -> 10553 bytes .../juneau/rest/remoteable/doc-files/6.png | Bin 0 -> 24934 bytes .../apache/juneau/rest/remoteable/package.html | 356 ++ .../juneau/rest/response/DefaultHandler.java | 88 + .../rest/response/InputStreamHandler.java | 42 + .../juneau/rest/response/ReaderHandler.java | 40 + .../juneau/rest/response/RedirectHandler.java | 48 + .../juneau/rest/response/StreamableHandler.java | 51 + .../juneau/rest/response/WritableHandler.java | 51 + .../response/ZipFileListResponseHandler.java | 62 + .../apache/juneau/rest/response/package.html | 41 + .../juneau/rest/vars/LocalizationVar.java | 54 + .../org/apache/juneau/rest/vars/RequestVar.java | 123 + .../rest/vars/SerializedRequestAttrVar.java | 64 + .../juneau/rest/vars/ServletInitParamVar.java | 46 + .../apache/juneau/rest/vars/UrlEncodeVar.java | 43 + .../org/apache/juneau/rest/vars/package.html | 41 + .../rest/htdocs/MethodExampleResource1.png | Bin 0 -> 12276 bytes .../org/apache/juneau/rest/htdocs/javadoc.css | 794 ++++ .../rest/labels/nls/DefaultLabels.properties | 41 + .../org/apache/juneau/rest/styles/devops.css | 202 + .../org/apache/juneau/rest/styles/juneau.css | 141 + juneau-samples/.project | 4 +- juneau-samples/pom.xml | 2 +- juneau-samples/samples.cfg | 2 +- .../apache/juneau/rest/samples/AdminGuard.java | 26 + .../juneau/rest/samples/AtomFeedResource.java | 103 + .../rest/samples/CodeFormatterResource.java | 50 + .../apache/juneau/rest/samples/Constants.java | 28 + .../juneau/rest/samples/DirectoryResource.java | 234 ++ .../rest/samples/DockerRegistryResource.java | 88 + .../juneau/rest/samples/HelloWorldResource.java | 38 + .../juneau/rest/samples/JsonSchemaResource.java | 74 + .../rest/samples/MethodExampleResource.java | 91 + .../juneau/rest/samples/PhotosResource.java | 142 + .../rest/samples/RequestEchoResource.java | 60 + .../juneau/rest/samples/RootResources.java | 55 + .../rest/samples/SampleRemoteableServlet.java | 55 + .../juneau/rest/samples/SourceResource.java | 112 + .../juneau/rest/samples/SqlQueryResource.java | 128 + .../rest/samples/SystemPropertiesResource.java | 153 + .../juneau/rest/samples/TempDirResource.java | 77 + .../rest/samples/TumblrParserResource.java | 87 + .../rest/samples/UrlEncodedFormResource.java | 53 + .../addressbook/AddressBookResource.java | 320 ++ .../rest/samples/addressbook/ClientTest.java | 107 + .../samples/addressbook/IAddressBook.java | 2 +- .../juneau/server/samples/AdminGuard.java | 26 - .../juneau/server/samples/AtomFeedResource.java | 104 - .../server/samples/CodeFormatterResource.java | 50 - .../apache/juneau/server/samples/Constants.java | 28 - .../server/samples/DirectoryResource.java | 234 -- .../server/samples/DockerRegistryResource.java | 88 - .../server/samples/HelloWorldResource.java | 38 - .../server/samples/JsonSchemaResource.java | 74 - .../server/samples/MethodExampleResource.java | 91 - .../juneau/server/samples/PhotosResource.java | 142 - .../server/samples/RequestEchoResource.java | 60 - .../juneau/server/samples/RootResources.java | 55 - .../server/samples/SampleRemoteableServlet.java | 55 - .../juneau/server/samples/SourceResource.java | 112 - .../juneau/server/samples/SqlQueryResource.java | 128 - .../samples/SystemPropertiesResource.java | 153 - .../juneau/server/samples/TempDirResource.java | 77 - .../server/samples/TumblrParserResource.java | 87 - .../server/samples/UrlEncodedFormResource.java | 53 - .../addressbook/AddressBookResource.java | 320 -- .../server/samples/addressbook/ClientTest.java | 107 - .../rest/samples/CodeFormatterResource.html | 68 + .../juneau/rest/samples/SqlQueryResource.html | 66 + .../juneau/rest/samples/TempDirUploadPage.html | 34 + .../juneau/rest/samples/UrlEncodedForm.html | 62 + .../nls/AddressBookResource.properties | 89 + .../apache/juneau/rest/samples/averycutecat.jpg | Bin 0 -> 318563 bytes .../rest/samples/htdocs/code-highlighting.css | 136 + .../samples/nls/AtomFeedResource.properties | 21 + .../nls/CodeFormatterResource.properties | 18 + .../samples/nls/HelloWorldResource.properties | 19 + .../samples/nls/JsonSchemaResource.properties | 20 + .../nls/MethodExampleResource.properties | 37 + .../rest/samples/nls/PhotosResource.properties | 24 + .../samples/nls/RequestEchoResource.properties | 19 + .../rest/samples/nls/RootResources.properties | 18 + .../nls/SampleRemoteableServlet.properties | 17 + .../rest/samples/nls/SourceResource.properties | 19 + .../samples/nls/SqlQueryResource.properties | 19 + .../rest/samples/nls/TempDirResource.properties | 18 + .../samples/nls/TumblrParserResource.properties | 19 + .../nls/UrlEncodedFormResource.properties | 22 + .../server/samples/CodeFormatterResource.html | 68 - .../juneau/server/samples/SqlQueryResource.html | 66 - .../server/samples/TempDirUploadPage.html | 34 - .../juneau/server/samples/UrlEncodedForm.html | 62 - .../nls/AddressBookResource.properties | 89 - .../juneau/server/samples/averycutecat.jpg | Bin 318563 -> 0 bytes .../server/samples/htdocs/code-highlighting.css | 136 - .../samples/nls/AtomFeedResource.properties | 21 - .../nls/CodeFormatterResource.properties | 18 - .../samples/nls/HelloWorldResource.properties | 19 - .../samples/nls/JsonSchemaResource.properties | 20 - .../nls/MethodExampleResource.properties | 37 - .../samples/nls/PhotosResource.properties | 24 - .../samples/nls/RequestEchoResource.properties | 19 - .../server/samples/nls/RootResources.properties | 18 - .../nls/SampleRemoteableServlet.properties | 17 - .../samples/nls/SourceResource.properties | 19 - .../samples/nls/SqlQueryResource.properties | 19 - .../samples/nls/TempDirResource.properties | 18 - .../samples/nls/TumblrParserResource.properties | 19 - .../nls/UrlEncodedFormResource.properties | 22 - .../rest/samples/AddressBookResourceTest.java | 231 ++ .../samples/CT_AddressBookResource_test0.json | 26 + .../juneau/rest/samples/RootResourcesTest.java | 147 + .../SampleRemoteableServicesResourceTest.java | 69 + .../juneau/rest/samples/SamplesRestClient.java | 69 + .../samples/TestMultiPartFormPostsTest.java | 47 + .../apache/juneau/rest/samples/TestUtils.java | 360 ++ .../apache/juneau/rest/samples/_TestSuite.java | 57 + .../server/samples/AddressBookResourceTest.java | 231 -- .../samples/CT_AddressBookResource_test0.json | 26 - .../server/samples/RootResourcesTest.java | 147 - .../SampleRemoteableServicesResourceTest.java | 69 - .../server/samples/SamplesRestClient.java | 69 - .../samples/TestMultiPartFormPostsTest.java | 47 - .../apache/juneau/server/samples/TestUtils.java | 360 -- .../juneau/server/samples/_TestSuite.java | 57 - juneau-samples/war/web.xml | 6 +- juneau-server-test/.gitignore | 4 - juneau-server-test/.project | 28 - juneau-server-test/juneau-server-test.cfg | 111 - juneau-server-test/juneau-server-test.launch | 29 - juneau-server-test/pom.xml | 70 - .../server/test/AcceptCharsetResource.java | 76 - .../test/BeanContextPropertiesResource.java | 44 - .../server/test/CallbackStringsResource.java | 53 - .../server/test/CharsetEncodingsResource.java | 55 - .../server/test/ClientVersionResource.java | 93 - .../juneau/server/test/ConfigResource.java | 38 - .../juneau/server/test/ContentResource.java | 81 - .../org/apache/juneau/server/test/DTO2s.java | 139 - .../test/DefaultContentTypesResource.java | 128 - .../server/test/ErrorConditionsResource.java | 135 - .../juneau/server/test/GroupsResource.java | 72 - .../apache/juneau/server/test/GzipResource.java | 111 - .../juneau/server/test/InheritanceResource.java | 317 -- .../apache/juneau/server/test/LargePojo.java | 45 - .../juneau/server/test/LargePojosResource.java | 39 - .../juneau/server/test/MessagesResource.java | 62 - .../juneau/server/test/NlsPropertyResource.java | 61 - .../apache/juneau/server/test/NlsResource.java | 193 - .../server/test/NoParserInputResource.java | 56 - .../juneau/server/test/OnPostCallResource.java | 94 - .../juneau/server/test/OnPreCallResource.java | 85 - .../server/test/OptionsWithoutNlsResource.java | 44 - .../server/test/OverlappingMethodsResource.java | 146 - .../juneau/server/test/ParamsResource.java | 293 -- .../juneau/server/test/ParsersResource.java | 112 - .../apache/juneau/server/test/PathResource.java | 69 - .../juneau/server/test/PathsResource.java | 73 - .../juneau/server/test/PropertiesResource.java | 89 - .../juneau/server/test/RestClient2Resource.java | 36 - .../org/apache/juneau/server/test/Root.java | 71 - .../juneau/server/test/SerializersResource.java | 103 - .../juneau/server/test/StaticFilesResource.java | 36 - .../server/test/TransformsParentResource.java | 26 - .../juneau/server/test/TransformsResource.java | 114 - .../apache/juneau/server/test/UrisResource.java | 121 - .../juneau/server/test/UrlContentResource.java | 59 - .../server/test/Messages2Resource.properties | 16 - .../server/test/MessagesResource.properties | 16 - .../server/test/NlsPropertyResource.properties | 16 - .../juneau/server/test/NlsResource.properties | 71 - .../apache/juneau/server/test/xdocs/test.txt | 13 - .../juneau/server/test/xdocs/xdocs/test.txt | 13 - .../juneau/server/test/AcceptCharsetTest.java | 123 - .../server/test/BeanContextPropertiesTest.java | 37 - .../juneau/server/test/CallbackStringsTest.java | 50 - .../server/test/CharsetEncodingsTest.java | 96 - .../juneau/server/test/ClientVersionTest.java | 90 - .../apache/juneau/server/test/ConfigTest.java | 59 - .../apache/juneau/server/test/Constants.java | 53 - .../apache/juneau/server/test/ContentTest.java | 706 ---- .../org/apache/juneau/server/test/DTOs.java | 139 - .../server/test/DefaultContentTypesTest.java | 497 --- .../juneau/server/test/ErrorConditionsTest.java | 219 -- .../apache/juneau/server/test/GroupsTest.java | 122 - .../org/apache/juneau/server/test/GzipTest.java | 344 -- .../juneau/server/test/InheritanceTest.java | 126 - .../juneau/server/test/JacocoDummyTest.java | 38 - .../juneau/server/test/LargePojosTest.java | 83 - .../apache/juneau/server/test/MessagesTest.java | 47 - .../juneau/server/test/NlsPropertyTest.java | 48 - .../org/apache/juneau/server/test/NlsTest.java | 115 - .../juneau/server/test/NoParserInputTest.java | 70 - .../juneau/server/test/OnPostCallTest.java | 121 - .../juneau/server/test/OnPreCallTest.java | 61 - .../server/test/OptionsWithoutNlsTest.java | 51 - .../server/test/OverlappingMethodsTest.java | 170 - .../apache/juneau/server/test/ParamsTest.java | 716 ---- .../apache/juneau/server/test/ParsersTest.java | 162 - .../org/apache/juneau/server/test/PathTest.java | 44 - .../apache/juneau/server/test/PathsTest.java | 1368 ------- .../juneau/server/test/PropertiesTest.java | 48 - .../juneau/server/test/RestClientTest.java | 199 - .../juneau/server/test/RestUtilsTest.java | 188 - .../juneau/server/test/SerializersTest.java | 152 - .../juneau/server/test/StaticFilesTest.java | 56 - .../juneau/server/test/TestRestClient.java | 69 - .../apache/juneau/server/test/TestUtils.java | 60 - .../juneau/server/test/TransformsTest.java | 68 - .../org/apache/juneau/server/test/UrisTest.java | 918 ----- .../juneau/server/test/UrlContentTest.java | 74 - .../juneau/server/test/UrlPathPatternTest.java | 40 - .../apache/juneau/server/test/_TestSuite.java | 92 - juneau-server/.gitignore | 3 - juneau-server/.project | 30 - juneau-server/pom.xml | 87 - .../juneau/server/ClientVersionMatcher.java | 50 - .../apache/juneau/server/ReaderResource.java | 99 - .../java/org/apache/juneau/server/Redirect.java | 138 - .../apache/juneau/server/ResponseHandler.java | 92 - .../org/apache/juneau/server/RestConverter.java | 74 - .../org/apache/juneau/server/RestException.java | 135 - .../org/apache/juneau/server/RestGuard.java | 95 - .../org/apache/juneau/server/RestMatcher.java | 76 - .../juneau/server/RestMatcherReflecting.java | 33 - .../org/apache/juneau/server/RestRequest.java | 1870 --------- .../org/apache/juneau/server/RestResponse.java | 425 --- .../org/apache/juneau/server/RestServlet.java | 3393 ----------------- .../juneau/server/RestServletContext.java | 353 -- .../juneau/server/RestServletDefault.java | 233 -- .../juneau/server/RestServletException.java | 47 - .../juneau/server/RestServletGroupDefault.java | 41 - .../org/apache/juneau/server/RestUtils.java | 248 -- .../apache/juneau/server/StreamResource.java | 89 - .../apache/juneau/server/UrlPathPattern.java | 159 - .../apache/juneau/server/annotation/Body.java | 57 - .../juneau/server/annotation/FormData.java | 96 - .../juneau/server/annotation/HasFormData.java | 94 - .../juneau/server/annotation/HasQuery.java | 59 - .../apache/juneau/server/annotation/Header.java | 52 - .../juneau/server/annotation/Inherit.java | 32 - .../juneau/server/annotation/Messages.java | 50 - .../apache/juneau/server/annotation/Method.java | 49 - .../juneau/server/annotation/Parameter.java | 180 - .../apache/juneau/server/annotation/Path.java | 72 - .../juneau/server/annotation/PathRemainder.java | 46 - .../juneau/server/annotation/Properties.java | 64 - .../juneau/server/annotation/Property.java | 63 - .../apache/juneau/server/annotation/Query.java | 92 - .../juneau/server/annotation/Response.java | 87 - .../juneau/server/annotation/RestMethod.java | 505 --- .../juneau/server/annotation/RestResource.java | 592 --- .../juneau/server/annotation/package.html | 41 - .../server/converters/Introspectable.java | 59 - .../juneau/server/converters/Queryable.java | 96 - .../juneau/server/converters/Traversable.java | 67 - .../juneau/server/converters/package.html | 41 - .../juneau/server/doc-files/AddressBook.png | Bin 44553 -> 0 bytes .../juneau/server/doc-files/AddressBookJson.png | Bin 30639 -> 0 bytes .../server/doc-files/AddressBookOptions.png | Bin 224346 -> 0 bytes .../doc-files/AddressBook_juneaustyle.png | Bin 52768 -> 0 bytes .../server/doc-files/HelloWorldResource1.png | Bin 14206 -> 0 bytes .../server/doc-files/HelloWorldResource2.png | Bin 30721 -> 0 bytes .../server/doc-files/HelloWorldResource3.png | Bin 11040 -> 0 bytes .../server/doc-files/HelloWorldResource4.png | Bin 16188 -> 0 bytes .../doc-files/HelloWorldResourceOptions.png | Bin 172104 -> 0 bytes .../doc-files/HelloWorldResourceOptionsJson.png | Bin 167174 -> 0 bytes .../apache/juneau/server/doc-files/Options2.png | Bin 9809 -> 0 bytes .../juneau/server/doc-files/OptionsPage.png | Bin 56895 -> 0 bytes .../server/doc-files/Samples_RootResources.png | Bin 62372 -> 0 bytes .../juneau/server/doc-files/UrlEncodedForm.png | Bin 21379 -> 0 bytes .../juneau/server/jaxrs/BaseProvider.java | 189 - .../juneau/server/jaxrs/DefaultProvider.java | 71 - .../juneau/server/jaxrs/JuneauProvider.java | 96 - .../org/apache/juneau/server/jaxrs/package.html | 360 -- .../server/jaxrs/rdf/DefaultJenaProvider.java | 91 - .../apache/juneau/server/jaxrs/rdf/package.html | 34 - .../server/jena/RestServletJenaDefault.java | 272 -- .../jena/RestServletJenaGroupDefault.java | 41 - .../org/apache/juneau/server/jena/package.html | 47 - .../java/org/apache/juneau/server/juneau.ico | Bin 39438 -> 0 bytes .../juneau/server/labels/BeanDescription.java | 70 - .../labels/ChildResourceDescriptions.java | 61 - .../juneau/server/labels/NameDescription.java | 72 - .../server/labels/ResourceDescription.java | 106 - .../juneau/server/labels/ResourceLink.java | 66 - .../apache/juneau/server/labels/package.html | 41 - .../matchers/MultipartFormDataMatcher.java | 26 - .../server/matchers/UrlEncodedFormMatcher.java | 26 - .../apache/juneau/server/matchers/package.html | 34 - .../java/org/apache/juneau/server/package.html | 3560 ------------------ .../remoteable/RemoteableServiceProperties.java | 37 - .../server/remoteable/RemoteableServlet.java | 152 - .../juneau/server/remoteable/doc-files/1.png | Bin 15845 -> 0 bytes .../juneau/server/remoteable/doc-files/2.png | Bin 20379 -> 0 bytes .../juneau/server/remoteable/doc-files/3.png | Bin 33919 -> 0 bytes .../juneau/server/remoteable/doc-files/4.png | Bin 21108 -> 0 bytes .../juneau/server/remoteable/doc-files/5.png | Bin 10553 -> 0 bytes .../juneau/server/remoteable/doc-files/6.png | Bin 24934 -> 0 bytes .../juneau/server/remoteable/package.html | 356 -- .../juneau/server/response/DefaultHandler.java | 88 - .../server/response/InputStreamHandler.java | 42 - .../juneau/server/response/ReaderHandler.java | 40 - .../juneau/server/response/RedirectHandler.java | 48 - .../server/response/StreamableHandler.java | 51 - .../juneau/server/response/WritableHandler.java | 51 - .../response/ZipFileListResponseHandler.java | 62 - .../apache/juneau/server/response/package.html | 41 - .../juneau/server/vars/LocalizationVar.java | 54 - .../apache/juneau/server/vars/RequestVar.java | 123 - .../server/vars/SerializedRequestAttrVar.java | 64 - .../juneau/server/vars/ServletInitParamVar.java | 46 - .../apache/juneau/server/vars/UrlEncodeVar.java | 43 - .../org/apache/juneau/server/vars/package.html | 41 - .../server/htdocs/MethodExampleResource1.png | Bin 12276 -> 0 bytes .../org/apache/juneau/server/htdocs/javadoc.css | 794 ---- .../server/labels/nls/DefaultLabels.properties | 41 - .../org/apache/juneau/server/styles/devops.css | 202 - .../org/apache/juneau/server/styles/juneau.css | 141 - juneau-server/src/test/java/.gitignore | 12 - pom.xml | 7 +- 547 files changed, 37865 insertions(+), 37888 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-all/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-all/pom.xml b/juneau-all/pom.xml index da8e80d..4e879ad 100644 --- a/juneau-all/pom.xml +++ b/juneau-all/pom.xml @@ -36,12 +36,12 @@ </dependency> <dependency> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-server</artifactId> + <artifactId>juneau-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-client</artifactId> + <artifactId>juneau-rest-client</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -66,8 +66,8 @@ <artifactSet> <includes> <include>org.apache.juneau:juneau-core</include> - <include>org.apache.juneau:juneau-server</include> - <include>org.apache.juneau:juneau-client</include> + <include>org.apache.juneau:juneau-rest</include> + <include>org.apache.juneau:juneau-rest-client</include> <include>org.apache.juneau:juneau-microservice</include> </includes> </artifactSet> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/.gitignore ---------------------------------------------------------------------- diff --git a/juneau-client/.gitignore b/juneau-client/.gitignore deleted file mode 100644 index b5ffa7e..0000000 --- a/juneau-client/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -/.settings/ -/.classpath http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/.project ---------------------------------------------------------------------- diff --git a/juneau-client/.project b/juneau-client/.project deleted file mode 100644 index 173cc41..0000000 --- a/juneau-client/.project +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - *************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations under the License. * - *************************************************************************************************************************** ---> -<projectDescription> - <name>juneau-client</name> - <comment>REST client API. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - <project>juneau-core</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-client/pom.xml b/juneau-client/pom.xml deleted file mode 100644 index 507078a..0000000 --- a/juneau-client/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - *************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations under the License. * - *************************************************************************************************************************** ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <artifactId>juneau-client</artifactId> - <name>Apache Juneau Client</name> - <description>REST client API</description> - <packaging>bundle</packaging> - - <parent> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - </dependencies> - - <properties> - <!-- Skip javadoc generation since we generate them in the aggregate pom --> - <maven.javadoc.skip>true</maven.javadoc.skip> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>3.2.0</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <includes> - <include>**/*Test.class</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/src/main/java/org/apache/juneau/client/AllowAllRedirects.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/AllowAllRedirects.java b/juneau-client/src/main/java/org/apache/juneau/client/AllowAllRedirects.java deleted file mode 100755 index d04b5df..0000000 --- a/juneau-client/src/main/java/org/apache/juneau/client/AllowAllRedirects.java +++ /dev/null @@ -1,29 +0,0 @@ -// *************************************************************************************************************************** -// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * -// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * -// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * -// * * -// * http://www.apache.org/licenses/LICENSE-2.0 * -// * * -// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * -// * specific language governing permissions and limitations under the License. * -// *************************************************************************************************************************** -package org.apache.juneau.client; - -import org.apache.http.impl.client.*; - -/** - * Redirect strategy that allows for redirects on any request type, not just <code>GET</code> or <code>HEAD</code>. - * <p> - * Note: This class is similar to <code>org.apache.http.impl.client.LaxRedirectStrategy</code> - * in Apache HttpClient 4.2, but also allows for redirects on <code>PUTs</code> and <code>DELETEs</code>. - */ -public class AllowAllRedirects extends DefaultRedirectStrategy { - - @Override /* DefaultRedirectStrategy */ - protected boolean isRedirectable(final String method) { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/src/main/java/org/apache/juneau/client/DateHeader.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/DateHeader.java b/juneau-client/src/main/java/org/apache/juneau/client/DateHeader.java deleted file mode 100755 index 4cafefe..0000000 --- a/juneau-client/src/main/java/org/apache/juneau/client/DateHeader.java +++ /dev/null @@ -1,41 +0,0 @@ -// *************************************************************************************************************************** -// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * -// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * -// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * -// * * -// * http://www.apache.org/licenses/LICENSE-2.0 * -// * * -// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * -// * specific language governing permissions and limitations under the License. * -// *************************************************************************************************************************** -package org.apache.juneau.client; - -import java.util.*; - -import org.apache.http.client.utils.*; -import org.apache.http.message.*; - -/** - * Convenience class for setting date headers in RFC2616 format. - * <p> - * Equivalent to the following code: - * <p class='bcode'> - * Header h = <jk>new</jk> Header(name, DateUtils.<jsm>formatDate</jsm>(value)); - * </p> - */ -public final class DateHeader extends BasicHeader { - - private static final long serialVersionUID = 1L; - - /** - * Creates a date request property in RFC2616 format. - * - * @param name The header name. - * @param value The header value. - */ - public DateHeader(String name, Date value) { - super(name, DateUtils.formatDate(value)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/src/main/java/org/apache/juneau/client/HttpMethod.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/HttpMethod.java b/juneau-client/src/main/java/org/apache/juneau/client/HttpMethod.java deleted file mode 100755 index 7117bb9..0000000 --- a/juneau-client/src/main/java/org/apache/juneau/client/HttpMethod.java +++ /dev/null @@ -1,61 +0,0 @@ -// *************************************************************************************************************************** -// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * -// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * -// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * -// * * -// * http://www.apache.org/licenses/LICENSE-2.0 * -// * * -// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * -// * specific language governing permissions and limitations under the License. * -// *************************************************************************************************************************** -package org.apache.juneau.client; - -/** - * Enumeration of HTTP methods. - */ -public enum HttpMethod { - - /** HTTP GET */ - GET(false), - - /** HTTP PUT */ - PUT(true), - - /** HTTP POST */ - POST(true), - - /** HTTP DELETE */ - DELETE(false), - - /** HTTP OPTIONS */ - OPTIONS(false), - - /** HTTP HEAD */ - HEAD(false), - - /** HTTP TRACE */ - TRACE(false), - - /** HTTP CONNECT */ - CONNECT(false), - - /** HTTP MOVE */ - MOVE(false); - - private boolean hasContent; - - HttpMethod(boolean hasContent) { - this.hasContent = hasContent; - } - - /** - * Returns whether this HTTP method normally has content. - * - * @return <jk>true</jk> if this HTTP method normally has content. - */ - public boolean hasContent() { - return hasContent; - } -} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/src/main/java/org/apache/juneau/client/NameValuePairs.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/NameValuePairs.java b/juneau-client/src/main/java/org/apache/juneau/client/NameValuePairs.java deleted file mode 100755 index 2569cd1..0000000 --- a/juneau-client/src/main/java/org/apache/juneau/client/NameValuePairs.java +++ /dev/null @@ -1,46 +0,0 @@ -// *************************************************************************************************************************** -// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * -// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * -// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * -// * * -// * http://www.apache.org/licenses/LICENSE-2.0 * -// * * -// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * -// * specific language governing permissions and limitations under the License. * -// *************************************************************************************************************************** -package org.apache.juneau.client; - -import java.util.*; - -import org.apache.http.*; -import org.apache.http.client.entity.*; - -/** - * Convenience class for constructing instances of <code>List<NameValuePair></code> - * for the {@link UrlEncodedFormEntity} class. - * - * <h6 class='topic'>Example:</h6> - * <p class='bcode'> - * NameValuePairs params = <jk>new</jk> NameValuePairs() - * .append(<jk>new</jk> BasicNameValuePair(<js>"j_username"</js>, user)) - * .append(<jk>new</jk> BasicNameValuePair(<js>"j_password"</js>, pw)); - * request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params)); - * </p> - */ -public final class NameValuePairs extends LinkedList<NameValuePair> { - - private static final long serialVersionUID = 1L; - - /** - * Appends the specified pair to the end of this list. - * - * @param pair The pair to append to this list. - * @return This object (for method chaining). - */ - public NameValuePairs append(NameValuePair pair) { - super.add(pair); - return this; - } -} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/91a388d0/juneau-client/src/main/java/org/apache/juneau/client/ResponsePattern.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/ResponsePattern.java b/juneau-client/src/main/java/org/apache/juneau/client/ResponsePattern.java deleted file mode 100755 index 2b4cc80..0000000 --- a/juneau-client/src/main/java/org/apache/juneau/client/ResponsePattern.java +++ /dev/null @@ -1,136 +0,0 @@ -// *************************************************************************************************************************** -// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * -// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * -// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * -// * * -// * http://www.apache.org/licenses/LICENSE-2.0 * -// * * -// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * -// * specific language governing permissions and limitations under the License. * -// *************************************************************************************************************************** -package org.apache.juneau.client; - -import java.io.*; -import java.util.regex.*; - -/** - * Used to find regular expression matches in REST responses made through {@link RestCall}. - * <p> - * Response patterns are applied to REST calls through the {@link RestCall#addResponsePattern(ResponsePattern)} method. - * - * <h6 class='topic'>Example:</h6> - * This example shows how to use a response pattern finder to find and capture patterns for <js>"x=number"</js> and <js>"y=string"</js> - * from a response body. - * <p> - * <p class='bcode'> - * <jk>final</jk> List<Number> xList = <jk>new</jk> ArrayList<Number>(); - * <jk>final</jk> List<String> yList = <jk>new</jk> ArrayList<String>(); - * - * restClient.doGet(<jsf>URL</jsf>) - * .addResponsePattern( - * <jk>new</jk> ResponsePattern(<js>"x=(\\d+)"</js>) { - * <ja>@Override</ja> - * <jk>public void</jk> onMatch(RestCall restCall, Matcher m) <jk>throws</jk> RestCallException { - * xList.add(Integer.<jsm>parseInt</jsm>(m.group(1))); - * } - * <ja>@Override</ja> - * <jk>public void</jk> onNoMatch(RestCall restCall) <jk>throws</jk> RestCallException { - * <jk>throw new</jk> RestCallException(<js>"No X's found!"</js>); - * } - * } - * ) - * .addResponsePattern( - * <jk>new</jk> ResponsePattern(<js>"y=(\\S+)"</js>) { - * <ja>@Override</ja> - * <jk>public void</jk> onMatch(RestCall restCall, Matcher m) <jk>throws</jk> RestCallException { - * yList.add(m.group(1)); - * } - * <ja>@Override</ja> - * <jk>public void</jk> onNoMatch(RestCall restCall) <jk>throws</jk> RestCallException { - * <jk>throw new</jk> RestCallException(<js>"No Y's found!"</js>); - * } - * } - * ) - * .run(); - * </p> - * <p> - * <h5 class='notes'>Important Notes:</h5> - * <ol class='notes'> - * <li><p> - * Using response patterns does not affect the functionality of any of the other methods - * used to retrieve the response such as {@link RestCall#getResponseAsString()} or {@link RestCall#getResponse(Class)}.<br> - * HOWEVER, if you want to retrieve the entire text of the response from inside the match methods, - * use {@link RestCall#getCapturedResponse()} since this method will not absorb the response for those other methods. - * </p> - * <li><p> - * Response pattern methods are NOT executed if a REST exception occurs during the request. - * </p> - * <li><p> - * The {@link RestCall#successPattern(String)} and {@link RestCall#failurePattern(String)} methods use instances of - * this class to throw {@link RestCallException RestCallExceptions} when success patterns are not found or failure patterns - * are found. - * </p> - * <li><p> - * {@link ResponsePattern} objects are reusable and thread-safe. - * </p> - * </ol> - */ -public abstract class ResponsePattern { - - private Pattern pattern; - - /** - * Constructor. - * - * @param pattern Regular expression pattern. - */ - public ResponsePattern(String pattern) { - this.pattern = Pattern.compile(pattern); - } - - void match(RestCall rc) throws RestCallException { - try { - Matcher m = pattern.matcher(rc.getCapturedResponse()); - boolean found = false; - while (m.find()) { - onMatch(rc, m); - found = true; - } - if (! found) - onNoMatch(rc); - } catch (IOException e) { - throw new RestCallException(e); - } - } - - /** - * Returns the pattern passed in through the constructor. - * - * @return The pattern passed in through the constructor. - */ - protected String getPattern() { - return pattern.pattern(); - } - - /** - * Instances can override this method to handle when a regular expression pattern matches - * on the output. - * <p> - * This method is called once for every pattern match that occurs in the response text. - * - * @param rc The {@link RestCall} that this pattern finder is being used on. - * @param m The regular expression {@link Matcher}. Can be used to retrieve group matches in the pattern. - * @throws RestCallException Instances can throw an exception if a failure condition is detected. - */ - public void onMatch(RestCall rc, Matcher m) throws RestCallException {} - - /** - * Instances can override this method to handle when a regular expression pattern doesn't match on the output. - * - * @param rc The {@link RestCall} that this pattern finder is being used on. - * @throws RestCallException Instances can throw an exception if a failure condition is detected. - */ - public void onNoMatch(RestCall rc) throws RestCallException {} -}
