This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository resteasy.
commit b0b785b9e62870bc615a4c00f029ed7fae51b453 Merge: c300a6b 156491d Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Oct 9 15:43:32 2014 +0300 Merge branch 'upstream' .project | 17 - jaxrs/arquillian/RESTEASY-736-as71/pom.xml | 4 +- jaxrs/arquillian/RESTEASY-736-jetty/pom.xml | 4 +- jaxrs/arquillian/RESTEASY-760-jetty/pom.xml | 4 +- jaxrs/arquillian/RESTEASY-800-AS71/pom.xml | 2 +- jaxrs/arquillian/ValidationTest-AS7/pom.xml | 2 +- .../resteasy/test/validation/TestValidation.java | 57 +- jaxrs/arquillian/ValidationTest-WF8/pom.xml | 2 +- .../validation/TestResourceLazyValidator.java | 25 +- .../TestExecutableValidationDisabled.java | 20 +- .../TestGetterReturnValueNotValidated.java | 6 - .../validation/TestGetterReturnValueValidated.java | 16 +- .../test/validation/TestLazyValidator.java | 2 - .../resteasy/test/validation/TestValidation.java | 62 +- jaxrs/arquillian/ValidationTest/pom.xml | 2 +- jaxrs/arquillian/pom.xml | 2 +- jaxrs/arquillian/resteasy-cdi-ejb-test/pom.xml | 2 +- jaxrs/as7-integration-testing/cdi-test/pom.xml | 2 +- jaxrs/as7-integration-testing/modules-test/pom.xml | 2 +- jaxrs/as7-integration-testing/pom.xml | 2 +- .../application-test/pom.xml | 4 +- .../{application-test => cdilocator-test}/pom.xml | 15 +- .../org/jboss/resteasy/tests/TestResource.java | 61 + .../main/java/org/jboss/resteasy/tests/TheApp.java | 24 + .../src/main/webapp/WEB-INF/beans.xml | 3 + .../src/main/webapp/WEB-INF/web.xml | 7 + .../org/jboss/resteasy/tests/ApplicationTest.java | 50 + .../pom.xml | 13 +- .../jboss/resteasy/tests/ScannedApplication.java | 19 + .../org/jboss/resteasy/tests/SingletonLocalIF.java | 13 + .../resteasy/tests/SingletonRootResource.java | 66 + .../jboss/resteasy/tests/SingletonSubResource.java | 19 + .../jboss/resteasy/tests/SingletonTestBean.java | 30 + .../src/main/webapp/WEB-INF/web.xml | 7 + .../org/jboss/resteasy/tests/ApplicationTest.java | 39 + jaxrs/as8-integration-testing/pom.xml | 6 +- jaxrs/as8-mavenized-distro/pom.xml | 2 +- jaxrs/as8-resteasy/pom.xml | 4 +- .../async-http-servlet-3.0-test/pom.xml | 11 +- .../test/async/AsyncResponseBlockingQueue.java | 15 + .../jboss/resteasy/test/async/JaxrsResource.java | 44 +- .../java/org/jboss/resteasy/test/async/MyApp.java | 29 +- .../resteasy/test/async/MyTimeoutHandler.java | 32 + .../org/jboss/resteasy/test/async/Resource.java | 214 + .../async/ServiceUnavailableExceptionMapper.java | 22 + .../org/jboss/resteasy/test/async/XmlData.java | 35 + .../src/main/webapp/WEB-INF/web.xml | 1 + .../org/jboss/resteasy/test/async/AsyncTest.java | 60 +- .../test/async/ComprehensiveJaxrsTest.java | 483 ++ .../jboss/resteasy/test/async/JaxrsAsyncTest.java | 71 +- .../async-http-servlet-3.0/pom.xml | 2 +- .../plugins/server/servlet/Filter30Dispatcher.java | 8 +- .../server/servlet/HttpServlet30Dispatcher.java | 8 +- .../server/servlet/Servlet3AsyncHttpRequest.java | 103 +- .../pom.xml | 15 +- .../async/callback/AsyncResponseBlockingQueue.java | 15 + .../test/async/callback/CallbackResource.java | 175 + .../callback/ExceptionThrowingStringBean.java | 16 + .../resteasy/test/async/callback/JaxrsUtil.java | 113 + .../jboss/resteasy/test/async/callback/MyApp.java | 16 + .../test/async/callback/MyTimeoutHandler.java | 32 + .../resteasy/test/async/callback/Resource.java | 188 + .../callback/SecondSettingCompletionCallback.java | 28 + .../async/callback/SettingCompletionCallback.java | 25 + .../resteasy/test/async/callback/StringBean.java | 23 + .../async/callback/StringBeanEntityProvider.java | 57 + .../callback-test/src/main/webapp/WEB-INF/web.xml | 21 + .../jboss/resteasy/test/async/CallbackTest.java | 133 + .../src/test/resources/jndi.properties | 3 + .../callback-test/src/test/resources/log4j.xml | 68 + jaxrs/async-http-servlet-3.0/pom.xml | 3 +- jaxrs/distribution/assembly.xml | 15 + jaxrs/distribution/pom.xml | 22 +- jaxrs/distribution/src-distribution/pom.xml | 2 +- jaxrs/docbook/pom.xml | 2 +- jaxrs/docbook/reference/en/en-US/master.xml | 8 +- .../en-US/modules/Cache_NoCache_CacheControl.xml | 2 +- .../en-US/modules/Installation_Configuration.xml | 86 +- .../docbook/reference/en/en-US/modules/Json-p.xml | 19 + jaxrs/docbook/reference/en/en-US/modules/Json.xml | 4 +- jaxrs/docbook/reference/en/en-US/modules/Links.xml | 2 +- .../en/en-US/modules/Maven_and_RESTEasy.xml | 24 +- .../modules/Migration_from_older_versions.xml | 10 + .../en/en-US/modules/RESTEasy_Client_Framework.xml | 8 +- .../en-US/modules/RESTEasy_Embedded_Container.xml | 112 +- .../reference/en/en-US/modules/Validation.xml | 236 +- jaxrs/docbook/reference/en/en-US/modules/Yaml.xml | 2 +- jaxrs/docbook/reference/en/en-US/modules/jwt.xml | 97 + .../reference/en/en-US/modules/signature.xml | 2 +- jaxrs/docbook/reference/en/en-US/modules/smime.xml | 2 +- jaxrs/eagledns/pom.xml | 2 +- jaxrs/examples/api-clients/pom.xml | 8 +- jaxrs/examples/async-job-service/pom.xml | 4 +- jaxrs/examples/digital-signatures/no-dns/pom.xml | 3 +- .../resteasy/tests/signature/SigningTest.java | 2 +- jaxrs/examples/digital-signatures/pom.xml | 2 +- jaxrs/examples/digital-signatures/use-dns/pom.xml | 5 +- jaxrs/examples/ejb-integration/ear/pom.xml | 2 +- jaxrs/examples/ejb-integration/ejb/pom.xml | 4 +- jaxrs/examples/ejb-integration/pom.xml | 2 +- jaxrs/examples/ejb-integration/war/pom.xml | 2 +- jaxrs/examples/examples-jsapi/pom.xml | 15 +- jaxrs/examples/guice-hello/pom.xml | 4 +- jaxrs/examples/jaxb-json/pom.xml | 8 +- jaxrs/examples/jaxrs-2.0/server-async-http/pom.xml | 2 +- jaxrs/examples/jaxrs-2.0/simple-client/pom.xml | 2 +- .../test/java/org/jboss/test/SimpleClientTest.java | 1 + jaxrs/examples/jaxrs2-async-pubsub-example/pom.xml | 9 +- .../authenticator/pom.xml | 4 +- .../oauth-catalina-authenticator/oauth/pom.xml | 4 +- .../oauth-catalina-authenticator/pom.xml | 2 +- .../oauth1-examples/oauth-provider/pom.xml | 4 +- .../oauth-push-messaging-openid/openid/pom.xml | 4 +- .../oauth-push-messaging-openid/pom.xml | 2 +- .../push-messaging/pom.xml | 4 +- .../oauth1-examples/oauth-push-messaging/pom.xml | 4 +- jaxrs/examples/oauth1-examples/oauth/pom.xml | 4 +- jaxrs/examples/oauth1-examples/pom.xml | 2 +- jaxrs/examples/oauth2-as7-example/pom.xml | 2 +- .../oauth2-as7-example/wars/auth-server/pom.xml | 2 +- .../webapp/WEB-INF/jboss-deployment-structure.xml | 20 +- .../oauth2-as7-example/wars/client-grant/pom.xml | 2 +- .../oauth2-as7-example/wars/customer-app/pom.xml | 2 +- .../wars/database-service/pom.xml | 2 +- .../oauth2-as7-example/wars/product-app/pom.xml | 2 +- .../oauth2-as7-example/wars/third-party/pom.xml | 2 +- .../examples/oreilly-jaxrs-2.0-workbook/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex03_1/README.md | 16 + .../oreilly-jaxrs-2.0-workbook/ex03_1}/pom.xml | 98 +- .../java/com/restfully/shop/domain/Customer.java | 76 + .../restfully/shop/services/CustomerResource.java | 133 + .../shop/services/ShoppingApplication.java | 20 + .../ex03_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 64 + .../oreilly-jaxrs-2.0-workbook/ex04_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex04_1}/pom.xml | 56 +- .../java/com/restfully/shop/domain/Customer.java | 93 + .../restfully/shop/services/CustomerResource.java | 181 + .../shop/services/ShoppingApplication.java | 24 + .../src/main/java/org/ietf/annotations/PATCH.java | 20 + .../ex04_1/src/main/webapp/WEB-INF/web.xml | 6 + .../java/com/restfully/shop/test/PatchTest.java | 69 + .../oreilly-jaxrs-2.0-workbook/ex04_2/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex04_2}/pom.xml | 57 +- .../java/com/restfully/shop/domain/Customer.java | 93 + .../restfully/shop/services/CustomerResource.java | 178 + .../shop/services/ShoppingApplication.java | 24 + .../ex04_2/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 62 + .../oreilly-jaxrs-2.0-workbook/ex04_3/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex04_3}/pom.xml | 59 +- .../java/com/restfully/shop/domain/Customer.java | 93 + .../shop/services/CustomerDatabaseResource.java | 30 + .../restfully/shop/services/CustomerResource.java | 158 + .../shop/services/FirstLastCustomerResource.java | 151 + .../shop/services/ShoppingApplication.java | 23 + .../ex04_3/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 86 + .../oreilly-jaxrs-2.0-workbook/ex05_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex05_1/pom.xml | 126 + .../java/com/restfully/shop/domain/Customer.java | 93 + .../com/restfully/shop/services/CarResource.java | 78 + .../restfully/shop/services/CustomerResource.java | 132 + .../shop/services/ShoppingApplication.java | 24 + .../ex05_1/src/main/webapp/WEB-INF/web.xml | 6 + .../com/restfully/shop/test/InjectionTest.java | 71 + .../oreilly-jaxrs-2.0-workbook/ex05_2/README.md | 21 + .../oreilly-jaxrs-2.0-workbook/ex05_2}/pom.xml | 56 +- .../java/com/restfully/shop/domain/Customer.java | 93 + .../restfully/shop/services/CustomerResource.java | 75 + .../shop/services/ShoppingApplication.java | 23 + .../ex05_2/src/main/webapp/WEB-INF/web.xml | 6 + .../ex05_2/src/main/webapp/index.html | 11 + .../oreilly-jaxrs-2.0-workbook/ex06_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex06_1}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../restfully/shop/services/CustomerResource.java | 68 + .../shop/services/ShoppingApplication.java | 23 + .../ex06_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 68 + .../oreilly-jaxrs-2.0-workbook/ex06_2/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex06_2}/pom.xml | 56 +- .../java/com/restfully/shop/domain/Customer.java | 112 + .../restfully/shop/services/CustomerResource.java | 64 + .../restfully/shop/services/JavaMarshaller.java | 64 + .../shop/services/ShoppingApplication.java | 31 + .../ex06_2/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 71 + .../oreilly-jaxrs-2.0-workbook/ex07_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex07_1}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 106 + .../shop/services/CustomerNotFoundException.java | 13 + .../services/CustomerNotFoundExceptionMapper.java | 20 + .../restfully/shop/services/CustomerResource.java | 63 + .../shop/services/ShoppingApplication.java | 31 + .../ex07_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 50 + .../oreilly-jaxrs-2.0-workbook/ex09_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex09_1}/pom.xml | 64 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../restfully/shop/services/CustomerResource.java | 60 + .../shop/services/ShoppingApplication.java | 23 + .../ex09_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 67 + .../oreilly-jaxrs-2.0-workbook/ex09_2/README.md | 23 + .../oreilly-jaxrs-2.0-workbook/ex09_2}/pom.xml | 64 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../restfully/shop/services/CustomerResource.java | 78 + .../shop/services/ShoppingApplication.java | 23 + .../ex09_2/src/main/webapp/WEB-INF/web.xml | 10 + .../oreilly-jaxrs-2.0-workbook/ex10_1/README.md | 16 + .../oreilly-jaxrs-2.0-workbook/ex10_1}/pom.xml | 62 +- .../java/com/restfully/shop/domain/Customer.java | 123 + .../java/com/restfully/shop/domain/Customers.java | 68 + .../restfully/shop/services/CustomerResource.java | 174 + .../shop/services/ShoppingApplication.java | 23 + .../ex10_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 49 + .../oreilly-jaxrs-2.0-workbook/ex10_2/README.md | 17 + .../oreilly-jaxrs-2.0-workbook/ex10_2}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 123 + .../java/com/restfully/shop/domain/Customers.java | 68 + .../java/com/restfully/shop/domain/LineItem.java | 34 + .../main/java/com/restfully/shop/domain/Order.java | 87 + .../java/com/restfully/shop/domain/Orders.java | 68 + .../restfully/shop/services/CustomerResource.java | 104 + .../com/restfully/shop/services/OrderResource.java | 183 + .../shop/services/ShoppingApplication.java | 25 + .../com/restfully/shop/services/StoreResource.java | 32 + .../ex10_2/src/main/webapp/WEB-INF/web.xml | 6 + .../com/restfully/shop/test/OrderResourceTest.java | 119 + .../oreilly-jaxrs-2.0-workbook/ex11_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex11_1}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 148 + .../restfully/shop/services/CustomerResource.java | 132 + .../shop/services/ShoppingApplication.java | 23 + .../ex11_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 62 + .../oreilly-jaxrs-2.0-workbook/ex12_1/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex12_1}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../shop/features/CacheControlFilter.java | 30 + .../java/com/restfully/shop/features/MaxAge.java | 16 + .../com/restfully/shop/features/MaxAgeFeature.java | 22 + .../restfully/shop/services/CustomerResource.java | 70 + .../shop/services/ShoppingApplication.java | 33 + .../ex12_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 61 + .../oreilly-jaxrs-2.0-workbook/ex12_2/README.md | 15 + .../oreilly-jaxrs-2.0-workbook/ex12_2}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../restfully/shop/features/ContentMD5Writer.java | 54 + .../restfully/shop/services/CustomerResource.java | 68 + .../shop/services/ShoppingApplication.java | 33 + .../ex12_2/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 61 + .../oreilly-jaxrs-2.0-workbook/ex13_1/README.md | 22 + .../oreilly-jaxrs-2.0-workbook/ex13_1}/pom.xml | 73 +- .../ex13_1/src/main/java/ChatClient.java | 65 + .../java/com/restfully/shop/domain/Customer.java | 121 + .../com/restfully/shop/services/CustomerChat.java | 137 + .../restfully/shop/services/CustomerResource.java | 68 + .../shop/services/ShoppingApplication.java | 24 + .../ex13_1/src/main/webapp/WEB-INF/web.xml | 6 + .../oreilly-jaxrs-2.0-workbook/ex14_1/README.md | 17 + .../ex14_1}/pom.xml | 23 +- .../java/com/restfully/shop/domain/Customer.java | 123 + .../java/com/restfully/shop/domain/Customers.java | 69 + .../java/com/restfully/shop/domain/LineItem.java | 59 + .../main/java/com/restfully/shop/domain/Order.java | 123 + .../java/com/restfully/shop/domain/Orders.java | 69 + .../java/com/restfully/shop/domain/Product.java | 47 + .../java/com/restfully/shop/domain/Products.java | 69 + .../restfully/shop/persistence/CustomerEntity.java | 115 + .../restfully/shop/persistence/LineItemEntity.java | 51 + .../restfully/shop/persistence/OrderEntity.java | 89 + .../restfully/shop/persistence/ProductEntity.java | 49 + .../restfully/shop/services/CustomerResource.java | 43 + .../shop/services/CustomerResourceBean.java | 135 + .../shop/services/EJBExceptionMapper.java | 37 + .../services/EntityNotFoundExceptionMapper.java | 19 + .../com/restfully/shop/services/OrderResource.java | 58 + .../restfully/shop/services/OrderResourceBean.java | 216 + .../restfully/shop/services/ProductResource.java | 42 + .../shop/services/ProductResourceBean.java | 119 + .../shop/services/ShoppingApplication.java | 10 + .../com/restfully/shop/services/StoreResource.java | 18 + .../restfully/shop/services/StoreResourceBean.java | 30 + .../src/main/resources/META-INF/persistence.xml | 13 + .../ex14_1/src/main/webapp/WEB-INF/web.xml | 6 + .../java/com/restfully/shop/test/ShoppingTest.java | 153 + .../oreilly-jaxrs-2.0-workbook/ex14_2/README.md | 16 + .../ex14_2}/pom.xml | 123 +- .../java/com/restfully/shop/domain/Customer.java | 123 + .../java/com/restfully/shop/domain/Customers.java | 69 + .../java/com/restfully/shop/domain/LineItem.java | 59 + .../main/java/com/restfully/shop/domain/Order.java | 123 + .../java/com/restfully/shop/domain/Orders.java | 69 + .../java/com/restfully/shop/domain/Product.java | 47 + .../java/com/restfully/shop/domain/Products.java | 69 + .../restfully/shop/persistence/CustomerEntity.java | 115 + .../restfully/shop/persistence/LineItemEntity.java | 51 + .../restfully/shop/persistence/OrderEntity.java | 89 + .../restfully/shop/persistence/ProductEntity.java | 49 + .../restfully/shop/services/CustomerResource.java | 43 + .../shop/services/CustomerResourceBean.java | 140 + .../services/EntityNotFoundExceptionMapper.java | 20 + .../com/restfully/shop/services/OrderResource.java | 58 + .../restfully/shop/services/OrderResourceBean.java | 222 + .../restfully/shop/services/ProductResource.java | 42 + .../shop/services/ProductResourceBean.java | 124 + .../shop/services/ShoppingApplication.java | 56 + .../com/restfully/shop/services/StoreResource.java | 18 + .../restfully/shop/services/StoreResourceBean.java | 27 + .../main/resources/META-INF/applicationContext.xml | 46 + .../src/main/resources/META-INF/persistence.xml | 8 + .../ex14_2/src/main/webapp/WEB-INF/web.xml | 6 + .../java/com/restfully/shop/test/ShoppingTest.java | 150 + .../oreilly-jaxrs-2.0-workbook/ex15_1/README.md | 17 + .../oreilly-jaxrs-2.0-workbook/ex15_1}/pom.xml | 61 +- .../java/com/restfully/shop/domain/Customer.java | 121 + .../com/restfully/shop/features/AllowedPerDay.java | 19 + .../main/java/com/restfully/shop/features/OTP.java | 31 + .../restfully/shop/features/OTPAuthenticated.java | 18 + .../features/OneTimePasswordAuthenticator.java | 80 + .../shop/features/OneTimePasswordGenerator.java | 29 + .../restfully/shop/features/PerDayAuthorizer.java | 105 + .../restfully/shop/services/CustomerResource.java | 73 + .../shop/services/ShoppingApplication.java | 31 + .../ex15_1/src/main/webapp/WEB-INF/web.xml | 6 + .../restfully/shop/test/CustomerResourceTest.java | 91 + .../oreilly-jaxrs-2.0-workbook/ex15_2/README.md | 23 + .../oreilly-jaxrs-2.0-workbook/ex15_2}/pom.xml | 76 +- .../ex15_2/src/main/java/ChatClient.java | 81 + .../java/com/restfully/shop/domain/Customer.java | 121 + .../com/restfully/shop/services/CustomerChat.java | 136 + .../restfully/shop/services/CustomerResource.java | 68 + .../shop/services/ShoppingApplication.java | 24 + .../ex15_2/src/main/webapp/WEB-INF/web.xml | 6 + .../pom.xml | 130 +- jaxrs/examples/oreilly-workbook-as7/ex03_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex04_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex04_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex04_3/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex05_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex05_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex06_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex06_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook-as7/ex07_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex08_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex08_2/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex09_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex09_2/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex10_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook-as7/ex11_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex03_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex04_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex04_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex04_3/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex05_1/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex05_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex06_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex06_2/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex07_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex08_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex08_2/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex09_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex09_2/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex10_1/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex11_1/ejb/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/ex11_1/war/pom.xml | 2 +- jaxrs/examples/oreilly-workbook/ex11_2/pom.xml | 4 +- jaxrs/examples/oreilly-workbook/pom.xml | 124 +- jaxrs/examples/pom.xml | 3 +- jaxrs/examples/resteasy-springMVC/pom.xml | 12 +- jaxrs/examples/smime/pom.xml | 2 +- .../jboss/resteasy/tests/smime/SMIMEResource.java | 224 +- .../spring-hibernate-contacts/core/pom.xml | 4 +- .../spring-hibernate-contacts/persistence/pom.xml | 12 +- jaxrs/examples/spring-hibernate-contacts/pom.xml | 10 +- .../spring-hibernate-contacts/services/pom.xml | 14 +- jaxrs/jaxrs-api/pom.xml | 2 +- .../src/main/java/javax/ws/rs/core/Link.java | 7 +- .../application-config-test/pom.xml | 2 +- .../basic-integration-test/pom.xml | 2 +- .../jboss-integration-testing/ejb-test/ear/pom.xml | 2 +- .../jboss-integration-testing/ejb-test/ejb/pom.xml | 2 +- jaxrs/jboss-integration-testing/ejb-test/pom.xml | 4 +- .../jboss-integration-testing/ejb-test/war/pom.xml | 2 +- jaxrs/jboss-integration-testing/pom.xml | 2 +- .../scanning-test/pom.xml | 4 +- .../scanning-test/scanning-test-jar/pom.xml | 6 +- .../scanning-test/scanning-test-war/pom.xml | 6 +- .../servlet-mapping-test/pom.xml | 2 +- .../spring-integration-test/pom.xml | 2 +- jaxrs/jboss-modules/build-wf8.xml | 2 + jaxrs/jboss-modules/build.xml | 2 + jaxrs/jboss-modules/pom.xml | 10 +- .../jackson-jaxrs-json-provider/main/module.xml | 1 + .../modules/javax/ws/rs/api/main/module.xml | 4 + jaxrs/pom.xml | 145 +- jaxrs/profiling-tests/pom.xml | 2 +- jaxrs/providers/abdera-atom/pom.xml | 2 +- jaxrs/providers/fastinfoset/pom.xml | 2 +- jaxrs/providers/jackson/pom.xml | 2 +- jaxrs/providers/jackson2/pom.xml | 2 +- .../jackson/ExceptionMapperMarshalTest.java | 141 + jaxrs/providers/jaxb/pom.xml | 2 +- .../providers/jaxb/ExternalEntityUnmarshaller.java | 47 +- .../org/jboss/resteasy/test/link/LinkTest.java | 72 + .../resteasy/test/xxe/TestXXESecureProcessing.java | 207 + jaxrs/providers/jettison/pom.xml | 2 +- jaxrs/providers/{jaxb => json-p-ee7}/pom.xml | 22 +- .../providers/jsonp/AbstractJsonpProvider.java | 65 + .../plugins/providers/jsonp/JsonArrayProvider.java | 73 + .../providers/jsonp/JsonObjectProvider.java | 76 + .../providers/jsonp/JsonStructureProvider.java | 73 + .../META-INF/services/javax.ws.rs.ext.Providers | 3 + .../java/org/jboss/resteasy/test/JsonTest.java | 138 + jaxrs/providers/multipart/pom.xml | 7 +- .../providers/multipart/PartFilename.java | 19 + .../multipart/MultipartFormAnnotationWriter.java | 14 +- .../org/jboss/resteasy/test/nextgen/ProxyTest.java | 105 + jaxrs/providers/pom.xml | 3 +- jaxrs/providers/resteasy-atom/pom.xml | 2 +- .../resteasy-hibernatevalidator-provider/pom.xml | 16 +- .../api/validation/ResteasyViolationException.java | 148 +- .../ResteasyViolationExceptionMapper.java | 86 +- .../resteasy/api/validation/ViolationReport.java | 105 + .../validation/hibernate/ConstraintTypeUtil10.java | 3 +- .../validation/hibernate/GeneralValidatorImpl.java | 16 +- .../hibernate/ValidatorContextResolver.java | 23 +- .../resteasy/test/validation/TestValidation.java | 209 +- .../validation/TestValidationNullErrorValue.java | 144 + .../test/validation/TestValidationOnGetter.java | 137 + .../test/validation/TestValidationXML.java | 614 +++ jaxrs/providers/resteasy-html/pom.xml | 2 +- .../resteasy-validator-provider-11/pom.xml | 22 +- .../api/validation/ResteasyViolationException.java | 141 +- .../ResteasyViolationExceptionMapper.java | 88 +- .../resteasy/api/validation/ViolationReport.java | 105 + .../plugins/validation/ConstraintTypeUtil11.java | 17 +- .../plugins/validation/GeneralValidatorImpl.java | 986 ++-- .../validation/ValidatorContextResolver.java | 14 +- ...stResteasyViolationExceptionRepresentation.java | 407 ++ .../test/validation/TestValidateOnExecution.java | 65 +- .../resteasy/test/validation/TestValidation.java | 231 +- .../test/validation/TestValidationExceptions.java | 141 +- .../validation/TestValidationHibernateI18N.java | 96 + .../validation/TestValidationNullErrorValue.java | 141 + .../test/validation/TestValidationOnGetter.java | 138 + .../test/validation/TestValidationXML.java | 612 +++ jaxrs/providers/test-all-jaxb/pom.xml | 2 +- .../test-jackson-jaxb-coexistence/pom.xml | 2 +- jaxrs/providers/test-resteasy-html/pom.xml | 2 +- jaxrs/providers/yaml/pom.xml | 2 +- jaxrs/resteasy-bom/pom.xml | 81 +- jaxrs/resteasy-cache/pom.xml | 2 +- jaxrs/resteasy-cache/resteasy-cache-core/pom.xml | 2 +- jaxrs/resteasy-cdi/pom.xml | 21 +- .../org/jboss/resteasy/cdi/CdiInjectorFactory.java | 35 +- .../jboss/resteasy/cdi/ResteasyCdiExtension.java | 125 +- .../main/java/org/jboss/resteasy/cdi/Utils.java | 46 +- .../org/jboss/resteasy/cdi/test/intf/CDITest.java | 37 + jaxrs/resteasy-client/pom.xml | 2 +- .../resteasy/client/jaxrs/ResteasyClient.java | 8 +- .../client/jaxrs/ResteasyClientBuilder.java | 165 +- .../jaxrs/engines/ApacheHttpClient4Engine.java | 51 +- .../client/jaxrs/engines/URLConnectionEngine.java | 227 + .../client/jaxrs/internal/ClientInvocation.java | 21 +- .../proxy/extractors/ClientErrorHandler.java | 53 - .../invocation/MessageBodyParameterProcessor.java | 2 +- jaxrs/resteasy-guice/pom.xml | 2 +- ...iceResteasyBootstrapServletContextListener.java | 29 +- .../resteasy/plugins/guice/ModuleProcessor.java | 15 +- .../resteasy/plugins/guice/GuiceContextTest.java | 125 +- jaxrs/resteasy-jaxrs-testsuite/pom.xml | 7 +- .../resteasy/test/client/AsyncInvokeTest.java | 3 + .../jboss/resteasy/test/client/SyncInvoketest.java | 2 + .../test/nextgen/beanparam/TestFormResource.java | 6 +- .../test/nextgen/client/ApacheHttpClient4Test.java | 81 +- .../resteasy/test/nextgen/client/TimeoutTest.java | 92 + .../test/nextgen/client/cache/ClientCacheTest.java | 2 + .../nextgen/finegrain/InheritedContextTest.java | 169 + .../nextgen/finegrain/InvalidMediaTypeTest.java | 98 + .../finegrain/SerializableWithParametersTest.java | 90 + .../finegrain/client/ClientFormParamTest.java | 3 +- .../test/nextgen/interceptors/GzipTest.java | 12 + .../resteasy/test/nextgen/resource/CookieTest.java | 77 + .../test/nextgen/resource/PrimitiveTest.java | 16 + .../resteasy/test/nextgen/resource/RangeTest.java | 10 +- .../test/nextgen/resource/ResourceMatching2.java | 93 + .../resource/WildcardResourceMatchingTest.java | 98 + jaxrs/resteasy-jaxrs/pom.xml | 13 +- .../validation/ResteasyConstraintViolation.java | 48 +- .../org/jboss/resteasy/client/ClientRequest.java | 15 +- .../resteasy/client/core/BaseClientResponse.java | 5 + .../core/executors/ApacheHttpClient4Executor.java | 6 +- .../executors/URLConnectionClientExecutor.java | 86 +- .../core/extractors/BodyEntityExtractor.java | 4 + .../core/AbstractAsynchronousResponse.java | 6 +- .../resteasy/core/AsynchronousDispatcher.java | 18 +- .../core/AsynchronousResponseInjector.java | 6 +- .../jboss/resteasy/core/ResourceMethodInvoker.java | 46 +- .../jboss/resteasy/core/ServerResponseWriter.java | 11 +- .../org/jboss/resteasy/core/SuspendInjector.java | 5 +- .../jboss/resteasy/core/SynchronousDispatcher.java | 16 + .../resteasy/core/SynchronousExecutionContext.java | 15 +- .../jboss/resteasy/core/registry/ClassNode.java | 1 + .../jboss/resteasy/core/registry/SegmentNode.java | 1 + .../org/jboss/resteasy/mock/MockHttpRequest.java | 19 +- .../plugins/delegates/CookieHeaderDelegate.java | 54 +- .../plugins/delegates/EntityTagDelegate.java | 2 +- .../plugins/delegates/MediaTypeHeaderDelegate.java | 4 +- .../plugins/delegates/NewCookieHeaderDelegate.java | 209 +- .../resteasy/plugins/providers/FileProvider.java | 8 + .../plugins/providers/FileRangeWriter.java | 2 +- .../plugins/providers/SerializableProvider.java | 8 +- .../plugins/server/servlet/FilterDispatcher.java | 7 +- .../server/servlet/HttpServletDispatcher.java | 2 +- .../server/servlet/HttpServletInputMessage.java | 35 +- .../org/jboss/resteasy/specimpl/BuiltResponse.java | 16 +- .../resteasy/specimpl/ResponseBuilderImpl.java | 9 +- .../resteasy/specimpl/ResteasyUriBuilder.java | 3 +- .../java/org/jboss/resteasy/spi/HttpRequest.java | 4 + .../resteasy/spi/ResteasyAsynchronousContext.java | 6 +- .../resteasy/spi/ResteasyProviderFactory.java | 2 +- .../org/jboss/resteasy/spi/StringConverter.java | 1 + .../resteasy/spi/metadata/ResourceBuilder.java | 35 +- .../resteasy/util/CommitHeaderOutputStream.java | 21 + .../java/org/jboss/resteasy/util/CookieParser.java | 62 + .../jboss/resteasy/util/DelegatingHttpRequest.java | 12 + .../resteasy/test/client/UrlExecutorTest.java | 64 + .../test/finegrain/ResponseBuilderTest.java | 11 + .../resteasy/test/finegrain/UriBuilderTest.java | 21 + .../test/finegrain/resource/PreconditionTest.java | 6 +- jaxrs/resteasy-jsapi-testing/pom.xml | 2 +- jaxrs/resteasy-jsapi/pom.xml | 2 +- jaxrs/resteasy-links/pom.xml | 6 +- .../pom.xml | 28 +- .../servlet/ResteasyServletInitializer.java | 165 + .../javax.servlet.ServletContainerInitializer | 1 + jaxrs/resteasy-spring/pom.xml | 21 +- .../resteasy/springmvc/ResteasyRequestWrapper.java | 2 +- jaxrs/resteasy-test-data/pom.xml | 2 +- jaxrs/security/jose-jwt/pom.xml | 2 +- .../org/jboss/resteasy/jose/jwe/Algorithm.java | 12 + .../resteasy/jose/jwe/CompressionAlgorithm.java | 10 + .../jboss/resteasy/jose/jwe/EncryptionMethod.java | 49 + .../org/jboss/resteasy/jose/jwe/JWEBuilder.java | 223 + .../org/jboss/resteasy/jose/jwe/JWEHeader.java | 100 + .../java/org/jboss/resteasy/jose/jwe/JWEInput.java | 169 + .../org/jboss/resteasy/jose/jwe/crypto/AES.java | 79 + .../org/jboss/resteasy/jose/jwe/crypto/AESCBC.java | 281 ++ .../org/jboss/resteasy/jose/jwe/crypto/AESGCM.java | 203 + .../jose/jwe/crypto/AuthenticatedCipherText.java | 72 + .../resteasy/jose/jwe/crypto/CompositeKey.java | 128 + .../resteasy/jose/jwe/crypto/DeflateHelper.java | 89 + .../resteasy/jose/jwe/crypto/DeflateUtils.java | 93 + .../resteasy/jose/jwe/crypto/DirectDecrypter.java | 109 + .../resteasy/jose/jwe/crypto/DirectEncrypter.java | 124 + .../org/jboss/resteasy/jose/jwe/crypto/HMAC.java | 80 + .../resteasy/jose/jwe/crypto/JWECryptoParts.java | 122 + .../org/jboss/resteasy/jose/jwe/crypto/RSA1_5.java | 94 + .../resteasy/jose/jwe/crypto/RSADecrypter.java | 143 + .../resteasy/jose/jwe/crypto/RSAEncrypter.java | 138 + .../jboss/resteasy/jose/jwe/crypto/RSA_OAEP.java | 106 + .../java/org/jboss/resteasy/jwt/JsonWebToken.java | 4 +- .../org/jboss/resteasy/test/jose/jws/JWETest.java | 68 + .../keystone/example/keystone-server/pom.xml | 2 +- jaxrs/security/keystone/example/some-app/pom.xml | 2 +- .../security/keystone/keystone-as7-modules/pom.xml | 2 +- jaxrs/security/keystone/keystone-as7/pom.xml | 2 +- jaxrs/security/keystone/keystone-core/pom.xml | 2 +- .../resteasy/test/keystone/PersistenceTest.java | 2 + .../test/keystone/ProjectsResourceTest.java | 2 + .../resteasy/test/keystone/RolesResourceTest.java | 3 + .../jboss/resteasy/test/keystone/TokenTest.java | 6 + .../resteasy/test/keystone/UsersResourceTest.java | 2 + jaxrs/security/login-module-authenticator/pom.xml | 2 +- jaxrs/security/pom.xml | 2 +- jaxrs/security/resteasy-crypto/pom.xml | 9 +- .../resteasy-crypto/python_encrypted_signed.txt | 29 - jaxrs/security/resteasy-crypto/smime_signed.txt | 21 - .../security/resteasy-crypto/smime_signed_bad.txt | 21 - .../test/security/smime/IntegrationTest.java | 2 +- .../resteasy/test/security/smime/SignedTest.java | 4 +- .../src/test/resources/smime_encrypted_signed.py | 2 +- .../src/test/resources/verify_signed.py | 2 +- .../src/test/resources/verify_signed_bad.py | 2 +- jaxrs/security/resteasy-oauth/pom.xml | 2 +- jaxrs/security/skeleton-key-idm/pom.xml | 3 +- .../skeleton-key-idm/skeleton-key-as7/pom.xml | 2 +- .../key/as7/BearerTokenAuthenticatorValve.java | 7 +- .../key/as7/OAuthAuthenticationServerValve.java | 17 +- .../key/as7/OAuthManagedResourceValve.java | 7 +- .../CatalinaManagedResourceConfigLoader.java | 35 + .../skeleton-key-idm/skeleton-key-core/pom.xml | 2 +- .../skeleton/key}/config/AuthServerConfig.java | 2 +- .../key}/config/ManagedResourceConfig.java | 2 +- .../key}/config/ManagedResourceConfigLoader.java | 55 +- .../skeleton/key/servlet/ServletActionURLs.java} | 5 +- .../skeleton-key-idm/skeleton-key-idp-war/pom.xml | 2 +- .../skeleton-key-idm/skeleton-key-idp/pom.xml | 2 +- .../pom.xml | 16 +- jaxrs/server-adapters/pom.xml | 4 +- jaxrs/server-adapters/resteasy-jdk-http/pom.xml | 2 +- .../plugins/server/sun/http/HttpExchangeUtil.java | 9 +- .../plugins/server/sun/http/HttpServerRequest.java | 13 + jaxrs/server-adapters/resteasy-netty/pom.xml | 2 +- .../server/netty/HttpServerPipelineFactory.java | 5 +- .../server/netty/HttpsServerPipelineFactory.java | 4 +- .../plugins/server/netty/NettyHttpRequest.java | 14 + .../plugins/server/netty/NettyJaxrsServer.java | 10 +- .../resteasy/plugins/server/netty/NettyUtil.java | 9 +- .../server/netty/RestEasyHttpRequestDecoder.java | 6 +- .../resteasy-netty4}/pom.xml | 28 +- .../plugins/server/netty/NettyHttpRequest.java | 460 ++ .../plugins/server/netty/NettyHttpResponse.java | 158 + .../plugins/server/netty/NettyJaxrsServer.java | 180 + .../plugins/server/netty/NettySecurityContext.java | 54 + .../resteasy/plugins/server/netty/NettyUtil.java | 15 +- .../plugins/server/netty/RequestDispatcher.java | 141 + .../plugins/server/netty/RequestHandler.java | 110 + .../server/netty/RestEasyHttpRequestDecoder.java | 85 + .../server/netty/RestEasyHttpResponseEncoder.java | 77 + .../org/jboss/resteasy/test/NettyContainer.java | 72 + .../jboss/resteasy/test/AsyncJaxrsResource.java} | 78 +- .../org/jboss/resteasy/test/JaxrsAsyncTest.java | 201 + .../java/org/jboss/resteasy/test/NettyTest.java | 56 + .../test/java/org/jboss/resteasy/test/XmlData.java | 34 + .../resteasy-undertow}/pom.xml | 24 +- .../server/undertow/UndertowJaxrsServer.java | 263 + .../jboss/resteasy/test/undertow/UndertowTest.java | 98 + jaxrs/tjws/pom.xml | 2 +- jaxrs/war-tests/application-test/pom.xml | 3 +- jaxrs/war-tests/context-test/pom.xml | 3 +- .../resteasy/tests/context/ContextService.java | 8 + .../context-test/src/main/webapp/index.html | 1 + .../org/jboss/resteasy/tests/context/EchoTest.java | 9 + jaxrs/war-tests/encoding-test/pom.xml | 3 +- jaxrs/war-tests/filter-test/pom.xml | 2 +- jaxrs/war-tests/jsapi-servlet-test/pom.xml | 19 +- jaxrs/war-tests/oauth-servlet-test/pom.xml | 2 +- jaxrs/war-tests/pom.xml | 2 +- r0 | 5077 -------------------- 646 files changed, 28082 insertions(+), 8070 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits